Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Threaded View
Drill >> mail # dev >> [5/5] git commit: Fix group by, removing aggregate and segment remnants. Add new simple test queries to make sure parsing isn't broken in future. Fix binary tree so that more than 2 binary arguments are correctly translated from RexNode. Update binary f


Copy link to this message
-
[5/5] git commit: Fix group by, removing aggregate and segment remnants. Add new simple test queries to make sure parsing isn't broken in future. Fix binary tree so that more than 2 binary arguments are correctly translated from RexNode. Update binary f
Fix group by, removing aggregate and segment remnants.  Add new simple test queries to make sure parsing isn't broken in future.
Fix binary tree so that more than 2 binary arguments are correctly translated from RexNode.
Update binary function lookup to use lowercase.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/2d10afd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/2d10afd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/2d10afd4

Branch: refs/heads/master
Commit: 2d10afd4b1499b84084123eda1e85e59602ac475
Parents: 4814608
Author: Jacques Nadeau <[EMAIL PROTECTED]>
Authored: Tue Mar 11 14:33:57 2014 -0700
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Tue Mar 11 14:57:10 2014 -0700

 .../logical/data/CollapsingAggregate.java       | 73 -------------------
 .../drill/common/logical/data/Segment.java      | 62 ----------------
 .../data/visitors/AbstractLogicalVisitor.java   | 10 ---
 .../logical/data/visitors/LogicalVisitor.java   |  4 -
 exec/java-exec/pom.xml                          |  6 ++
 .../drill/exec/client/QuerySubmitter.java       |  4 +-
 .../apache/drill/exec/opt/BasicOptimizer.java   | 54 +++++---------
 .../drill/exec/planner/logical/DrillOptiq.java  | 15 +++-
 .../org/apache/drill/TestExampleQueries.java    | 51 +++++++++++++
 .../src/test/resources/storage-engines.json     |  4 +
 pom.xml                                         |  2 +-
 .../org/apache/drill/jdbc/test/JdbcTest.java    | 77 ++++++++++----------
 12 files changed, 132 insertions(+), 230 deletions(-)
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/2d10afd4/common/src/main/java/org/apache/drill/common/logical/data/CollapsingAggregate.java
diff --git a/common/src/main/java/org/apache/drill/common/logical/data/CollapsingAggregate.java b/common/src/main/java/org/apache/drill/common/logical/data/CollapsingAggregate.java
deleted file mode 100644
index f4258fd..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.drill.common.logical.data;
-
-import com.google.common.collect.Iterators;
-import org.apache.drill.common.expression.FieldReference;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import org.apache.drill.common.logical.data.visitors.LogicalVisitor;
-
-import java.util.Iterator;
-import java.util.List;
-
-@JsonTypeName("collapsingaggregate")
-public class CollapsingAggregate extends SingleInputOperator{
-  
-  private final FieldReference within;
-  private final FieldReference target;
-  private final FieldReference[] carryovers;
-  private final NamedExpression[]  aggregations;
-
-  @JsonCreator
-  public CollapsingAggregate(@JsonProperty("within") FieldReference within, @JsonProperty("target") FieldReference target, @JsonProperty("carryovers") FieldReference[] carryovers, @JsonProperty("aggregations") NamedExpression[] aggregations) {
-    super();
-    this.within = within;
-    this.target = target;
-    this.carryovers = carryovers;
-    this.aggregations = aggregations;
-  }
-
-  public FieldReference getWithin() {
-    return within;
-  }
-
-  public FieldReference getTarget() {
-    return target;
-  }
-
-  public FieldReference[] getCarryovers() {
-    return carryovers;
-  }
-
-  public NamedExpression[] getAggregations() {
-    return aggregations;
-  }
-
-    @Override
-    public <T, X, E extends Throwable> T accept(LogicalVisitor<T, X, E> logicalVisitor, X value) throws E {
-        return logicalVisitor.visitCollapsingAggregate(this, value);
-    }
-
-    @Override
-    public Iterator<LogicalOperator> iterator() {
-        return Iterators.singletonIterator(getInput());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/2d10afd4/common/src/main/java/org/apache/drill/common/logical/data/Segment.java
diff --git a/common/src/main/java/org/apache/drill/common/logical/data/Segment.java b/common/src/main/java/org/apache/drill/common/logical/data/Segment.java
deleted file mode 100644
index 3898944..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.drill.common.logical.data;
-
-import com.google.common.collect.Iterators;
-import org.apache.drill.common.expression.FieldReference;
-imp