make useSlimeInsideFields always true

* remove the useSlimeInsideFields argument, it is now always true
* remove some now-unused code

2 files changed, 4 insertions, 42 deletions

diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp
index eb4e0bf532f..e858c8ca8a6 100644
--- a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp
+++ b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp
@@ -1,11 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "docsumfilter.h"
-#include "jsondocsumwriter.h"
 #include "slimefieldwriter.h"
 #include <vespa/searchsummary/docsummary/resultclass.h>
 #include <vespa/searchsummary/docsummary/summaryfieldconverter.h>
-#include <vespa/vespalib/util/jsonwriter.h>
 #include <vespa/document/fieldvalue/literalfieldvalue.h>
 #include <vespa/document/base/exceptions.h>
 #include <vespa/log/log.h>
@@ -216,7 +214,6 @@ DocsumFilter::DocsumFilter(const DocsumToolsPtr &tools, const IDocSumCache & doc
     _fields(),
     _highestFieldNo(0),
     _packer(tools.get() ? tools->getResultConfig() : NULL),
-    _jsonWriter(),
     _flattenWriter(),
     _snippetModifiers(NULL),
     _cachedValue(),
@@ -316,33 +313,6 @@ DocsumFilter::writeField(const document::FieldValue & fv, const FieldPath & path
     }
 }
 
-void
-DocsumFilter::writeJSONField(const DocsumFieldSpec & fieldSpec,
-                             const Document & docsum,
-                             ResultPacker & packer)
-{
-    if (fieldSpec.getCommand() == VsmsummaryConfig::Fieldmap::NONE) {
-        const DocsumFieldSpec::FieldIdentifier & fieldId = fieldSpec.getOutputField();
-        const document::FieldValue * fv = docsum.getField(fieldId.getId());
-        if (fv != NULL) {
-            LOG(debug, "writeJSONField: About to write field '%d' as JSONSTRING: field value = '%s'",
-                fieldId.getId(), fv->toString().c_str());
-            if (!fieldSpec.hasIdentityMapping()) {
-                _jsonWriter.setInputFields(fieldSpec.getInputFields());
-            }
-            _jsonWriter.write(*fv);
-            vespalib::string s = _jsonWriter.getResult();
-            packer.AddLongString(s.c_str(), s.size());
-            _jsonWriter.clear();
-        } else {
-            LOG(debug, "writeJSONField: Field value not set for field '%d'", fieldId.getId());
-            packer.AddEmpty();
-        }
-    } else {
-        LOG(debug, "writeJSONField: Cannot handle this command");
-        packer.AddEmpty();
-    }
-}
 
 void
 DocsumFilter::writeSlimeField(const DocsumFieldSpec & fieldSpec,
@@ -467,7 +437,7 @@ DocsumFilter::getSummaryClassId() const
 }
 
 DocsumStoreValue
-DocsumFilter::getMappedDocsum(uint32_t id, bool useSlimeInsideFields)
+DocsumFilter::getMappedDocsum(uint32_t id)
 {
     const ResultClass *resClass = _tools->getResultClass();
     if (resClass == NULL) {
@@ -476,17 +446,12 @@ DocsumFilter::getMappedDocsum(uint32_t id, bool useSlimeInsideFields)
 
     const Document & doc = _docsumCache->getDocSum(id);
 
-    LOG(spam, "getMappedDocsum %u [useSlimeInsideFields=%s]", id, useSlimeInsideFields ? "true" : "false");
-
     _packer.Init(resClass->GetClassID());
     for (FieldSpecList::iterator it(_fields.begin()), end = _fields.end(); it != end; ++it) {
         ResType type = it->getResultType();
         if (type == RES_JSONSTRING || type == RES_XMLSTRING) {
-            if (useSlimeInsideFields) {
-                writeSlimeField(*it, doc, _packer);
-            } else {
-                writeJSONField(*it, doc, _packer);
-            }
+            // this really means 'structured data'
+            writeSlimeField(*it, doc, _packer);
         } else {
             if (it->getInputFields().size() == 1 && it->getCommand() == VsmsummaryConfig::Fieldmap::NONE) {
                 const DocsumFieldSpec::FieldIdentifier & fieldId = it->getInputFields()[0];
diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.h b/vsm/src/vespa/vsm/vsm/docsumfilter.h
index 370843a3789..d39526a2575 100644
--- a/vsm/src/vespa/vsm/vsm/docsumfilter.h
+++ b/vsm/src/vespa/vsm/vsm/docsumfilter.h
@@ -9,7 +9,6 @@
 #include <vespa/vsm/vsm/docsumfieldspec.h>
 #include <vespa/vsm/vsm/fieldsearchspec.h>
 #include <vespa/vsm/vsm/flattendocsumwriter.h>
-#include <vespa/vsm/vsm/jsondocsumwriter.h>
 #include <vespa/vsm/vsm/vsm-adapter.h>
 #include <vespa/searchsummary/docsummary/resultpacker.h>
 #include <vespa/searchsummary/docsummary/docsumstore.h>
@@ -38,7 +37,6 @@ private:
     FieldSpecList         _fields;        // list of summary fields to generate
     size_t                _highestFieldNo;
     ResultPacker          _packer;
-    JSONDocsumWriter      _jsonWriter;
     FlattenDocsumWriter   _flattenWriter;
     const FieldModifierMap * _snippetModifiers;
     document::FieldValue::UP _cachedValue;
@@ -52,7 +50,6 @@ private:
                                                VsmsummaryConfig::Fieldmap::Command command,
                                                const Document & docsum, bool & modified);
     void writeField(const document::FieldValue & fv, const FieldPath & path, ResType type, ResultPacker & packer);
-    void writeJSONField(const DocsumFieldSpec & fieldSpec, const Document & docsum, ResultPacker & packer);
     void writeSlimeField(const DocsumFieldSpec & fieldSpec, const Document & docsum, ResultPacker & packer);
     void writeFlattenField(const DocsumFieldSpec & fieldSpec, const Document & docsum, ResultPacker & packer);
     void writeEmpty(ResType type, ResultPacker & packer);
@@ -86,7 +83,7 @@ public:
     void setDocSumStore(const IDocSumCache & docsumCache) { _docsumCache = &docsumCache; }
 
     // Inherit doc from IDocsumStore
-    DocsumStoreValue getMappedDocsum(uint32_t id, bool useSlimeInsideFields) override;
+    DocsumStoreValue getMappedDocsum(uint32_t id) override;
     uint32_t getNumDocs() const override;
     uint32_t getSummaryClassId() const override;
 };