Merge pull request #6107 from vespa-engine/toregge/cleanup-searchsummary

Cleanup searchsummary

32 files changed, 0 insertions, 550 deletions

diff --git a/searchsummary/src/tests/docsumformat/.gitignore b/searchsummary/src/tests/docsumformat/.gitignore
index 2c841cbd43d..6612a2f38bb 100644
--- a/searchsummary/src/tests/docsumformat/.gitignore
+++ b/searchsummary/src/tests/docsumformat/.gitignore
@@ -8,14 +8,4 @@
 Makefile
 core
 core.*
-datapart.*
-docsum-index
-docsum-pack
-docsum-parse
-index.cf
-merged
-meta-info.txt
-schema.txt
-summary.cf
-version.txt
 searchsummary_docsum-pack_app
diff --git a/searchsummary/src/tests/docsumformat/docsum-index.sh b/searchsummary/src/tests/docsumformat/docsum-index.sh
deleted file mode 100755
index d921b8cc0b4..00000000000
--- a/searchsummary/src/tests/docsumformat/docsum-index.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-set -e
-
-findex=../../../bin/findex
-
-echo "CLEAN"
-rm -f index.cf
-rm -f summary.cf
-rm -rf merged
-rm -rf datapart.*
-
-echo "DOCSUM-INDEX"
-./docsum-index
-
-echo "AUTOINDEX"
-$findex autoindex
diff --git a/searchsummary/src/tests/docsumformat/docsum-parse.cpp b/searchsummary/src/tests/docsumformat/docsum-parse.cpp
deleted file mode 100644
index d3862913261..00000000000
--- a/searchsummary/src/tests/docsumformat/docsum-parse.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/log/log.h>
-LOG_SETUP("docsum-parse");
-#include <vespa/fnet/frt/frt.h>
-#include <vespa/fastlib/io/bufferedfile.h>
-#include <vespa/searchsummary/docsummary/urlresult.h>
-#include <vespa/searchsummary/docsummary/resultconfig.h>
-
-
-// needed to resolve external symbol from httpd.h on AIX
-void FastS_block_usr2() {}
-
-
-class MyApp : public FastOS_Application
-{
-public:
-    bool Equal(search::docsummary::ResConfigEntry *a, search::docsummary::ResConfigEntry *b);
-    bool Equal(search::docsummary::ResultClass *a, search::docsummary::ResultClass *b);
-    bool Equal(search::docsummary::ResultConfig *a, search::docsummary::ResultConfig *b);
-    bool TestCorrect(const char *dirname, const char *filename);
-    bool TestIncorrect(const char *dirname, const char *filename);
-    int Main();
-};
-
-
-bool
-MyApp::Equal(search::docsummary::ResConfigEntry *a, search::docsummary::ResConfigEntry *b)
-{
-    return ((a->_type == b->_type)
-            && (strcmp(a->_bindname, b->_bindname) == 0));
-}
-
-
-bool
-MyApp::Equal(search::docsummary::ResultClass *a, search::docsummary::ResultClass *b)
-{
-    bool rc = true;
-
-    rc = rc && (a->GetNumEntries() == b->GetNumEntries());
-    rc = rc && (a->GetClassID() == b->GetClassID());
-    rc = rc && (strcmp(a->GetClassName(), b->GetClassName()) == 0);
-
-    for (uint32_t i = 0; rc && i < a->GetNumEntries(); i++) {
-        rc = rc && Equal(a->GetEntry(i), b->GetEntry(i));
-    }
-
-    return rc;
-}
-
-
-bool
-MyApp::Equal(search::docsummary::ResultConfig *a, search::docsummary::ResultConfig *b)
-{
-    bool rc = true;
-
-    search::docsummary::ResultClass *resClassA;
-    search::docsummary::ResultClass *resClassB;
-
-    rc = rc && (a->GetNumResultClasses() == b->GetNumResultClasses());
-
-    resClassA = a->GetResultClasses();
-    resClassB = b->GetResultClasses();
-
-    while(rc && resClassA != NULL && resClassB != NULL) {
-        rc = rc && Equal(resClassA, resClassB);
-        resClassA = resClassA->GetNextClass();
-        resClassB = resClassB->GetNextClass();
-    }
-    rc = rc && (resClassA == NULL);
-    rc = rc && (resClassB == NULL);
-
-    return rc;
-}
-
-
-bool
-MyApp::TestCorrect(const char *dirname, const char *filename)
-{
-    char str1[512]; // test input file
-    char str2[512]; // test output file
-    char str3[512]; // summary.cf verification file
-
-    search::docsummary::ResultConfig a;
-    search::docsummary::ResultConfig b;
-    search::docsummary::ResultConfig c;
-    search::docsummary::ResultConfig d;
-
-    sprintf(str1, "%s%s%s", dirname,
-            FastOS_FileInterface::GetPathSeparator(), filename);
-    sprintf(str2, "%s%sout.%s", dirname,
-            FastOS_FileInterface::GetPathSeparator(), filename);
-    sprintf(str3, "%s%sOK.%s", dirname,
-            FastOS_FileInterface::GetPathSeparator(), filename);
-
-    if (!a.ReadConfig(str1)) {
-        LOG(error, "could not read config from : %s", str1);
-        return false;
-    }
-
-    if (!a.WriteConfig(str2)) {
-        LOG(error, "could not write config to : %s", str2);
-        return false;
-    }
-
-    if (!b.ReadConfig(str2)) {
-        LOG(error, "could not read config from : %s", str2);
-        return false;
-    }
-
-    if (!c.ReadConfig(str3)) {
-        LOG(error, "could not read config from : %s", str3);
-        return false;
-    }
-
-    if (!Equal(&a, &b)) {
-        LOG(error, "%s and %s does not contain the same config", str1, str2);
-        return false;
-    }
-
-    if (!Equal(&a, &c)) {
-        LOG(error, "%s and %s does not contain the same config", str1, str3);
-        return false;
-    }
-
-    if (!Equal(&b, &c)) {
-        LOG(error, "%s and %s does not contain the same config", str2, str3);
-        return false;
-    }
-
-    FRT_RPCRequest *req = new FRT_RPCRequest();
-    assert(req != NULL);
-    c.GetConfig(req);
-    d.SetConfig(req);
-    if (!Equal(&c, &d)) {
-        LOG(error, "RPC get/set failed (%s)", str3);
-        req->SubRef();
-        return false;
-    }
-    req->SubRef();
-
-    return true;
-}
-
-
-bool
-MyApp::TestIncorrect(const char *dirname, const char *filename)
-{
-    char str[512];
-
-    sprintf(str, "%s%s%s", dirname,
-            FastOS_FileInterface::GetPathSeparator(), filename);
-
-    search::docsummary::ResultConfig resConfig;
-
-    if (resConfig.ReadConfig(str)) {
-        LOG(error, "'%s' did not give parse error", str);
-        return false;
-    }
-    return true;
-}
-
-
-int
-MyApp::Main()
-{
-    bool rc = true;
-
-    FastOS_DirectoryScan dirScan("parsetest");
-    LOG(info, "looking for input files in 'parsetest'...");
-    while (dirScan.ReadNext()) {
-        if (strncmp(dirScan.GetName(), "correct.", 8) == 0) {
-            if (TestCorrect("parsetest", dirScan.GetName())) {
-                LOG(info, "'%s' : positive test PASSED", dirScan.GetName());
-            } else {
-                LOG(error, "'%s' : positive test FAILED", dirScan.GetName());
-                rc = false;
-            }
-        } else if (strncmp(dirScan.GetName(), "incorrect.", 10) == 0) {
-            if (TestIncorrect("parsetest", dirScan.GetName())) {
-                LOG(info, "'%s' : negative test PASSED", dirScan.GetName());
-            } else {
-                LOG(error, "'%s' : negative test FAILED", dirScan.GetName());
-                rc = false;
-            }
-        }
-    }
-    return (rc ? 0 : 1);
-}
-
-
-int
-main(int argc, char **argv)
-{
-    MyApp myapp;
-    return myapp.Entry(argc, argv);
-}
diff --git a/searchsummary/src/tests/docsumformat/parsetest/.gitignore b/searchsummary/src/tests/docsumformat/parsetest/.gitignore
deleted file mode 100644
index 19815d313ff..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.out
-out.*
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.1 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.1
deleted file mode 100644
index 8238b53f81c..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.1
+++ /dev/null
@@ -1,17 +0,0 @@
-idtype none
-
-class default id 0
-field URL type string
-field TITLE type string
-field TEASER type string
-field DSHOST type integer
-field DSKEY type integer
-field BYTES type integer
-field WORDS type integer
-field MODDATE type integer
-field CRAWLDATE type integer
-field LANG1 type byte
-field LANG2 type byte
-field LANG3 type byte
-field LANG4 type byte
-field CHARSET type integer
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.2 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.2
deleted file mode 100644
index 8996c2dac4c..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.2
+++ /dev/null
@@ -1,14 +0,0 @@
-idtype byte
-
-class document id 1
-field title type string
-field teaser type string
-field url type string
-field date type integer
-
-class image id 2
-field title type string
-field date type integer
-field width type short
-field height type short
-field bitmaps type byte
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.3 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.3
deleted file mode 100644
index ae29fa40335..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.3
+++ /dev/null
@@ -1,5 +0,0 @@
-idtype none
-
-class default id 0
-field TITLE type string
-field DATE type integer
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.4 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.4
deleted file mode 100644
index 8238b53f81c..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.4
+++ /dev/null
@@ -1,17 +0,0 @@
-idtype none
-
-class default id 0
-field URL type string
-field TITLE type string
-field TEASER type string
-field DSHOST type integer
-field DSKEY type integer
-field BYTES type integer
-field WORDS type integer
-field MODDATE type integer
-field CRAWLDATE type integer
-field LANG1 type byte
-field LANG2 type byte
-field LANG3 type byte
-field LANG4 type byte
-field CHARSET type integer
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.5 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.5
deleted file mode 100644
index 6b6dc874a68..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.5
+++ /dev/null
@@ -1,3 +0,0 @@
-idtype byte
-
-class myclass id 42
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.6 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.6
deleted file mode 100644
index 38416fdf45e..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.6
+++ /dev/null
@@ -1,5 +0,0 @@
-idtype none
-
-class default id 0
-field TEASER type longstring
-field DOCTEXT type longdata
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.7 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.7
deleted file mode 100644
index d1f17d25141..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.7
+++ /dev/null
@@ -1,11 +0,0 @@
-idtype short
-
-class class_1 id 1
-field title type string
-field rawteaser type data
-field doctext type longdata
-field dynteaser type longstring
-
-class class_2 id 2
-field title type string
-field rawteaser type longdata
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.8 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.8
deleted file mode 100644
index e929b872a05..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.8
+++ /dev/null
@@ -1,7 +0,0 @@
-idtype integer
-
-class class_50 id 50
-field title type data
-
-class class_100 id 100
-field title type string
diff --git a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.9 b/searchsummary/src/tests/docsumformat/parsetest/OK.correct.9
deleted file mode 100644
index 668505be77d..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/OK.correct.9
+++ /dev/null
@@ -1,13 +0,0 @@
-idtype none
-
-class default id 0
-field f0 type integer
-field f1 type short
-field f2 type byte
-field f3 type float
-field f4 type double
-field f5 type int64
-field f6 type string
-field f7 type data
-field f8 type longstring
-field f9 type longdata
diff --git a/searchsummary/src/tests/docsumformat/parsetest/README b/searchsummary/src/tests/docsumformat/parsetest/README
deleted file mode 100644
index 2de83e1b0cb..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/README
+++ /dev/null
@@ -1,24 +0,0 @@
-The files in this directory are used to test the parsing of document
-summary format config files. The files are named by the following
-rules:
-
-incorrect.*  : these files are incorrect; loading them should fail.
-
-correct.*    : these files are correct; loading them should succeed.
-
-OK.correct.* : these files contain normalized config on 'summary.cf'
-               format that matches the config contained in
-               the corresponding 'correct.*' files.
-
-The 'docsum-parse' program loops through all files in this
-directory. For each file that has a name beginning with 'incorrect.',
-it checks that loading document summary format config from it
-fails. For each file that has a name beginning with 'correct.', it
-checks that document summary format config may be read from the
-file. It then writes the config back to a file named 'out.correct.<>',
-reads the newly generated file back in, reads the corresponding
-'OK.correct.<>' file and checks that all 3 configs are exactly the
-same.
-
-New tests may be added simply be adding files conforming to the above
-rules to this directory.
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.1 b/searchsummary/src/tests/docsumformat/parsetest/correct.1
deleted file mode 100644
index 0b3d57b7f9c..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.1
+++ /dev/null
@@ -1,14 +0,0 @@
-STRING URL
-STRING TITLE
-STRING TEASER
-INT DSHOST
-INT DSKEY
-INT BYTES
-INT WORDS
-INT MODDATE
-INT CRAWLDATE
-BYTE LANG1
-BYTE LANG2
-BYTE LANG3
-BYTE LANG4
-INT CHARSET
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.2 b/searchsummary/src/tests/docsumformat/parsetest/correct.2
deleted file mode 100644
index 8996c2dac4c..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.2
+++ /dev/null
@@ -1,14 +0,0 @@
-idtype byte
-
-class document id 1
-field title type string
-field teaser type string
-field url type string
-field date type integer
-
-class image id 2
-field title type string
-field date type integer
-field width type short
-field height type short
-field bitmaps type byte
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.3 b/searchsummary/src/tests/docsumformat/parsetest/correct.3
deleted file mode 100644
index 8a16e3f3fd1..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.3
+++ /dev/null
@@ -1,3 +0,0 @@
-idtype byte
-STRING TITLE
-INT DATE
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.4 b/searchsummary/src/tests/docsumformat/parsetest/correct.4
deleted file mode 100644
index 8238b53f81c..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.4
+++ /dev/null
@@ -1,17 +0,0 @@
-idtype none
-
-class default id 0
-field URL type string
-field TITLE type string
-field TEASER type string
-field DSHOST type integer
-field DSKEY type integer
-field BYTES type integer
-field WORDS type integer
-field MODDATE type integer
-field CRAWLDATE type integer
-field LANG1 type byte
-field LANG2 type byte
-field LANG3 type byte
-field LANG4 type byte
-field CHARSET type integer
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.5 b/searchsummary/src/tests/docsumformat/parsetest/correct.5
deleted file mode 100644
index d179537e208..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.5
+++ /dev/null
@@ -1,4 +0,0 @@
-idtype byte
-class myclass id 42
-STRING TITLE
-INT DATE
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.6 b/searchsummary/src/tests/docsumformat/parsetest/correct.6
deleted file mode 100644
index a4e41ec72d8..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.6
+++ /dev/null
@@ -1,2 +0,0 @@
-LONGSTRING TEASER
-LONGDATA DOCTEXT
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.7 b/searchsummary/src/tests/docsumformat/parsetest/correct.7
deleted file mode 100644
index d1f17d25141..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.7
+++ /dev/null
@@ -1,11 +0,0 @@
-idtype short
-
-class class_1 id 1
-field title type string
-field rawteaser type data
-field doctext type longdata
-field dynteaser type longstring
-
-class class_2 id 2
-field title type string
-field rawteaser type longdata
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.8 b/searchsummary/src/tests/docsumformat/parsetest/correct.8
deleted file mode 100644
index e929b872a05..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.8
+++ /dev/null
@@ -1,7 +0,0 @@
-idtype integer
-
-class class_50 id 50
-field title type data
-
-class class_100 id 100
-field title type string
diff --git a/searchsummary/src/tests/docsumformat/parsetest/correct.9 b/searchsummary/src/tests/docsumformat/parsetest/correct.9
deleted file mode 100644
index 668505be77d..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/correct.9
+++ /dev/null
@@ -1,13 +0,0 @@
-idtype none
-
-class default id 0
-field f0 type integer
-field f1 type short
-field f2 type byte
-field f3 type float
-field f4 type double
-field f5 type int64
-field f6 type string
-field f7 type data
-field f8 type longstring
-field f9 type longdata
diff --git a/searchsummary/src/tests/docsumformat/parsetest/incorrect.1 b/searchsummary/src/tests/docsumformat/parsetest/incorrect.1
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/incorrect.1
+++ /dev/null
diff --git a/searchsummary/src/tests/docsumformat/parsetest/incorrect.2 b/searchsummary/src/tests/docsumformat/parsetest/incorrect.2
deleted file mode 100644
index 600380f898d..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/incorrect.2
+++ /dev/null
@@ -1,14 +0,0 @@
-idtype int
-
-class document id 1
-field title type string
-field teaser type string
-field url type string
-field date type integer
-
-class image id 2
-field title type string
-field date type integer
-field width type short
-field height type short
-field bitmaps type byte
diff --git a/searchsummary/src/tests/docsumformat/parsetest/incorrect.3 b/searchsummary/src/tests/docsumformat/parsetest/incorrect.3
deleted file mode 100644
index 35d46b73f96..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/incorrect.3
+++ /dev/null
@@ -1,14 +0,0 @@
-idtype byte
-
-class document id 1
-field title type string
-field teaser type string
-field url type string
-field date type integer
-
-class image id 1
-field title type string
-field date type integer
-field width type short
-field height type short
-field bitmaps type byte
diff --git a/searchsummary/src/tests/docsumformat/parsetest/incorrect.4 b/searchsummary/src/tests/docsumformat/parsetest/incorrect.4
deleted file mode 100644
index f50c143b4be..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/incorrect.4
+++ /dev/null
@@ -1,14 +0,0 @@
-idtype byte
-
-class document id 1
-field title type string
-field teaser type string
-field url type string
-field date type int
-
-class image id 2
-field title type string
-field date type integer
-field width type short
-field height type short
-field bitmaps type byte
diff --git a/searchsummary/src/tests/docsumformat/parsetest/incorrect.5 b/searchsummary/src/tests/docsumformat/parsetest/incorrect.5
deleted file mode 100644
index 6579c30a29d..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/incorrect.5
+++ /dev/null
@@ -1,14 +0,0 @@
-idtype byte
-
-class document id 1
-field title type string
-field teaser type string
-field url type string
-field url type integer
-
-class image id 2
-field title type string
-field date type integer
-field width type short
-field height type short
-field bitmaps type byte
diff --git a/searchsummary/src/tests/docsumformat/parsetest/incorrect.6 b/searchsummary/src/tests/docsumformat/parsetest/incorrect.6
deleted file mode 100644
index 2ce1ab9507e..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/incorrect.6
+++ /dev/null
@@ -1,13 +0,0 @@
-idtype byte
-
-field title type string
-field teaser type string
-field url type string
-field date type integer
-
-class image id 2
-field title type string
-field date type integer
-field width type short
-field height type short
-field bitmaps type byte
diff --git a/searchsummary/src/tests/docsumformat/parsetest/incorrect.7 b/searchsummary/src/tests/docsumformat/parsetest/incorrect.7
deleted file mode 100644
index e51bb1d2d48..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/incorrect.7
+++ /dev/null
@@ -1,14 +0,0 @@
-STRING URL
-STRING TITLE
-STRING TITLE
-INT DSHOST
-INT DSKEY
-INT BYTES
-INT WORDS
-INT MODDATE
-INT CRAWLDATE
-BYTE LANG1
-BYTE LANG2
-BYTE LANG3
-BYTE LANG4
-INT CHARSET
diff --git a/searchsummary/src/tests/docsumformat/parsetest/incorrect.8 b/searchsummary/src/tests/docsumformat/parsetest/incorrect.8
deleted file mode 100644
index 7639557b734..00000000000
--- a/searchsummary/src/tests/docsumformat/parsetest/incorrect.8
+++ /dev/null
@@ -1,2 +0,0 @@
-idtype byte
-STRING TITLE
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
index 198f2525244..fccfe0e73c8 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
@@ -24,44 +24,6 @@ using search::attribute::BasicType;
 
 namespace search::docsummary {
 
-ResType inferType(const IAttributeVector & vec) {
-    ResType retval;
-    if (vec.hasMultiValue()) {
-        retval = RES_STRING;
-    } else {
-        if (vec.isStringType()) {
-            retval = RES_STRING;
-        } else {
-            size_t fw = vec.getFixedWidth();
-            if (vec.isIntegerType()) {
-                if (fw == sizeof(uint8_t)) {
-                    retval = RES_BYTE;
-                } else if (fw == sizeof(uint16_t)) {
-                    retval = RES_SHORT;
-                } else if (fw == sizeof(uint32_t)) {
-                    retval = RES_INT;
-                } else {
-                    retval = RES_INT64;
-                }
-            } else if (vec.isFloatingPointType()) {
-                retval = (fw == sizeof(float)) ? RES_FLOAT : RES_DOUBLE;
-            } else {
-                BasicType::Type t = vec.getBasicType();
-                switch (t) {
-                case BasicType::TENSOR:
-                    retval = RES_TENSOR;
-                    break;
-                default:
-                    retval = RES_STRING;
-                }
-            }
-        }
-    }
-    return retval;
-}
-
-//-----------------------------------------------------------------------------
-
 AttrDFW::AttrDFW(const vespalib::string & attrName) :
     _attrName(attrName)
 {