summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-08-12 22:52:32 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-08-13 12:38:58 +0000
commit92a4b42957394552321a7bb3490e9539cff6992d (patch)
tree7c8d0ebd7a987f4542fefcff25a7205b86dd0347 /searchcore
parent89414c996e241819648973ab70e34e04bb68447d (diff)
GC unused code.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/attribute/attribute_test.cpp6
-rw-r--r--searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp18
-rw-r--r--searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp18
-rw-r--r--searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp16
-rw-r--r--searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp8
-rw-r--r--searchcore/src/tests/proton/server/documentretriever_test.cpp6
6 files changed, 36 insertions, 36 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp
index 258ee5f32d8..41de6827244 100644
--- a/searchcore/src/tests/proton/attribute/attribute_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp
@@ -984,7 +984,7 @@ public:
StructWriterTestBase()
: AttributeWriterTest(),
_type("test"),
- _valueField("value", 2, *DataType::INT, true),
+ _valueField("value", 2, *DataType::INT),
_structFieldType("struct")
{
addAttribute({"value", AVConfig(AVBasicType::INT32, AVCollectionType::SINGLE)});
@@ -1019,7 +1019,7 @@ public:
StructArrayWriterTest()
: StructWriterTestBase(),
_structArrayFieldType(_structFieldType),
- _structArrayField("array", _structArrayFieldType, true)
+ _structArrayField("array", _structArrayFieldType)
{
addAttribute({"array.value", AVConfig(AVBasicType::INT32, AVCollectionType::ARRAY)});
_type.addField(_structArrayField);
@@ -1070,7 +1070,7 @@ public:
StructMapWriterTest()
: StructWriterTestBase(),
_structMapFieldType(*DataType::INT, _structFieldType),
- _structMapField("map", _structMapFieldType, true)
+ _structMapField("map", _structMapFieldType)
{
addAttribute({"map.value.value", AVConfig(AVBasicType::INT32, AVCollectionType::ARRAY)});
addAttribute({"map.key", AVConfig(AVBasicType::INT32, AVCollectionType::ARRAY)});
diff --git a/searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp b/searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp
index 33a3de0c5b6..89dbf20eb61 100644
--- a/searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp
+++ b/searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp
@@ -97,8 +97,8 @@ struct FixtureBase
FixtureBase(bool byteWeight)
: type("test"),
- weightField("weight", 1, byteWeight ? *DataType::BYTE : *DataType::INT, true),
- nameField("name", 2, *DataType::STRING, true),
+ weightField("weight", 1, byteWeight ? *DataType::BYTE : *DataType::INT),
+ nameField("name", 2, *DataType::STRING),
doc(),
extractor()
{
@@ -174,9 +174,9 @@ struct ArrayFixture : public FixtureBase
ArrayFixture(bool byteWeight = false)
: FixtureBase(byteWeight),
weightArrayFieldType(weightField.getDataType()),
- weightArrayField("weight", weightArrayFieldType, true),
+ weightArrayField("weight", weightArrayFieldType),
valueArrayFieldType(nameField.getDataType()),
- valueArrayField("val", valueArrayFieldType, true)
+ valueArrayField("val", valueArrayFieldType)
{
type.addField(weightArrayField);
type.addField(valueArrayField);
@@ -206,9 +206,9 @@ struct WeightedSetFixture : public FixtureBase
WeightedSetFixture(bool byteWeight = false)
: FixtureBase(byteWeight),
weightWeightedSetFieldType(weightField.getDataType(), false, false),
- weightWeightedSetField("weight", weightWeightedSetFieldType, true),
+ weightWeightedSetField("weight", weightWeightedSetFieldType),
valueWeightedSetFieldType(*DataType::STRING, false, false),
- valueWeightedSetField("val", valueWeightedSetFieldType, true)
+ valueWeightedSetField("val", valueWeightedSetFieldType)
{
type.addField(weightWeightedSetField);
type.addField(valueWeightedSetField);
@@ -280,7 +280,7 @@ struct StructArrayFixture : public StructFixtureBase
StructArrayFixture(bool byteWeight = false)
: StructFixtureBase(byteWeight),
structArrayFieldType(structFieldType),
- structArrayField("s", 11, structArrayFieldType, true)
+ structArrayField("s", 11, structArrayFieldType)
{
type.addField(structArrayField);
}
@@ -310,7 +310,7 @@ struct StructMapFixture : public StructFixtureBase
StructMapFixture(bool byteWeight = false, bool byteKey = false)
: StructFixtureBase(byteWeight),
structMapFieldType(byteKey ? *DataType::BYTE : *DataType::STRING, structFieldType),
- structMapField("s", 12, structMapFieldType, true)
+ structMapField("s", 12, structMapFieldType)
{
type.addField(structMapField);
}
@@ -343,7 +343,7 @@ struct PrimitiveMapFixture : public FixtureBase
PrimitiveMapFixture()
: FixtureBase(false),
mapFieldType(nameField.getDataType(), weightField.getDataType()),
- mapField("map", mapFieldType, true)
+ mapField("map", mapFieldType)
{
type.addField(mapField);
}
diff --git a/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp b/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
index 167865b5c68..5e8f320d86a 100644
--- a/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
+++ b/searchcore/src/tests/proton/common/document_type_inspector/document_type_inspector_test.cpp
@@ -11,14 +11,14 @@ template <class Type>
void
addFields(Type &type, bool fieldF3IsString, bool hasFieldF4, bool hasFieldF5)
{
- type.addField(Field("f1", 1, *DataType::STRING, true));
- type.addField(Field("f2", 2, *DataType::STRING, true));
- type.addField(Field("f3", 3, fieldF3IsString ? *DataType::STRING : *DataType::INT, true));
+ type.addField(Field("f1", 1, *DataType::STRING));
+ type.addField(Field("f2", 2, *DataType::STRING));
+ type.addField(Field("f3", 3, fieldF3IsString ? *DataType::STRING : *DataType::INT));
if (hasFieldF4) {
- type.addField(Field("f4", 4, *DataType::STRING, true));
+ type.addField(Field("f4", 4, *DataType::STRING));
}
if (hasFieldF5) {
- type.addField(Field("f5", 5, *DataType::STRING, true));
+ type.addField(Field("f5", 5, *DataType::STRING));
}
}
@@ -44,9 +44,9 @@ DocumentTypeFixture::DocumentTypeFixture(bool fieldF3IsString, bool hasFieldF4,
addFields(_documentType, fieldF3IsString, hasFieldF4, hasFieldF5);
if (hasStruct) {
addFields(_structFieldType, fieldF3IsString, hasFieldF4, hasFieldF5);
- _documentType.addField(Field("sarray", 11, _structArrayFieldType, true));
- _documentType.addField(Field("smap", 12, _structMapFieldType, true));
- _documentType.addField(Field("map", 13, _mapFieldType, true));
+ _documentType.addField(Field("sarray", 11, _structArrayFieldType));
+ _documentType.addField(Field("smap", 12, _structMapFieldType));
+ _documentType.addField(Field("map", 13, _mapFieldType));
}
}
@@ -57,7 +57,7 @@ struct Fixture
DocumentTypeFixture _oldDocType;
DocumentTypeFixture _newDocType;
DocumentTypeInspector _inspector;
- Fixture(bool hasStruct = true, bool mapKeyIsByte = false)
+ explicit Fixture(bool hasStruct = true, bool mapKeyIsByte = false)
: _oldDocType(true, true, false, hasStruct, mapKeyIsByte),
_newDocType(false, false, true, true, false),
_inspector(_oldDocType._documentType, _newDocType._documentType)
diff --git a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
index abe326425c3..ed4c8938aa1 100644
--- a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
+++ b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp
@@ -326,8 +326,8 @@ const DocumentType &getDocType() {
static DocumentType::UP doc_type;
if (!doc_type) {
doc_type = std::make_unique<DocumentType>("foo", 42);
- doc_type->addField(Field("header", 43, *DataType::STRING, true));
- doc_type->addField(Field("body", 44, *DataType::STRING, false));
+ doc_type->addField(Field("header", 43, *DataType::STRING));
+ doc_type->addField(Field("body", 44, *DataType::STRING));
}
return *doc_type;
}
@@ -336,12 +336,12 @@ const DocumentType &getAttrDocType() {
static DocumentType::UP doc_type;
if (!doc_type) {
doc_type = std::make_unique<DocumentType>("foo", 42);
- doc_type->addField(Field("header", 43, *DataType::STRING, true));
- doc_type->addField(Field("body", 44, *DataType::STRING, false));
- doc_type->addField(Field("aa", 45, *DataType::INT, false));
- doc_type->addField(Field("ab", 46, *DataType::INT, false));
- doc_type->addField(Field("dd", 47, *DataType::DOUBLE, false));
- doc_type->addField(Field("ss", 48, *DataType::STRING, false));
+ doc_type->addField(Field("header", 43, *DataType::STRING));
+ doc_type->addField(Field("body", 44, *DataType::STRING));
+ doc_type->addField(Field("aa", 45, *DataType::INT));
+ doc_type->addField(Field("ab", 46, *DataType::INT));
+ doc_type->addField(Field("dd", 47, *DataType::DOUBLE));
+ doc_type->addField(Field("ss", 48, *DataType::STRING));
}
return *doc_type;
}
diff --git a/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp b/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
index f57c2118363..48b2a269f6b 100644
--- a/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
+++ b/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
@@ -150,10 +150,10 @@ struct DocumentModel {
}
~DocumentModel();
void initChildDocType() {
- childDocType.addField(Field("ref", refDataType, true));
- childDocType.addField(Field("other_ref", refDataType, true));
- childDocType.addField(Field("parent2_ref", refDataType2, true));
- childDocType.addField(Field("parent3_ref", refDataType3, true));
+ childDocType.addField(Field("ref", refDataType));
+ childDocType.addField(Field("other_ref", refDataType));
+ childDocType.addField(Field("parent2_ref", refDataType2));
+ childDocType.addField(Field("parent3_ref", refDataType3));
}
};
diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp
index a5279da52a2..c9fece26655 100644
--- a/searchcore/src/tests/proton/server/documentretriever_test.cpp
+++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp
@@ -591,9 +591,9 @@ struct Lookup : public IFieldInfo
TEST("require that fieldset can figure out their attributeness and rember it") {
Lookup lookup;
FieldSetAttributeDB fsDB(lookup);
- document::Field attr1("attr1", 1, *document::DataType::LONG, true);
- document::Field attr2("attr2", 2, *document::DataType::LONG, true);
- document::Field not_attr1("not_attr1", 3, *document::DataType::LONG, true);
+ document::Field attr1("attr1", 1, *document::DataType::LONG);
+ document::Field attr2("attr2", 2, *document::DataType::LONG);
+ document::Field not_attr1("not_attr1", 3, *document::DataType::LONG);
document::Field::Set allAttr;
allAttr.insert(&attr1);
EXPECT_TRUE(fsDB.areAllFieldsAttributes(13, allAttr));