aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2018-08-17 19:14:31 +0200
committerTor Egge <Tor.Egge@broadpark.no>2018-08-17 19:14:31 +0200
commit50864ea5418c50651104f7c32810b7fc019e0092 (patch)
tree09d672737be78cd47ac5811b31b31efc950a9b5b
parent1715b8393827c159f8709033075066b29932f852 (diff)
Remove unused getIndexName method.
-rw-r--r--searchlib/src/tests/attribute/attribute_test.cpp11
-rw-r--r--searchlib/src/vespa/searchlib/attribute/attributevector.cpp23
-rw-r--r--searchlib/src/vespa/searchlib/attribute/attributevector.h1
3 files changed, 0 insertions, 35 deletions
diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp
index efa6488739c..d9f7d705775 100644
--- a/searchlib/src/tests/attribute/attribute_test.cpp
+++ b/searchlib/src/tests/attribute/attribute_test.cpp
@@ -254,36 +254,25 @@ void AttributeTest::testBaseName()
{
AttributeVector::BaseName v("attr1");
EXPECT_EQUAL(v.getAttributeName(), "attr1");
- // EXPECT_TRUE(v.getIndexName().empty());
- EXPECT_EQUAL("", v.getIndexName());
EXPECT_TRUE(v.getDirName().empty());
v = "attribute/attr1/attr1";
EXPECT_EQUAL(v.getAttributeName(), "attr1");
- // EXPECT_TRUE(v.getIndexName().empty());
- EXPECT_EQUAL("", v.getIndexName());
EXPECT_EQUAL(v.getDirName(), "attribute/attr1");
v = "attribute/attr1/snapshot-X/attr1";
EXPECT_EQUAL(v.getAttributeName(), "attr1");
- // EXPECT_TRUE(v.getIndexName().empty());
- EXPECT_EQUAL("", v.getIndexName());
EXPECT_EQUAL(v.getDirName(), "attribute/attr1/snapshot-X");
v = "/attribute/attr1/snapshot-X/attr1";
EXPECT_EQUAL(v.getAttributeName(), "attr1");
- // EXPECT_TRUE(v.getIndexName().empty());
- EXPECT_EQUAL("", v.getIndexName());
EXPECT_EQUAL(v.getDirName(), "/attribute/attr1/snapshot-X");
v = "index.1/1.ready/attribute/attr1/snapshot-X/attr1";
EXPECT_EQUAL(v.getAttributeName(), "attr1");
- EXPECT_EQUAL(v.getIndexName(), "index.1");
EXPECT_EQUAL(v.getDirName(), "index.1/1.ready/attribute/attr1/snapshot-X");
v = "/index.1/1.ready/attribute/attr1/snapshot-X/attr1";
EXPECT_EQUAL(v.getAttributeName(), "attr1");
- EXPECT_EQUAL(v.getIndexName(), "index.1");
EXPECT_EQUAL(v.getDirName(),
"/index.1/1.ready/attribute/attr1/snapshot-X");
v = "xxxyyyy/zzz/index.1/1.ready/attribute/attr1/snapshot-X/attr1";
EXPECT_EQUAL(v.getAttributeName(), "attr1");
- EXPECT_EQUAL(v.getIndexName(), "index.1");
EXPECT_EQUAL(v.getDirName(),
"xxxyyyy/zzz/index.1/1.ready/attribute/attr1/snapshot-X");
}
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index 41e53bac5f3..71a386dc372 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -72,29 +72,6 @@ AttributeVector::BaseName::~BaseName() = default;
AttributeVector::BaseName::string
-AttributeVector::BaseName::getIndexName() const
-{
- // "$VESPA_HOME/var/db/vespa/search/cluster.search/r0/c0/typetest_search/1.ready/attribute/stringfield/snapshot-0/stringfield"
- string index;
- size_t snapshotPos(rfind("/snapshot-"));
- if (snapshotPos == string::npos)
- return index;
- size_t attrNamePos(rfind('/', snapshotPos - 1));
- if (attrNamePos == string::npos || attrNamePos == 0)
- return index;
- size_t attrStrPos(rfind('/', attrNamePos - 1));
- if (attrStrPos == string::npos || attrStrPos == 0)
- return index;
- size_t subDBPos(rfind('/', attrStrPos - 1));
- if (subDBPos == string::npos || subDBPos == 0)
- return index;
- size_t indexNamePos(rfind('/', subDBPos - 1));
- if (indexNamePos == string::npos)
- return substr(0, subDBPos);
- return substr(indexNamePos + 1, subDBPos - indexNamePos - 1);
-}
-
-AttributeVector::BaseName::string
AttributeVector::BaseName::createAttributeName(vespalib::stringref s)
{
size_t p(s.rfind('/'));
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index 57498edfde3..b06f32729ea 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -140,7 +140,6 @@ public:
BaseName(vespalib::stringref base, vespalib::stringref name);
~BaseName();
- string getIndexName() const;
const string & getAttributeName() const { return _name; }
string getDirName() const;
private: