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

4 files changed, 63 insertions, 54 deletions

diff --git a/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp b/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp
index 33800480492..76f3597bda3 100644
--- a/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp
+++ b/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp
@@ -9,6 +9,7 @@ LOG_SETUP("bitvector_test");
 #include <vespa/vespalib/io/fileutil.h>
 
 using namespace search::index;
+using search::index::schema::DataType;
 
 namespace search {
 namespace diskindex {
@@ -191,7 +192,7 @@ Test::Test()
     : _schema(),
       _indexId(0)
 {
-    _schema.addIndexField(Schema::IndexField("f1", schema::STRING));
+    _schema.addIndexField(Schema::IndexField("f1", DataType::STRING));
 }
 
 int
diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
index d3cebd9944d..5bd731dd9ab 100644
--- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
+++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
@@ -24,30 +24,32 @@
 #include <vespa/log/log.h>
 LOG_SETUP("fieldwriter_test");
 
-
 using search::ResultSet;
-using search::fef::TermFieldMatchData;
-using search::fef::TermFieldMatchDataArray;
-using search::queryeval::SearchIterator;
+using search::TuneFileRandRead;
+using search::TuneFileSeqRead;
+using search::TuneFileSeqWrite;
+using search::common::FileHeaderContext;
+using search::diskindex::CheckPointFile;
+using search::diskindex::DocIdMapping;
+using search::diskindex::FieldReader;
+using search::diskindex::FieldWriter;
+using search::diskindex::PageDict4RandRead;
+using search::diskindex::WordNumMapping;
 using search::fakedata::FakeWord;
 using search::fakedata::FakeWordSet;
-using search::index::PostingListParams;
+using search::fef::TermFieldMatchData;
+using search::fef::TermFieldMatchDataArray;
+using search::index::DummyFileHeaderContext;
 using search::index::PostingListCounts;
 using search::index::PostingListOffsetAndCounts;
+using search::index::PostingListParams;
 using search::index::Schema;
 using search::index::SchemaUtil;
-using search::common::FileHeaderContext;
-using search::index::DummyFileHeaderContext;
-using search::diskindex::CheckPointFile;
-using search::TuneFileSeqRead;
-using search::TuneFileSeqWrite;
-using search::TuneFileRandRead;
+using search::index::schema::CollectionType;
+using search::index::schema::DataType;
+using search::queryeval::SearchIterator;
 using vespalib::nbostream;
-using search::diskindex::FieldWriter;
-using search::diskindex::FieldReader;
-using search::diskindex::DocIdMapping;
-using search::diskindex::WordNumMapping;
-using search::diskindex::PageDict4RandRead;
+
 using namespace search::index;
 
 // needed to resolve external symbol from httpd.h on AIX
@@ -188,8 +190,8 @@ WrappedFieldWriter::WrappedFieldWriter(const vespalib::string &namepref,
       _schema(),
       _indexId()
 {
-    schema::CollectionType ct(schema::SINGLE);
-    _schema.addIndexField(Schema::IndexField("field1", schema::STRING, ct));
+    schema::CollectionType ct(CollectionType::SINGLE);
+    _schema.addIndexField(Schema::IndexField("field1", DataType::STRING, ct));
     _indexId = _schema.getIndexFieldId("field1");
 }
 
@@ -324,12 +326,12 @@ WrappedFieldReader::WrappedFieldReader(const vespalib::string &namepref,
       _oldSchema(),
       _schema()
 {
-    Schema::CollectionType ct(schema::SINGLE);
+    Schema::CollectionType ct(CollectionType::SINGLE);
     _oldSchema.addIndexField(Schema::IndexField("field1",
-                                                schema::STRING,
+                                                DataType::STRING,
                                                 ct));
     _schema.addIndexField(Schema::IndexField("field1",
-                                             schema::STRING,
+                                             DataType::STRING,
                                              ct));
 }
 
diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
index 245da126dbb..90c71361d9a 100644
--- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
+++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
@@ -20,16 +20,18 @@
 
 namespace search {
 
-
 using document::Document;
 using fef::FieldPositionsIterator;
 using fef::TermFieldMatchData;
 using fef::TermFieldMatchDataArray;
-using namespace index;
-using search::common::FileHeaderContext;
 using memoryindex::Dictionary;
 using memoryindex::DocumentInverter;
 using queryeval::SearchIterator;
+using search::common::FileHeaderContext;
+using search::index::schema::CollectionType;
+using search::index::schema::DataType;
+
+using namespace index;
 
 namespace diskindex {
 
@@ -247,19 +249,20 @@ Test::requireThatFusionIsWorking(const vespalib::string &prefix,
         schema.addIndexField(Schema::IndexField(iField.getName(),
                                      iField.getDataType(),
                                      iField.getCollectionType()));
-        if (iField.getCollectionType() == schema::WEIGHTEDSET)
+        if (iField.getCollectionType() == CollectionType::WEIGHTEDSET) {
             schema2.addIndexField(Schema::IndexField(iField.getName(),
-                                          iField.getDataType(),
-                                          schema::ARRAY));
-        else
+                                                     iField.getDataType(),
+                                                     CollectionType::ARRAY));
+        } else {
             schema2.addIndexField(Schema::IndexField(iField.getName(),
-                                          iField.getDataType(),
-                                          iField.getCollectionType()));
+                                                     iField.getDataType(),
+                                                     iField.getCollectionType()));
+        }
         schema3.addIndexField(Schema::IndexField(iField.getName(),
                                       iField.getDataType(),
-                                      schema::SINGLE));
+                                      CollectionType::SINGLE));
     }
-    schema3.addIndexField(Schema::IndexField("f4", schema::STRING));
+    schema3.addIndexField(Schema::IndexField("f4", DataType::STRING));
     schema.addFieldSet(Schema::FieldSet("nc0").
                               addField("f0").addField("f1"));
     schema2.addFieldSet(Schema::FieldSet("nc0").
@@ -447,10 +450,10 @@ Test::requireThatFusionIsWorking(const vespalib::string &prefix,
 Test::Test()
     : _schema()
 {
-    _schema.addIndexField(Schema::IndexField("f0", schema::STRING));
-    _schema.addIndexField(Schema::IndexField("f1", schema::STRING));
-    _schema.addIndexField(Schema::IndexField("f2", schema::STRING, schema::ARRAY));
-    _schema.addIndexField(Schema::IndexField("f3", schema::STRING, schema::WEIGHTEDSET));
+    _schema.addIndexField(Schema::IndexField("f0", DataType::STRING));
+    _schema.addIndexField(Schema::IndexField("f1", DataType::STRING));
+    _schema.addIndexField(Schema::IndexField("f2", DataType::STRING, CollectionType::ARRAY));
+    _schema.addIndexField(Schema::IndexField("f3", DataType::STRING, CollectionType::WEIGHTEDSET));
 }
 
 int
diff --git a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
index 37fc78df460..17999dbdb37 100644
--- a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
+++ b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp
@@ -16,30 +16,33 @@
 #include <vespa/log/log.h>
 LOG_SETUP("pagedict4test");
 
-using search::bitcompression::PostingListCountFileEncodeContext;
-using search::bitcompression::PostingListCountFileDecodeContext;
-using search::index::PostingListCounts;
-using search::index::PostingListOffsetAndCounts;
-using search::index::PostingListParams;
-using search::bitcompression::PageDict4SSWriter;
-using search::bitcompression::PageDict4SPWriter;
+using search::bitcompression::PageDict4PLookupRes;
 using search::bitcompression::PageDict4PWriter;
 using search::bitcompression::PageDict4Reader;
-using search::bitcompression::PageDict4SSReader;
-using search::bitcompression::PageDict4SSLookupRes;
 using search::bitcompression::PageDict4SPLookupRes;
-using search::bitcompression::PageDict4PLookupRes;
-using search::index::Schema;
-using search::index::DictionaryFileSeqRead;
-using search::index::DictionaryFileSeqWrite;
-using search::index::DictionaryFileRandRead;
+using search::bitcompression::PageDict4SPWriter;
+using search::bitcompression::PageDict4SSLookupRes;
+using search::bitcompression::PageDict4SSReader;
+using search::bitcompression::PageDict4SSWriter;
+using search::bitcompression::PostingListCountFileDecodeContext;
+using search::bitcompression::PostingListCountFileEncodeContext;
 using search::diskindex::PageDict4FileSeqRead;
 using search::diskindex::PageDict4FileSeqWrite;
 using search::diskindex::PageDict4RandRead;
+using search::index::DictionaryFileRandRead;
+using search::index::DictionaryFileSeqRead;
+using search::index::DictionaryFileSeqWrite;
 using search::index::DummyFileHeaderContext;
+using search::index::PostingListCounts;
+using search::index::PostingListOffsetAndCounts;
+using search::index::PostingListParams;
+using search::index::Schema;
+using search::index::schema::CollectionType;
+using search::index::schema::DataType;
+
 using namespace search::index;
 
-typedef search::bitcompression::PageDict4StartOffset StartOffset;
+using StartOffset = search::bitcompression::PageDict4StartOffset;
 
 namespace
 {
@@ -645,8 +648,8 @@ testWords(const std::string &logname,
         fn << "f0";
         schema.addIndexField(Schema::
                              IndexField(fn.str(),
-                                        schema::STRING,
-                                        schema::SINGLE));
+                                        DataType::STRING,
+                                        CollectionType::SINGLE));
         indexes.push_back(0);
     }
     {