SERVER-19510 Move text query parsing to TextMatchExpression::init()

- Introduces FTSQuery, which is now the base class for FTSQueryImpl.
- Introduces a derived class FTSQueryNoop (which
  TextNoOpMatchExpression now wraps).  libfts_query_noop is now linked
  into db/matcher/expressions.
- TextMatchExpression now parses the text query (which acquires a
  collection lock as part of the parsing process), and TextNode now
  stores a parsed version of the query.  The FTSQuery::parse() call in
  buildStages() is removed.

Behavior change: $text against a non-existent collection now returns
an error, instead of an empty result set.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/mongo/db/query/query_solution.cpp b/src/mongo/db/query/query_solution.cpp
index 345a4132b0c..a80f9199b33 100644
--- a/src/mongo/db/query/query_solution.cpp
+++ b/src/mongo/db/query/query_solution.cpp
@@ -73,13 +73,13 @@ void TextNode::appendToString(mongoutils::str::stream* ss, int indent) const {
     addIndent(ss, indent + 1);
     *ss << "keyPattern = " << indexKeyPattern.toString() << '\n';
     addIndent(ss, indent + 1);
-    *ss << "query = " << query << '\n';
+    *ss << "query = " << ftsQuery->getQuery() << '\n';
     addIndent(ss, indent + 1);
-    *ss << "language = " << language << '\n';
+    *ss << "language = " << ftsQuery->getLanguage() << '\n';
     addIndent(ss, indent + 1);
-    *ss << "caseSensitive= " << caseSensitive << '\n';
+    *ss << "caseSensitive= " << ftsQuery->getCaseSensitive() << '\n';
     addIndent(ss, indent + 1);
-    *ss << "diacriticSensitive= " << diacriticSensitive << '\n';
+    *ss << "diacriticSensitive= " << ftsQuery->getDiacriticSensitive() << '\n';
     addIndent(ss, indent + 1);
     *ss << "indexPrefix = " << indexPrefix.toString() << '\n';
     if (NULL != filter) {
@@ -95,10 +95,7 @@ QuerySolutionNode* TextNode::clone() const {
 
     copy->_sort = this->_sort;
     copy->indexKeyPattern = this->indexKeyPattern;
-    copy->query = this->query;
-    copy->language = this->language;
-    copy->caseSensitive = this->caseSensitive;
-    copy->diacriticSensitive = this->diacriticSensitive;
+    copy->ftsQuery = this->ftsQuery->clone();
     copy->indexPrefix = this->indexPrefix;
 
     return copy;