make LuceneQueryBuilder a singleton

crate · Mar 13, 2015 · b3d7673 · b3d7673
1 parent 1c0c949
commit b3d7673
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 71 deletions.
diff --git a/sql/src/main/java/io/crate/action/sql/query/CrateSearchService.java b/sql/src/main/java/io/crate/action/sql/query/CrateSearchService.java
@@ -88,6 +88,7 @@ public class CrateSearchService extends InternalSearchService {
 
     private final SortSymbolVisitor sortSymbolVisitor;
     private final Functions functions;
+    private LuceneQueryBuilder luceneQueryBuilder;
 
     @Inject
     public CrateSearchService(Settings settings,
@@ -104,7 +105,8 @@ public CrateSearchService(Settings settings,
                               QueryPhase queryPhase,
                               FetchPhase fetchPhase,
                               Functions functions,
-                              IndicesQueryCache indicesQueryCache) {
+                              IndicesQueryCache indicesQueryCache,
+                              LuceneQueryBuilder luceneQueryBuilder) {
         super(settings, clusterService, indicesService, indicesLifecycle,
                 indicesWarmer,
                 threadPool,
@@ -113,6 +115,7 @@ public CrateSearchService(Settings settings,
                 pageCacheRecycler,
                 bigArrays, dfsPhase, queryPhase, fetchPhase, indicesQueryCache);
         this.functions = functions;
+        this.luceneQueryBuilder = luceneQueryBuilder;
         CollectInputSymbolVisitor<LuceneCollectorExpression<?>> inputSymbolVisitor =
                 new CollectInputSymbolVisitor<>(functions, LuceneDocLevelReferenceResolver.INSTANCE);
         sortSymbolVisitor = new SortSymbolVisitor(inputSymbolVisitor);
@@ -235,8 +238,7 @@ private SearchContext createContext(QueryShardRequest request, @Nullable Engine.
         SearchContext.setCurrent(context);
 
         try {
-            LuceneQueryBuilder builder = new LuceneQueryBuilder(functions, context, indexService.cache());
-            LuceneQueryBuilder.Context ctx = builder.convert(request.whereClause());
+            LuceneQueryBuilder.Context ctx = luceneQueryBuilder.convert(request.whereClause(), context, indexService.cache());
             context.parsedQuery(new ParsedQuery(ctx.query(), ImmutableMap.<String, Filter>of()));
             Float minScore = ctx.minScore();
             if (minScore != null) {