removed ESQueryThenFetch

crate · Mar 30, 2015 · 3cc0c68 · 3cc0c68
1 parent 0f6df9a
commit 3cc0c68
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 2,657 deletions.
diff --git a/sql/src/main/java/io/crate/executor/transport/TransportExecutor.java b/sql/src/main/java/io/crate/executor/transport/TransportExecutor.java
@@ -39,7 +39,6 @@
 import io.crate.operation.collect.StatsTables;
 import io.crate.operation.merge.MergeOperation;
 import io.crate.operation.projectors.ProjectionToProjectorVisitor;
-import io.crate.operation.qtf.QueryThenFetchOperation;
 import io.crate.planner.*;
 import io.crate.planner.node.PlanNode;
 import io.crate.planner.node.PlanNodeVisitor;
@@ -79,7 +78,6 @@ public class TransportExecutor implements Executor, TaskExecutor {
     private final HandlerSideDataCollectOperation handlerSideDataCollectOperation;
     private final CircuitBreaker circuitBreaker;
 
-    private final QueryThenFetchOperation queryThenFetchOperation;
     private final MergeOperation mergeOperation;
 
     @Inject
@@ -93,8 +91,7 @@ public TransportExecutor(Settings settings,
                              Provider<DDLStatementDispatcher> ddlAnalysisDispatcherProvider,
                              StatsTables statsTables,
                              ClusterService clusterService,
-                             CrateCircuitBreakerService breakerService,
-                             QueryThenFetchOperation queryThenFetchOperation) {
+                             CrateCircuitBreakerService breakerService) {
         this.settings = settings;
         this.transportActionProvider = transportActionProvider;
         this.handlerSideDataCollectOperation = handlerSideDataCollectOperation;
@@ -104,7 +101,6 @@ public TransportExecutor(Settings settings,
         this.ddlAnalysisDispatcherProvider = ddlAnalysisDispatcherProvider;
         this.statsTables = statsTables;
         this.clusterService = clusterService;
-        this.queryThenFetchOperation = queryThenFetchOperation;
         this.nodeVisitor = new NodeVisitor();
         this.planVisitor = new TaskCollectingVisitor();
         this.circuitBreaker = breakerService.getBreaker(CrateCircuitBreakerService.QUERY_BREAKER);
@@ -278,15 +274,6 @@ public ImmutableList<Task> visitMergeNode(@Nullable MergeNode node, UUID jobId)
             }
         }
 
-        @Override
-        public ImmutableList<Task> visitESQueryThenFetchNode(ESQueryThenFetchNode node, UUID jobId) {
-            return singleTask(new QueryThenFetchTask(
-                    jobId,
-                    queryThenFetchOperation,
-                    functions,
-                    node));
-        }
-
         @Override
         public ImmutableList<Task> visitESGetNode(ESGetNode node, UUID jobId) {
             return singleTask(new ESGetTask(

diff --git a/sql/src/main/java/io/crate/executor/transport/task/elasticsearch/ESQueryBuilder.java b/sql/src/main/java/io/crate/executor/transport/task/elasticsearch/ESQueryBuilder.java
@@ -30,9 +30,6 @@
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import io.crate.analyze.WhereClause;
-import io.crate.core.StringUtils;
-import io.crate.metadata.ColumnIdent;
-import io.crate.metadata.doc.DocSysColumns;
 import io.crate.operation.Input;
 import io.crate.operation.operator.*;
 import io.crate.operation.operator.any.*;
@@ -45,7 +42,6 @@
 import io.crate.operation.scalar.geo.WithinFunction;
 import io.crate.operation.scalar.regex.RegexMatcher;
 import io.crate.planner.node.dml.ESDeleteByQueryNode;
-import io.crate.planner.node.dql.ESQueryThenFetchNode;
 import io.crate.planner.symbol.*;
 import io.crate.types.DataTypes;
 import io.crate.types.SetType;
@@ -138,57 +134,6 @@ public BytesReference convert(WhereClause whereClause) throws IOException {
         return context.builder.bytes();
     }
 
-    /**
-     * use to create a full elasticsearch query "statement" including fields, size, etc.
-     */
-    public BytesReference convert(ESQueryThenFetchNode node) throws IOException {
-        assert node != null;
-        List<? extends Symbol> outputs;
-
-        outputs = node.outputs();
-        Context context = new Context();
-        context.builder = XContentFactory.jsonBuilder().startObject();
-        XContentBuilder builder = context.builder;
-
-        List<String> fields = new ArrayList<>(outputs.size());
-        boolean needWholeSource = false;
-        for (Symbol output : outputs) {
-            assert output instanceof Reference;
-            Reference ref = (Reference) output;
-            ColumnIdent columnIdent = ref.info().ident().columnIdent();
-            if (columnIdent.isSystemColumn()){
-                if (DocSysColumns.VERSION.equals(columnIdent)){
-                    builder.field("version", true);
-                } else if (DocSysColumns.RAW.equals(columnIdent)|| DocSysColumns.DOC.equals(columnIdent)){
-                    needWholeSource = true;
-                }
-            } else if (node.partitionBy().indexOf(ref.info()) < 0) { // do not include partitioned by columns
-                fields.add(columnIdent.fqn());
-            }
-        }
-
-        if (!needWholeSource){
-            if (fields.size() > 0){
-                builder.startObject("_source");
-                builder.field("include", StringUtils.commonAncestors(fields));
-                builder.endObject();
-            } else {
-                builder.field("_source", false);
-            }
-        }
-        whereClause(context, node.whereClause());
-
-        if (context.ignoredFields.containsKey("_score")) {
-            builder.field("min_score", ((Number) context.ignoredFields.get("_score")).doubleValue());
-        }
-
-        builder.field("from", node.offset());
-        builder.field("size", node.limit());
-
-        builder.endObject();
-        return builder.bytes();
-    }
-
     /**
      * use to create a full elasticsearch query "statement" used by deleteByQuery actions.
      */