epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

FieldBuilder::add() ignore exact duplicates

Browse Source
This commit is contained in:
Michael Davidsaver
2017-09-20 18:47:42 -05:00
parent 9bce66f307
commit 822173979c
3 changed files with 27 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/factory/FieldCreateFactory.cpp
View File

@@ -809,76 +809,59 @@ FieldBuilderPtr FieldBuilder::setId(string const & id)
return shared_from_this();
}
void FieldBuilder::checkFieldName(const std::string& name)
{
// linear search on the theory that the number of fields is small
for(StringArray::const_iterator it = fieldNames.begin(), end = fieldNames.end();
it != end; ++it)
{
if(name==*it)
THROW_EXCEPTION2(std::invalid_argument, std::string("duplicate fieldName ")+name);
}
}
FieldBuilderPtr FieldBuilder::add(string const & name, ScalarType scalarType)
{
checkFieldName(name);
fields.push_back(fieldCreate->createScalar(scalarType)); fieldNames.push_back(name);
return shared_from_this();
return add(name, fieldCreate->createScalar(scalarType));
}
FieldBuilderPtr FieldBuilder::addBoundedString(std::string const & name, std::size_t maxLength)
{
checkFieldName(name);
fields.push_back(fieldCreate->createBoundedString(maxLength)); fieldNames.push_back(name);
return shared_from_this();
return add(name, fieldCreate->createBoundedString(maxLength));
}
FieldBuilderPtr FieldBuilder::add(string const & name, FieldConstPtr const & field)
{
checkFieldName(name);
fields.push_back(field); fieldNames.push_back(name);
const Field* cur = findField(name, field->getType());
if(!cur) {
fields.push_back(field); fieldNames.push_back(name);
} else if(*cur!=*field) {
THROW_EXCEPTION2(std::runtime_error, "duplicate field name w/ different type : "+name);
} // else exact duplicate is silently ignored
return shared_from_this();
}
FieldBuilderPtr FieldBuilder::addArray(string const & name, ScalarType scalarType)
{
checkFieldName(name);
fields.push_back(fieldCreate->createScalarArray(scalarType)); fieldNames.push_back(name);
return shared_from_this();
return add(name, fieldCreate->createScalarArray(scalarType));
}
FieldBuilderPtr FieldBuilder::addFixedArray(string const & name, ScalarType scalarType, size_t size)
{
checkFieldName(name);
fields.push_back(fieldCreate->createFixedScalarArray(scalarType, size)); fieldNames.push_back(name);
return shared_from_this();
return add(name, fieldCreate->createFixedScalarArray(scalarType, size));
}
FieldBuilderPtr FieldBuilder::addBoundedArray(string const & name, ScalarType scalarType, size_t size)
{
checkFieldName(name);
fields.push_back(fieldCreate->createBoundedScalarArray(scalarType, size)); fieldNames.push_back(name);
return shared_from_this();
return add(name, fieldCreate->createBoundedScalarArray(scalarType, size));
}
FieldBuilderPtr FieldBuilder::addArray(string const & name, FieldConstPtr const & element)
{
checkFieldName(name);
FieldConstPtr fld;
switch (element->getType())
{
case structure:
fields.push_back(fieldCreate->createStructureArray(static_pointer_cast<const Structure>(element)));
fld = fieldCreate->createStructureArray(static_pointer_cast<const Structure>(element));
break;
case union_:
fields.push_back(fieldCreate->createUnionArray(static_pointer_cast<const Union>(element)));
fld = fieldCreate->createUnionArray(static_pointer_cast<const Union>(element));
break;
case scalar:
if (std::tr1::dynamic_pointer_cast<const BoundedString>(element).get())
THROW_EXCEPTION2(std::invalid_argument, "bounded string arrays are not supported");
fields.push_back(fieldCreate->createScalarArray(static_pointer_cast<const Scalar>(element)->getScalarType()));
fld = fieldCreate->createScalarArray(static_pointer_cast<const Scalar>(element)->getScalarType());
break;
// scalarArray?
default:
@@ -887,8 +870,7 @@ FieldBuilderPtr FieldBuilder::addArray(string const & name, FieldConstPtr const
THROW_EXCEPTION2(std::invalid_argument, msg.str());
}
fieldNames.push_back(name);
return shared_from_this();
return add(name, fld);
}
FieldConstPtr FieldBuilder::createFieldInternal(Type type)

2
src/pv/pvIntrospect.h
View File

@@ -1035,8 +1035,6 @@ private:
void reset();
FieldConstPtr createFieldInternal(Type type);
void checkFieldName(const std::string &name);
friend class FieldCreate;
const FieldCreatePtr fieldCreate;

29
testApp/pv/testFieldBuilder.cpp
View File

@@ -273,6 +273,7 @@ void test_extendStructure()
->addNestedStructure("nest")
->add("B2", pvInt)
->addNestedStructure("one")
->add("XX", pvInt) // exact duplicate silently ignored
->add("YY", pvInt)
->endNested()
->endNested()
@@ -327,25 +328,17 @@ void test_extendStructure()
static_cast<const void*>(expected.get()));
testEqual(*amended, *expected);
try {
Structure::const_shared_pointer Z(getFieldCreate()->createFieldBuilder(amended)
->add("A2", pvDouble)
->createStructure());
testFail("Unexpected success in adding duplicate field");
}catch(std::exception& e){
testPass("catch expected exception: %s", e.what());
}
testThrows(std::runtime_error,
getFieldCreate()->createFieldBuilder(amended)
->add("A2", pvDouble)
->createStructure());
try {
Structure::const_shared_pointer Z(getFieldCreate()->createFieldBuilder(amended)
->addNestedStructure("nest")
->add("B2", pvDouble)
->endNested()
->createStructure());
testFail("Unexpected success in adding duplicate nested field");
}catch(std::exception& e){
testPass("catch expected exception: %s", e.what());
}
testThrows(std::runtime_error,
getFieldCreate()->createFieldBuilder(amended)
->addNestedStructure("nest")
->add("B2", pvDouble)
->endNested()
->createStructure());
}
} // namespace