Remove use of summary fields in search::index::DocBuilder and

search::index::DocTypeBuilder.

3 files changed, 1 insertions, 109 deletions

diff --git a/searchlib/src/vespa/searchlib/index/docbuilder.cpp b/searchlib/src/vespa/searchlib/index/docbuilder.cpp
index bf0a6866a1a..d6169f2f396 100644
--- a/searchlib/src/vespa/searchlib/index/docbuilder.cpp
+++ b/searchlib/src/vespa/searchlib/index/docbuilder.cpp
@@ -98,19 +98,6 @@ insertPosition(const Schema::Field & sfield,
     zvalue->setValue(zpos);
 }
 
-
-void
-insertRaw(const Schema::Field & sfield,
-          document::FieldValue *fvalue, const void *buf, size_t len)
-{
-    assert(*fvalue->getDataType() == *DataType::RAW);
-    assert(sfield.getDataType() == schema::DataType::RAW);
-    (void) sfield;
-    document::RawFieldValue *rfvalue =
-        dynamic_cast<RawFieldValue *>(fvalue);
-    rfvalue->setValue(static_cast<const char *>(buf), len);
-}
-
 }
 
 namespace docbuilderkludge
@@ -543,53 +530,6 @@ DocBuilder::AttributeFieldHandle::addPosition(int32_t xpos, int32_t ypos)
     }
 }
 
-DocBuilder::SummaryFieldHandle::
-SummaryFieldHandle(const document::Field & dfield,
-                   const Schema::Field & sfield)
-    : CollectionFieldHandle(dfield, sfield)
-{
-}
-
-void
-DocBuilder::SummaryFieldHandle::addStr(const vespalib::string & val)
-{
-    if (_element) {
-        insertStr(_sfield, _element.get(), val);
-    } else {
-        insertStr(_sfield, _value.get(), val);
-    }
-}
-
-void
-DocBuilder::SummaryFieldHandle::addInt(int64_t val)
-{
-    if (_element) {
-        insertInt(_sfield, _element.get(), val);
-    } else {
-        insertInt(_sfield, _value.get(), val);
-    }
-}
-
-void
-DocBuilder::SummaryFieldHandle::addFloat(double val)
-{
-    if (_element) {
-        insertFloat(_sfield, _element.get(), val);
-    } else {
-        insertFloat(_sfield, _value.get(), val);
-    }
-}
-
-void
-DocBuilder::SummaryFieldHandle::addRaw(const void *buf, size_t len)
-{
-    if (_element) {
-        insertRaw(_sfield, _element.get(), buf, len);
-    } else {
-        insertRaw(_sfield, _value.get(), buf, len);
-    }
-}
-
 DocBuilder::DocumentHandle::DocumentHandle(document::Document &doc, const vespalib::string & docId)
     : _type(&doc.getType()),
       _doc(&doc),
@@ -609,10 +549,7 @@ void
 DocBuilder::DocumentHandle::startAttributeField(const Schema::Field & sfield) {
     _fieldHandle.reset(new AttributeFieldHandle(_type->getField(sfield.getName()), sfield));
 }
-void
-DocBuilder::DocumentHandle::startSummaryField(const Schema::Field & sfield) {
-    _fieldHandle.reset(new SummaryFieldHandle(_type->getField(sfield.getName()), sfield));
-}
+
 void
 DocBuilder::DocumentHandle::endField() {
     _fieldHandle->onEndField();
@@ -674,21 +611,6 @@ DocBuilder::startAttributeField(const vespalib::string & name)
 }
 
 DocBuilder &
-DocBuilder::startSummaryField(const vespalib::string & name)
-{
-    assert(!_handleDoc->getFieldHandle());
-    uint32_t field_id = _schema.getIndexFieldId(name);
-    assert(field_id == Schema::UNKNOWN_FIELD_ID);
-    field_id = _schema.getAttributeFieldId(name);
-    assert(field_id == Schema::UNKNOWN_FIELD_ID);
-    field_id = _schema.getSummaryFieldId(name);
-    assert(field_id != Schema::UNKNOWN_FIELD_ID);
-    _handleDoc->startSummaryField(_schema.getSummaryField(field_id));
-    _currDoc = _handleDoc.get();
-    return *this;
-}
-
-DocBuilder &
 DocBuilder::endField()
 {
     assert(_currDoc != nullptr);
diff --git a/searchlib/src/vespa/searchlib/index/docbuilder.h b/searchlib/src/vespa/searchlib/index/docbuilder.h
index a22096cfdbe..a8a37b57070 100644
--- a/searchlib/src/vespa/searchlib/index/docbuilder.h
+++ b/searchlib/src/vespa/searchlib/index/docbuilder.h
@@ -207,18 +207,6 @@ private:
     };
 
     /**
-     * Class for handling the construction of the content of a summary field.
-     **/
-    class SummaryFieldHandle : public CollectionFieldHandle {
-    public:
-        SummaryFieldHandle(const document::Field & dfield, const Schema::Field & sfield);
-        void addStr(const vespalib::string & val) override;
-        void addInt(int64_t val) override;
-        void addFloat(double val) override;
-        void addRaw(const void *buf, size_t len) override;
-    };
-
-    /**
      * Class for handling the construction of a document (set of fields).
      **/
     class DocumentHandle {
@@ -235,7 +223,6 @@ private:
         const FieldHandle::SP & getFieldHandle() const { return _fieldHandle; }
         void startIndexField(const Schema::Field & sfield);
         void startAttributeField(const Schema::Field & sfield);
-        void startSummaryField(const Schema::Field & sfield);
         void endField();
         void endDocument(const document::Document::UP & doc) {
             (void) doc;
@@ -260,7 +247,6 @@ public:
 
     DocBuilder & startIndexField(const vespalib::string & name);
     DocBuilder & startAttributeField(const vespalib::string & name);
-    DocBuilder & startSummaryField(const vespalib::string & name);
     DocBuilder & endField();
     DocBuilder & startElement(int32_t weight = 1);
     DocBuilder & endElement();
diff --git a/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp b/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
index 2b81b8c3a57..5f655419471 100644
--- a/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
+++ b/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp
@@ -148,22 +148,6 @@ document::config::DocumenttypesConfig DocTypeBuilder::makeConfig() const {
         usedFields.insert(field.getName());
     }
 
-    for (uint32_t i = 0; i < _schema.getNumSummaryFields(); ++i) {
-        const Schema::SummaryField &field = _schema.getSummaryField(i);
-        UsedFields::const_iterator usf = usedFields.find(field.getName());
-        if (usf != usedFields.end()) {
-            continue;   // taken as index field or attribute field
-        }
-        auto type_id  = convert(field.getDataType());
-        if (type_id == DataType::T_TENSOR) {
-            header_struct.addTensorField(field.getName(), field.get_tensor_spec());
-        } else {
-            header_struct.addField(field.getName(), type_cache.getType(
-                    type_id, field.getCollectionType()));
-        }
-        usedFields.insert(field.getName());
-    }
-
     DocumenttypesConfigBuilderHelper builder;
     builder.document(-645763131, "searchdocument",
                      header_struct, Struct("searchdocument.body"));