diff options
4 files changed, 3 insertions, 16 deletions
diff --git a/document/src/tests/documenttypetestcase.cpp b/document/src/tests/documenttypetestcase.cpp index 9f4ea13cef4..b2aeccdf8de 100644 --- a/document/src/tests/documenttypetestcase.cpp +++ b/document/src/tests/documenttypetestcase.cpp @@ -7,8 +7,6 @@ #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/exceptions.h> -#include <sstream> - using document::config_builder::Struct; using document::config_builder::Wset; using document::config_builder::Array; diff --git a/document/src/vespa/document/serialization/vespadocumentserializer.cpp b/document/src/vespa/document/serialization/vespadocumentserializer.cpp index 3a45fd49615..c9ab4be172a 100644 --- a/document/src/vespa/document/serialization/vespadocumentserializer.cpp +++ b/document/src/vespa/document/serialization/vespadocumentserializer.cpp @@ -4,7 +4,6 @@ #include "annotationserializer.h" #include "slime_output_to_vector.h" #include "util.h" -#include <vespa/document/fieldset/fieldsets.h> #include <vespa/document/fieldvalue/annotationreferencefieldvalue.h> #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/bytefieldvalue.h> @@ -18,12 +17,10 @@ #include <vespa/document/fieldvalue/rawfieldvalue.h> #include <vespa/document/fieldvalue/shortfieldvalue.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> -#include <vespa/document/fieldvalue/structfieldvalue.h> #include <vespa/document/fieldvalue/weightedsetfieldvalue.h> #include <vespa/document/fieldvalue/tensorfieldvalue.h> #include <vespa/document/update/updates.h> #include <vespa/document/update/fieldpathupdates.h> -#include <vespa/document/util/compressionconfig.h> #include <vespa/vespalib/data/slime/binary_format.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/eval/tensor/serialization/typed_binary_format.h> diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/fieldcache.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/fieldcache.cpp index 15aacdd4589..a810c02c660 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/fieldcache.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/fieldcache.cpp @@ -1,10 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".proton.docsummary.fieldcache"); #include "fieldcache.h" #include <vespa/document/fieldvalue/document.h> +#include <vespa/log/log.h> +LOG_SETUP(".proton.docsummary.fieldcache"); using namespace document; using namespace search::docsummary; @@ -27,8 +26,7 @@ FieldCache::FieldCache(const ResultClass &resClass, if (docType.hasField(fieldName)) { const Field &field = docType.getField(fieldName); LOG(debug, "Caching Field instance for field '%s': %s.%u", - fieldName.c_str(), field.getName().c_str(), - field.getId(Document::getNewestSerializationVersion())); + fieldName.c_str(), field.getName().c_str(), field.getId()); _cache.push_back(Field::CSP(new Field(field))); } else { _cache.push_back(Field::CSP()); diff --git a/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp b/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp index c9b90a21240..8b37645a306 100644 --- a/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp +++ b/searchlib/src/vespa/searchlib/index/doctypebuilder.cpp @@ -1,14 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "doctypebuilder.h" -#include <vespa/document/datatype/datatypes.h> #include <vespa/document/datatype/urldatatype.h> -#include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/document/repo/configbuilder.h> -#include <vespa/log/log.h> - -LOG_SETUP(".index.doctypebuilder"); using namespace document; using namespace search::index; |