Change schema::DataType and schema::CollectionType to enum class.

2 files changed, 65 insertions, 62 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 411730ce188..05f335f374c 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -29,17 +29,19 @@
 #include <vespa/log/log.h>
 LOG_SETUP("docsummary_test");
 
+using namespace cloud::config::filedistribution;
 using namespace document;
-using namespace search;
 using namespace search::docsummary;
 using namespace search::engine;
 using namespace search::index;
 using namespace search::transactionlog;
-using namespace cloud::config::filedistribution;
-using search::TuneFileDocumentDB;
+using namespace search;
+
 using document::DocumenttypesConfig;
-using storage::spi::Timestamp;
+using search::TuneFileDocumentDB;
 using search::index::DummyFileHeaderContext;
+using search::index::schema::CollectionType;
+using storage::spi::Timestamp;
 using vespa::config::search::core::ProtonConfig;
 using vespalib::tensor::Tensor;
 using vespalib::tensor::TensorCells;
@@ -490,18 +492,18 @@ void
 Test::requireThatAdapterHandlesAllFieldTypes()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("a", schema::INT8));
-    s.addSummaryField(Schema::SummaryField("b", schema::INT16));
-    s.addSummaryField(Schema::SummaryField("c", schema::INT32));
-    s.addSummaryField(Schema::SummaryField("d", schema::INT64));
-    s.addSummaryField(Schema::SummaryField("e", schema::FLOAT));
-    s.addSummaryField(Schema::SummaryField("f", schema::DOUBLE));
-    s.addSummaryField(Schema::SummaryField("g", schema::STRING));
-    s.addSummaryField(Schema::SummaryField("h", schema::STRING));
-    s.addSummaryField(Schema::SummaryField("i", schema::RAW));
-    s.addSummaryField(Schema::SummaryField("j", schema::RAW));
-    s.addSummaryField(Schema::SummaryField("k", schema::STRING));
-    s.addSummaryField(Schema::SummaryField("l", schema::STRING));
+    s.addSummaryField(Schema::SummaryField("a", schema::DataType::INT8));
+    s.addSummaryField(Schema::SummaryField("b", schema::DataType::INT16));
+    s.addSummaryField(Schema::SummaryField("c", schema::DataType::INT32));
+    s.addSummaryField(Schema::SummaryField("d", schema::DataType::INT64));
+    s.addSummaryField(Schema::SummaryField("e", schema::DataType::FLOAT));
+    s.addSummaryField(Schema::SummaryField("f", schema::DataType::DOUBLE));
+    s.addSummaryField(Schema::SummaryField("g", schema::DataType::STRING));
+    s.addSummaryField(Schema::SummaryField("h", schema::DataType::STRING));
+    s.addSummaryField(Schema::SummaryField("i", schema::DataType::RAW));
+    s.addSummaryField(Schema::SummaryField("j", schema::DataType::RAW));
+    s.addSummaryField(Schema::SummaryField("k", schema::DataType::STRING));
+    s.addSummaryField(Schema::SummaryField("l", schema::DataType::STRING));
 
     BuildContext bc(s);
     bc._bld.startDocument("doc::0");
@@ -550,7 +552,7 @@ void
 Test::requireThatAdapterHandlesMultipleDocuments()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("a", schema::INT32));
+    s.addSummaryField(Schema::SummaryField("a", schema::DataType::INT32));
 
     BuildContext bc(s);
     bc._bld.startDocument("doc::0").
@@ -592,7 +594,7 @@ void
 Test::requireThatAdapterHandlesDocumentIdField()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("documentid", schema::STRING));
+    s.addSummaryField(Schema::SummaryField("documentid", schema::DataType::STRING));
     BuildContext bc(s);
     bc._bld.startDocument("doc::0").
         startSummaryField("documentid").
@@ -619,7 +621,7 @@ void
 Test::requireThatDocsumRequestIsProcessed()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("a", schema::INT32));
+    s.addSummaryField(Schema::SummaryField("a", schema::DataType::INT32));
 
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
@@ -678,8 +680,8 @@ void
 Test::requireThatRewritersAreUsed()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("aa", schema::INT32));
-    s.addSummaryField(Schema::SummaryField("ab", schema::INT32));
+    s.addSummaryField(Schema::SummaryField("aa", schema::DataType::INT32));
+    s.addSummaryField(Schema::SummaryField("ab", schema::DataType::INT32));
 
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
@@ -717,16 +719,16 @@ void
 Test::requireThatAttributesAreUsed()
 {
     Schema s;
-    addField(s, "ba", schema::INT32, schema::SINGLE);
-    addField(s, "bb", schema::FLOAT, schema::SINGLE);
-    addField(s, "bc", schema::STRING, schema::SINGLE);
-    addField(s, "bd", schema::INT32, schema::ARRAY);
-    addField(s, "be", schema::FLOAT, schema::ARRAY);
-    addField(s, "bf", schema::STRING, schema::ARRAY);
-    addField(s, "bg", schema::INT32, schema::WEIGHTEDSET);
-    addField(s, "bh", schema::FLOAT, schema::WEIGHTEDSET);
-    addField(s, "bi", schema::STRING, schema::WEIGHTEDSET);
-    addField(s, "bj", schema::TENSOR, schema::SINGLE);
+    addField(s, "ba", schema::DataType::INT32, CollectionType::SINGLE);
+    addField(s, "bb", schema::DataType::FLOAT, CollectionType::SINGLE);
+    addField(s, "bc", schema::DataType::STRING, CollectionType::SINGLE);
+    addField(s, "bd", schema::DataType::INT32, CollectionType::ARRAY);
+    addField(s, "be", schema::DataType::FLOAT, CollectionType::ARRAY);
+    addField(s, "bf", schema::DataType::STRING, CollectionType::ARRAY);
+    addField(s, "bg", schema::DataType::INT32, CollectionType::WEIGHTEDSET);
+    addField(s, "bh", schema::DataType::FLOAT, CollectionType::WEIGHTEDSET);
+    addField(s, "bi", schema::DataType::STRING, CollectionType::WEIGHTEDSET);
+    addField(s, "bj", schema::DataType::TENSOR, CollectionType::SINGLE);
 
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
@@ -866,7 +868,7 @@ void
 Test::requireThatSummaryAdapterHandlesPutAndRemove()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("f1", schema::STRING, schema::SINGLE));
+    s.addSummaryField(Schema::SummaryField("f1", schema::DataType::STRING, CollectionType::SINGLE));
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
     Document::UP exp = bc._bld.startDocument("doc::1").
@@ -900,10 +902,10 @@ void
 Test::requireThatAnnotationsAreUsed()
 {
     Schema s;
-    s.addIndexField(Schema::IndexField("g", schema::STRING, schema::SINGLE));
-    s.addSummaryField(Schema::SummaryField("g", schema::STRING, schema::SINGLE));
-    s.addIndexField(Schema::IndexField("dynamicstring", schema::STRING, schema::SINGLE));
-    s.addSummaryField(Schema::SummaryField("dynamicstring", schema::STRING, schema::SINGLE));
+    s.addIndexField(Schema::IndexField("g", schema::DataType::STRING, CollectionType::SINGLE));
+    s.addSummaryField(Schema::SummaryField("g", schema::DataType::STRING, CollectionType::SINGLE));
+    s.addIndexField(Schema::IndexField("dynamicstring", schema::DataType::STRING, CollectionType::SINGLE));
+    s.addSummaryField(Schema::SummaryField("dynamicstring", schema::DataType::STRING, CollectionType::SINGLE));
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
     Document::UP exp = bc._bld.startDocument("doc::0").
@@ -953,12 +955,12 @@ void
 Test::requireThatUrisAreUsed()
 {
     Schema s;
-    s.addUriIndexFields(Schema::IndexField("urisingle", schema::STRING, schema::SINGLE));
-    s.addSummaryField(Schema::SummaryField("urisingle", schema::STRING, schema::SINGLE));
-    s.addUriIndexFields(Schema::IndexField("uriarray", schema::STRING, schema::ARRAY));
-    s.addSummaryField(Schema::SummaryField("uriarray", schema::STRING, schema::ARRAY));
-    s.addUriIndexFields(Schema::IndexField("uriwset", schema::STRING, schema::WEIGHTEDSET));
-    s.addSummaryField(Schema::SummaryField("uriwset", schema::STRING, schema::WEIGHTEDSET));
+    s.addUriIndexFields(Schema::IndexField("urisingle", schema::DataType::STRING, CollectionType::SINGLE));
+    s.addSummaryField(Schema::SummaryField("urisingle", schema::DataType::STRING, CollectionType::SINGLE));
+    s.addUriIndexFields(Schema::IndexField("uriarray", schema::DataType::STRING, CollectionType::ARRAY));
+    s.addSummaryField(Schema::SummaryField("uriarray", schema::DataType::STRING, CollectionType::ARRAY));
+    s.addUriIndexFields(Schema::IndexField("uriwset", schema::DataType::STRING, CollectionType::WEIGHTEDSET));
+    s.addSummaryField(Schema::SummaryField("uriwset", schema::DataType::STRING, CollectionType::WEIGHTEDSET));
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
     Document::UP exp = bc._bld.startDocument("doc::0").
@@ -1127,9 +1129,9 @@ void
 Test::requireThatPositionsAreUsed()
 {
     Schema s;
-    s.addAttributeField(Schema::AttributeField("sp2", schema::INT64));
-    s.addAttributeField(Schema::AttributeField("ap2", schema::INT64, schema::ARRAY));
-    s.addAttributeField(Schema::AttributeField("wp2", schema::INT64, schema::WEIGHTEDSET));
+    s.addAttributeField(Schema::AttributeField("sp2", schema::DataType::INT64));
+    s.addAttributeField(Schema::AttributeField("ap2", schema::DataType::INT64, CollectionType::ARRAY));
+    s.addAttributeField(Schema::AttributeField("wp2", schema::DataType::INT64, CollectionType::WEIGHTEDSET));
 
     BuildContext bc(s);
     DBContext dc(bc._repo, getDocTypeName());
@@ -1179,9 +1181,9 @@ void
 Test::requireThatRawFieldsWorks()
 {
     Schema s;
-    s.addSummaryField(Schema::AttributeField("i", schema::RAW));
-    s.addSummaryField(Schema::AttributeField("araw", schema::RAW, schema::ARRAY));
-    s.addSummaryField(Schema::AttributeField("wraw", schema::RAW, schema::WEIGHTEDSET));
+    s.addSummaryField(Schema::AttributeField("i", schema::DataType::RAW));
+    s.addSummaryField(Schema::AttributeField("araw", schema::DataType::RAW, CollectionType::ARRAY));
+    s.addSummaryField(Schema::AttributeField("wraw", schema::DataType::RAW, CollectionType::WEIGHTEDSET));
 
     std::vector<char> binaryBlob;
     binaryBlob.push_back('\0');
@@ -1267,7 +1269,7 @@ void
 Test::requireThatFieldCacheRepoCanReturnDefaultFieldCache()
 {
     Schema s;
-    s.addSummaryField(Schema::SummaryField("a", schema::INT32));
+    s.addSummaryField(Schema::SummaryField("a", schema::DataType::INT32));
     BuildContext bc(s);
     FieldCacheRepo::UP repo = bc.createFieldCacheRepo(getResultConfig());
     FieldCache::CSP cache = repo->getFieldCache("");
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index f3f495925f0..13f0cd1cd2b 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -50,8 +50,6 @@
 #include <vespa/eval/tensor/tensor_factory.h>
 #include <vespa/vespalib/data/slime/slime.h>
 
-using vespa::config::search::SummarymapConfig;
-using vespa::config::search::SummarymapConfigBuilder;
 using document::Annotation;
 using document::AnnotationType;
 using document::ArrayDataType;
@@ -59,11 +57,11 @@ using document::ArrayFieldValue;
 using document::ByteFieldValue;
 using document::DataType;
 using document::Document;
-using document::DocumenttypesConfig;
-using document::DocumenttypesConfigBuilder;
 using document::DocumentId;
 using document::DocumentType;
 using document::DocumentTypeRepo;
+using document::DocumenttypesConfig;
+using document::DocumenttypesConfigBuilder;
 using document::DoubleFieldValue;
 using document::FeatureSet;
 using document::Field;
@@ -75,6 +73,8 @@ using document::LongFieldValue;
 using document::Predicate;
 using document::PredicateFieldValue;
 using document::RawFieldValue;
+using document::ReferenceDataType;
+using document::ReferenceFieldValue;
 using document::ShortFieldValue;
 using document::Span;
 using document::SpanList;
@@ -82,24 +82,25 @@ using document::SpanTree;
 using document::StringFieldValue;
 using document::StructDataType;
 using document::StructFieldValue;
+using document::TensorFieldValue;
 using document::UrlDataType;
 using document::WeightedSetDataType;
 using document::WeightedSetFieldValue;
-using document::TensorFieldValue;
-using document::ReferenceDataType;
-using document::ReferenceFieldValue;
 using search::index::Schema;
-using vespalib::Slime;
-using vespalib::slime::Cursor;
-using vespalib::string;
 using search::linguistics::SPANTREE_NAME;
 using search::linguistics::TERM;
-using namespace search::docsummary;
+using vespa::config::search::SummarymapConfig;
+using vespa::config::search::SummarymapConfigBuilder;
+using vespalib::Slime;
 using vespalib::geo::ZCurve;
+using vespalib::slime::Cursor;
+using vespalib::string;
 using vespalib::tensor::Tensor;
 using vespalib::tensor::TensorCells;
 using vespalib::tensor::TensorDimensions;
 
+using namespace search::docsummary;
+
 typedef SummaryFieldConverter SFC;
 
 namespace {
@@ -481,11 +482,11 @@ void Test::checkArray(const char *(&str)[N], const FieldValue *value) {
 }
 
 void Test::setSummaryField(const string &field) {
-    _schema->addSummaryField(Schema::Field(field, search::index::schema::STRING));
+    _schema->addSummaryField(Schema::Field(field, search::index::schema::DataType::STRING));
 }
 
 void Test::setAttributeField(const string &field) {
-    _schema->addAttributeField(Schema::Field(field, search::index::schema::STRING));
+    _schema->addAttributeField(Schema::Field(field, search::index::schema::DataType::STRING));
 }
 
 void Test::requireThatSummaryIsAnUnmodifiedString() {