From a84b1073467eab96d0e08c4c9fd42cc343584791 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Thu, 18 Nov 2021 12:46:35 +0000 Subject: we no longer make any XML strings --- searchsummary/src/tests/docsummary/positionsdfw_test.cpp | 2 +- .../src/tests/docsummary/slime_summary/slime_summary_test.cpp | 4 ---- .../src/vespa/searchsummary/docsummary/attributedfw.cpp | 1 - .../src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp | 1 - .../src/vespa/searchsummary/docsummary/docsumwriter.cpp | 1 - .../src/vespa/searchsummary/docsummary/general_result.cpp | 1 - .../src/vespa/searchsummary/docsummary/positionsdfw.cpp | 10 ++-------- searchsummary/src/vespa/searchsummary/docsummary/resultclass.h | 1 - .../src/vespa/searchsummary/docsummary/resultconfig.cpp | 3 +-- .../src/vespa/searchsummary/docsummary/resultconfig.h | 6 ++---- .../src/vespa/searchsummary/docsummary/resultpacker.cpp | 1 - 11 files changed, 6 insertions(+), 25 deletions(-) (limited to 'searchsummary') diff --git a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp index 404179caff7..52a363c9888 100644 --- a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp +++ b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp @@ -134,7 +134,7 @@ void checkWritePositionField(Test &test, AttrType &attr, PositionsDFW::UP writer = createPositionsDFW(attr.getName().c_str(), &attribute_man); ASSERT_TRUE(writer.get()); - ResType res_type = RES_XMLSTRING; + ResType res_type = RES_JSONSTRING; MyGetDocsumsStateCallback callback; GetDocsumsState state(callback); state._attributes.push_back(&attr); diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp index 0a421882784..5855dd0e8fd 100644 --- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp +++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp @@ -65,8 +65,6 @@ struct DocsumFixture : IDocsumStore, GetDocsumsStateCallback { strlen("long_string"))); EXPECT_TRUE(packer->AddLongData( "long_data", strlen("long_data"))); - EXPECT_TRUE(packer->AddLongString( "xml_string", - strlen("xml_string"))); FieldBlock jsf1("{foo:1, bar:2}"); EXPECT_TRUE(packer->AddLongData(jsf1.data(), jsf1.dataLen())); EXPECT_TRUE(packer->AddLongString("abc", 3)); @@ -98,7 +96,6 @@ DocsumFixture::DocsumFixture() EXPECT_TRUE(cfg->AddConfigEntry("data_field", RES_DATA)); EXPECT_TRUE(cfg->AddConfigEntry("longstring_field", RES_LONG_STRING)); EXPECT_TRUE(cfg->AddConfigEntry("longdata_field", RES_LONG_DATA)); - EXPECT_TRUE(cfg->AddConfigEntry("xmlstring_field", RES_XMLSTRING)); EXPECT_TRUE(cfg->AddConfigEntry("jsonstring_field", RES_JSONSTRING)); EXPECT_TRUE(cfg->AddConfigEntry("bad_jsonstring_field", RES_JSONSTRING)); config->CreateEnumMaps(); @@ -121,7 +118,6 @@ TEST_FF("require that docsum can be written as slime", DocsumFixture(), Slime()) EXPECT_EQUAL(f2.get()["data_field"].asData().make_string(), std::string("data")); EXPECT_EQUAL(f2.get()["longstring_field"].asString().make_string(), std::string("long_string")); EXPECT_EQUAL(f2.get()["longdata_field"].asData().make_string(), std::string("long_data")); - EXPECT_EQUAL(f2.get()["xmlstring_field"].asString().make_string(), std::string("xml_string")); EXPECT_EQUAL(f2.get()["jsonstring_field"]["foo"].asLong(), 1u); EXPECT_EQUAL(f2.get()["jsonstring_field"]["bar"].asLong(), 2u); EXPECT_EQUAL(f2.get()["bad_jsonstring_field"].type().getId(), 0u); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp index 6dd952f87ef..448feedac80 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp @@ -118,7 +118,6 @@ SingleAttrDFW::insertField(uint32_t docid, GetDocsumsState * state, ResType type } break; case RES_JSONSTRING: - case RES_XMLSTRING: case RES_FEATUREDATA: case RES_LONG_STRING: case RES_STRING: { diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp index afc1ec4b3f2..fada441f718 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp @@ -121,7 +121,6 @@ CopyDFW::insertField(uint32_t /*docid*/, GeneralResult *gres, GetDocsumsState *s target.insertLong(valint64); break; } - case RES_XMLSTRING: case RES_JSONSTRING: case RES_FEATUREDATA: case RES_LONG_STRING: diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp index 766ebdc51f4..666c5098ca4 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp @@ -120,7 +120,6 @@ static void convertEntry(GetDocsumsState *state, case RES_STRING: case RES_LONG_STRING: case RES_FEATUREDATA: - case RES_XMLSTRING: entry->_resolve_field(&ptr, &len, &state->_docSumFieldSpace); if (len != 0) { inserter.insertString(Memory(ptr, len)); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/general_result.cpp b/searchsummary/src/vespa/searchsummary/docsummary/general_result.cpp index 3c01c23c965..ceb358e5859 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/general_result.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/general_result.cpp @@ -255,7 +255,6 @@ GeneralResult::unpack(const char *buf, const size_t buflen) break; } - case RES_XMLSTRING: case RES_JSONSTRING: case RES_FEATUREDATA: case RES_LONG_STRING: { diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp index 1d1fffa451c..ce14069a135 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp @@ -94,15 +94,10 @@ AbsDistanceDFW::insertField(uint32_t docid, GetDocsumsState *state, ResType type vespalib::string value = vespalib::stringify(absdist); vespalib::Memory data(value.c_str(), value.size()); - if (type == RES_STRING || - type == RES_LONG_STRING || - type == RES_XMLSTRING) - { + if (type == RES_STRING || type == RES_LONG_STRING) { target.insertString(data); } - if (type == RES_LONG_DATA || - type == RES_DATA) - { + if (type == RES_LONG_DATA || type == RES_DATA) { target.insertData(data); } } @@ -176,7 +171,6 @@ insertFromAttr(const attribute::IAttributeVector &attribute, uint32_t docid, ves void checkExpected(ResType type) { static bool alreadyWarned = false; if (type == RES_JSONSTRING) return; - if (type == RES_XMLSTRING) return; if (alreadyWarned) return; alreadyWarned = true; LOG(error, "Unexpected summary field type %s", ResultConfig::GetResTypeName(type)); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h index 97435d793be..858fdea2404 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h @@ -27,7 +27,6 @@ enum ResType { RES_DATA, RES_LONG_STRING, RES_LONG_DATA, - RES_XMLSTRING, RES_JSONSTRING, RES_TENSOR, RES_FEATUREDATA diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp index 09604a7316c..28105af57d5 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp @@ -53,7 +53,6 @@ ResultConfig::GetResTypeName(ResType type) case RES_DATA: return "data"; case RES_LONG_STRING: return "longstring"; case RES_LONG_DATA: return "longdata"; - case RES_XMLSTRING: return "xmlstring"; case RES_JSONSTRING: return "jsonstring"; case RES_TENSOR: return "tensor"; case RES_FEATUREDATA: return "featuredata"; @@ -173,7 +172,7 @@ ResultConfig::ReadConfig(const vespa::config::search::SummaryConfig &cfg, const } else if (strcmp(fieldtype, "longdata") == 0) { rc = resClass->AddConfigEntry(fieldname, RES_LONG_DATA); } else if (strcmp(fieldtype, "xmlstring") == 0) { - rc = resClass->AddConfigEntry(fieldname, RES_XMLSTRING); + rc = resClass->AddConfigEntry(fieldname, RES_JSONSTRING); } else if (strcmp(fieldtype, "jsonstring") == 0) { rc = resClass->AddConfigEntry(fieldname, RES_JSONSTRING); } else if (strcmp(fieldtype, "tensor") == 0) { diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h index 4cc37512929..3be83014fdb 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h @@ -123,11 +123,10 @@ public: return (b == RES_STRING || b == RES_DATA); case RES_LONG_STRING: case RES_LONG_DATA: - case RES_XMLSTRING: case RES_FEATUREDATA: case RES_JSONSTRING: return (b == RES_LONG_STRING || b == RES_LONG_DATA || - b == RES_XMLSTRING || b == RES_FEATUREDATA || b == RES_JSONSTRING); + b == RES_FEATUREDATA || b == RES_JSONSTRING); default: return false; } @@ -159,9 +158,8 @@ public: return b == RES_INT64; case RES_STRING: case RES_LONG_STRING: - case RES_XMLSTRING: case RES_JSONSTRING: - return (b == RES_STRING || b == RES_LONG_STRING || b == RES_XMLSTRING || b == RES_JSONSTRING); + return (b == RES_STRING || b == RES_LONG_STRING || b == RES_JSONSTRING); case RES_DATA: case RES_LONG_DATA: return (b == RES_DATA || b == RES_LONG_DATA); diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp index 6c2c4f9c4ea..4ab06cbd41a 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/resultpacker.cpp @@ -114,7 +114,6 @@ ResultPacker::AddEmpty() case RES_INT64: return AddInt64(search::attribute::getUndefined()); case RES_STRING: return AddString(nullptr, 0); case RES_DATA: return AddData(nullptr, 0); - case RES_XMLSTRING: case RES_JSONSTRING: case RES_FEATUREDATA: case RES_LONG_STRING: return AddLongString(nullptr, 0); -- cgit v1.2.3