Reduce verbosity of method name for getting phrase splitter query env.

3 files changed, 19 insertions, 19 deletions

diff --git a/searchlib/src/tests/fef/phrasesplitter/phrasesplitter_test.cpp b/searchlib/src/tests/fef/phrasesplitter/phrasesplitter_test.cpp
index afd422024d1..73fe22c2799 100644
--- a/searchlib/src/tests/fef/phrasesplitter/phrasesplitter_test.cpp
+++ b/searchlib/src/tests/fef/phrasesplitter/phrasesplitter_test.cpp
@@ -87,11 +87,11 @@ PhraseSplitterTest::testSplitter()
         MatchData::UP md = mdl.createMatchData();
         PhraseSplitterQueryEnv ps_query_env(qe, 0);
         PhraseSplitter ps(ps_query_env);
-        ASSERT_TRUE(ps.get_phrase_splitter_query_env().getNumTerms() == 1);
+        ASSERT_TRUE(ps.get_query_env().getNumTerms() == 1);
         ps.bind_match_data(*md);
         ps.update();
         // check that nothing is served from the splitter
-        EXPECT_EQUAL(ps.get_phrase_splitter_query_env().getTerm(0), &terms[0]);
+        EXPECT_EQUAL(ps.get_query_env().getTerm(0), &terms[0]);
         TermFieldHandle handle = terms[0].lookupField(0)->getHandle();
         EXPECT_EQUAL(ps.resolveTermField(handle), md->resolveTermField(handle));
     }
@@ -107,13 +107,13 @@ PhraseSplitterTest::testSplitter()
         MatchData::UP md = mdl.createMatchData();
         PhraseSplitterQueryEnv ps_query_env(qe, 7);
         PhraseSplitter ps(ps_query_env);
-        ASSERT_TRUE(ps.get_phrase_splitter_query_env().getNumTerms() == 3);
+        ASSERT_TRUE(ps.get_query_env().getNumTerms() == 3);
         ps.bind_match_data(*md);
         ps.update();
         // check that all is served from the splitter
         for (size_t i = 0; i < 3; ++i) {
             // fprintf(stderr, "checking term %d\n", (int)i);
-            const ITermData *td = ps.get_phrase_splitter_query_env().getTerm(i);
+            const ITermData *td = ps.get_query_env().getTerm(i);
             EXPECT_NOT_EQUAL(td, &terms[0]);
             EXPECT_NOT_EQUAL(td->lookupField(7), (ITermFieldData *)0);
             EXPECT_EQUAL(td->lookupField(0), (ITermFieldData *)0);
@@ -140,14 +140,14 @@ PhraseSplitterTest::testSplitter()
         MatchData::UP md = mdl.createMatchData();
         PhraseSplitterQueryEnv ps_query_env(qe, 4);
         PhraseSplitter ps(ps_query_env);
-        ASSERT_TRUE(ps.get_phrase_splitter_query_env().getNumTerms() == 5);
+        ASSERT_TRUE(ps.get_query_env().getNumTerms() == 5);
         ps.bind_match_data(*md);
         ps.update();
         { // first term
             // fprintf(stderr, "first term\n");
-            EXPECT_EQUAL(ps.get_phrase_splitter_query_env().getTerm(0), &terms[0]);
-            TEST_DO(assertTermData(ps.get_phrase_splitter_query_env().getTerm(0), 0, 1, 4, 0));
-            TEST_DO(assertTermData(ps.get_phrase_splitter_query_env().getTerm(0), 0, 1, 7, 1));
+            EXPECT_EQUAL(ps.get_query_env().getTerm(0), &terms[0]);
+            TEST_DO(assertTermData(ps.get_query_env().getTerm(0), 0, 1, 4, 0));
+            TEST_DO(assertTermData(ps.get_query_env().getTerm(0), 0, 1, 7, 1));
 
             TermFieldHandle handle = terms[0].lookupField(4)->getHandle();
             EXPECT_EQUAL(ps.resolveTermField(handle), md->resolveTermField(handle));
@@ -156,7 +156,7 @@ PhraseSplitterTest::testSplitter()
         }
         for (size_t i = 0; i < 3; ++i) { // phrase
             // fprintf(stderr, "phrase term %zd\n", i);
-            const ITermData *td = ps.get_phrase_splitter_query_env().getTerm(i + 1);
+            const ITermData *td = ps.get_query_env().getTerm(i + 1);
             EXPECT_NOT_EQUAL(td, &terms[1]);
             TEST_DO(assertTermData(td, 1, 1, 4, i + 11)); // skipHandles == 11
             EXPECT_EQUAL(td->lookupField(7),  (ITermFieldData *)0);
@@ -165,9 +165,9 @@ PhraseSplitterTest::testSplitter()
         }
         { // last term
             // fprintf(stderr, "last term\n");
-            EXPECT_EQUAL(ps.get_phrase_splitter_query_env().getTerm(4), &terms[2]);
-            TEST_DO(assertTermData(ps.get_phrase_splitter_query_env().getTerm(4), 2, 1, 4, 4));
-            TEST_DO(assertTermData(ps.get_phrase_splitter_query_env().getTerm(4), 2, 1, 7, 5));
+            EXPECT_EQUAL(ps.get_query_env().getTerm(4), &terms[2]);
+            TEST_DO(assertTermData(ps.get_query_env().getTerm(4), 2, 1, 4, 4));
+            TEST_DO(assertTermData(ps.get_query_env().getTerm(4), 2, 1, 7, 5));
 
             // fprintf(stderr, "inspect term %p #f %zd\n", &terms[2], terms[2].numFields());
             fflush(stderr);
@@ -195,7 +195,7 @@ PhraseSplitterTest::testSplitterUpdate()
         MatchData::UP md = mdl.createMatchData();
         PhraseSplitterQueryEnv ps_query_env(qe, 0);
         PhraseSplitter ps(ps_query_env);
-        ASSERT_TRUE(ps.get_phrase_splitter_query_env().getNumTerms() == 5);
+        ASSERT_TRUE(ps.get_query_env().getNumTerms() == 5);
         { // first phrase
             TermFieldMatchData * tmd = md->resolveTermField(terms[0].lookupField(0)->getHandle());
             tmd->appendPosition(TermFieldMatchDataPosition(0, 10, 0, 1000));
@@ -211,19 +211,19 @@ PhraseSplitterTest::testSplitterUpdate()
         ps.bind_match_data(*md);
         ps.update();
         for (size_t i = 0; i < 2; ++i) { // first phrase
-            const TermFieldMatchData * tmd = ps.resolveTermField(ps.get_phrase_splitter_query_env().getTerm(i)->lookupField(0)->getHandle());
+            const TermFieldMatchData * tmd = ps.resolveTermField(ps.get_query_env().getTerm(i)->lookupField(0)->getHandle());
             TermFieldMatchData::PositionsIterator itr = tmd->begin();
             EXPECT_EQUAL((itr++)->getPosition(), 10 + i);
             ASSERT_TRUE(itr == tmd->end());
         }
         { // first term
-            TermFieldMatchData * tmd = md->resolveTermField(ps.get_phrase_splitter_query_env().getTerm(2)->lookupField(0)->getHandle());
+            TermFieldMatchData * tmd = md->resolveTermField(ps.get_query_env().getTerm(2)->lookupField(0)->getHandle());
             TermFieldMatchData::PositionsIterator itr = tmd->begin();
             EXPECT_EQUAL((itr++)->getPosition(), 20u);
             ASSERT_TRUE(itr == tmd->end());
         }
         for (size_t i = 0; i < 2; ++i) { // second phrase
-            const TermFieldMatchData * tmd = ps.resolveTermField(ps.get_phrase_splitter_query_env().getTerm(i + 3)->lookupField(0)->getHandle());
+            const TermFieldMatchData * tmd = ps.resolveTermField(ps.get_query_env().getTerm(i + 3)->lookupField(0)->getHandle());
             TermFieldMatchData::PositionsIterator itr = tmd->begin();
             EXPECT_EQUAL((itr++)->getPosition(), 30 + i);
             ASSERT_TRUE(itr == tmd->end());
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/computer.cpp b/searchlib/src/vespa/searchlib/features/fieldmatch/computer.cpp
index 156d7aeb7eb..c28f1da291f 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/computer.cpp
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/computer.cpp
@@ -36,7 +36,7 @@ Computer::Computer(const vespalib::string &propertyNamespace, const PhraseSplitt
     _cachedHits()
 {
     // Store term data for all terms searching in this field
-    const auto& splitter_query_env = splitter.get_phrase_splitter_query_env();
+    const auto& splitter_query_env = splitter.get_query_env();
     _queryTermFieldMatch.reserve(splitter_query_env.getNumTerms());
     _cachedHits.reserve(splitter_query_env.getNumTerms());
     for (uint32_t i = 0; i < splitter_query_env.getNumTerms(); ++i) {
@@ -141,7 +141,7 @@ Computer::handleError(uint32_t fieldPos, uint32_t docId) const
     static int errcnt;
     if (errcnt < 1000) {
         errcnt++;
-        const FieldInfo * finfo = _splitter.get_phrase_splitter_query_env().getIndexEnvironment().getField(getFieldId());
+        const FieldInfo * finfo = _splitter.get_query_env().getIndexEnvironment().getField(getFieldId());
         LOG(debug, "Bad field position %u >= fieldLength %u for field '%s' document %u. "
                    "Document was probably refed during query (Ticket 7104969)",
                    fieldPos, _fieldLength,
diff --git a/searchlib/src/vespa/searchlib/fef/phrasesplitter.h b/searchlib/src/vespa/searchlib/fef/phrasesplitter.h
index d0a5de6e8f2..49b0a8a5dbf 100644
--- a/searchlib/src/vespa/searchlib/fef/phrasesplitter.h
+++ b/searchlib/src/vespa/searchlib/fef/phrasesplitter.h
@@ -75,7 +75,7 @@ public:
     }
 
     void bind_match_data(const fef::MatchData &md) { _matchData = &md; }
-    const PhraseSplitterQueryEnv& get_phrase_splitter_query_env() const { return _phrase_splitter_query_env; }
+    const PhraseSplitterQueryEnv& get_query_env() const { return _phrase_splitter_query_env; }
 };
 
 }