Remove support to save enum attributes in non-enumerated save format.

2 files changed, 6 insertions, 15 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.cpp b/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.cpp
index cdc56907112..c220d144b53 100644
--- a/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.cpp
@@ -21,15 +21,15 @@ class DatWriter
     std::vector<EnumStoreIndex>           _indexes;
     const EnumStoreBase                  &_enumStore;
     std::unique_ptr<search::BufferWriter> _datWriter;
-    bool                                  _enumerated;
+
 public:
     DatWriter(IAttributeSaveTarget &saveTarget,
               const EnumStoreBase &enumStore)
         : _indexes(),
           _enumStore(enumStore),
-          _datWriter(saveTarget.datWriter().allocBufferWriter()),
-          _enumerated(saveTarget.getEnumerated())
+          _datWriter(saveTarget.datWriter().allocBufferWriter())
     {
+        assert(saveTarget.getEnumerated());
         _indexes.reserve(1000);
     }
 
@@ -42,13 +42,8 @@ public:
     void flush()
     {
         if (!_indexes.empty()) {
-            if (_enumerated) {
-                _enumStore.writeEnumValues(*_datWriter,
-                                           &_indexes[0], _indexes.size());
-            } else {
-                _enumStore.writeValues(*_datWriter,
+            _enumStore.writeEnumValues(*_datWriter,
                                        &_indexes[0], _indexes.size());
-            }
             _indexes.clear();
         }
     }
diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattributesaver.cpp b/searchlib/src/vespa/searchlib/attribute/singleenumattributesaver.cpp
index dd92421301c..24df3438570 100644
--- a/searchlib/src/vespa/searchlib/attribute/singleenumattributesaver.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/singleenumattributesaver.cpp
@@ -34,13 +34,9 @@ SingleValueEnumAttributeSaver::onSave(IAttributeSaveTarget &saveTarget)
     const EnumStoreBase &enumStore = _enumSaver.getEnumStore();
     std::unique_ptr<search::BufferWriter> datWriter(saveTarget.datWriter().
                                                     allocBufferWriter());
-    if (saveTarget.getEnumerated()) {
-        enumStore.writeEnumValues(*datWriter,
-                                  &_indices[0], _indices.size());
-    } else {
-        enumStore.writeValues(*datWriter,
+    assert(saveTarget.getEnumerated());
+    enumStore.writeEnumValues(*datWriter,
                               &_indices[0], _indices.size());
-    }
     datWriter->flush();
     _enumSaver.enableReEnumerate();
     return true;