Skip to content

Commit

Permalink
remove PlannerFunctionArgumentCopier
Browse files Browse the repository at this point in the history
became unused with fe468cf
  • Loading branch information
mfussenegger committed Nov 17, 2014
1 parent fe468cf commit 31e48f7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 87 deletions.
12 changes: 5 additions & 7 deletions sql/src/main/java/io/crate/planner/Planner.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@

import com.carrotsearch.hppc.procedures.ObjectProcedure;
import com.google.common.base.Objects;
import com.google.common.base.*;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import io.crate.Constants;
import io.crate.PartitionName;
Expand All @@ -50,7 +51,6 @@
import io.crate.planner.node.dql.*;
import io.crate.planner.projection.*;
import io.crate.planner.symbol.*;
import io.crate.planner.symbol.Function;
import io.crate.types.DataType;
import io.crate.types.DataTypes;
import io.crate.types.LongType;
Expand All @@ -71,7 +71,6 @@ public class Planner extends AnalysisVisitor<Planner.Context, Plan> {

static final PlannerAggregationSplitter splitter = new PlannerAggregationSplitter();
static final PlannerReferenceExtractor referenceExtractor = new PlannerReferenceExtractor();
static final PlannerFunctionArgumentCopier functionArgumentCopier = new PlannerFunctionArgumentCopier();

private final ClusterService clusterService;
private AggregationProjection localMergeProjection;
Expand Down Expand Up @@ -589,17 +588,16 @@ private void queryThenFetch(SelectAnalysis analysis, Plan plan, Context context)

private void globalAggregates(SelectAnalysis analysis, Plan plan, Context context) {
String schema = analysis.table().ident().schema();

if ((schema == null || schema.equalsIgnoreCase(DocSchemaInfo.NAME))
&& hasOnlyGlobalCount(analysis.outputSymbols())
&& !analysis.hasSysExpressions()
&& !context.indexWriterProjection.isPresent()) {
plan.add(new ESCountNode(analysis.table(), analysis.whereClause()));
return;
}

// global aggregate: collect and partial aggregate on C and final agg on H
PlannerContextBuilder contextBuilder = new PlannerContextBuilder(2)
.output(analysis.outputSymbols());
PlannerContextBuilder contextBuilder = new PlannerContextBuilder(2).output(analysis.outputSymbols());

// havingClause could be a Literal or Function.
// if its a Literal and value is false, we'll never reach this point (no match),
Expand Down

This file was deleted.

0 comments on commit 31e48f7

Please sign in to comment.