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

Switch to Threaded View
Drill, mail # dev - [4/7] git commit: DRILL-190 (part3) Fixes for integration between JSON changes, updated CodeGenerator and merge join


Copy link to this message
-
[4/7] git commit: DRILL-190 (part3) Fixes for integration between JSON changes, updated CodeGenerator and merge join
jacques@... 2013-08-29, 03:43
DRILL-190 (part3) Fixes for integration between JSON changes, updated CodeGenerator and merge join
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/5232b0e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/5232b0e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/5232b0e1

Branch: refs/heads/master
Commit: 5232b0e1423deecb206e79d5978e4fe7db8197b6
Parents: e0bac2f
Author: Jacques Nadeau <[EMAIL PROTECTED]>
Authored: Wed Aug 28 17:48:36 2013 -0700
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Wed Aug 28 20:37:40 2013 -0700

----------------------------------------------------------------------
 .../drill/exec/physical/impl/ScanBatch.java     |  2 +-
 .../physical/impl/aggregate/InternalBatch.java  |  2 +-
 .../exec/physical/impl/join/JoinEvaluator.java  | 10 ------
 .../physical/impl/join/JoinInnerSignature.java  | 35 --------------------
 .../exec/physical/impl/join/MergeJoinBatch.java |  4 +--
 .../partitionsender/OutgoingRecordBatch.java    |  2 +-
 .../drill/exec/record/AbstractRecordBatch.java  |  2 +-
 .../drill/exec/record/RecordBatchLoader.java    |  2 +-
 .../drill/exec/record/VectorContainer.java      |  2 +-
 .../exec/physical/impl/join/TestMergeJoin.java  |  3 +-
 .../test/resources/join/merge_single_batch.json | 20 +++++++----
 11 files changed, 24 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5232b0e1/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java
index 192c03c..ae043ec 100644
--- a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java
+++ b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScanBatch.java
@@ -134,7 +134,7 @@ public class ScanBatch implements RecordBatch {
 
   @Override
   public VectorWrapper<?> getValueAccessorById(int fieldId, Class<?> clazz) {
-    return container.getVectorAccessor(fieldId, clazz);
+    return container.getValueAccessorById(fieldId, clazz);
   }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5232b0e1/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/InternalBatch.java
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/InternalBatch.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/InternalBatch.java
index 343dbe5..77dd682 100644
--- a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/InternalBatch.java
+++ b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/InternalBatch.java
@@ -59,7 +59,7 @@ public class InternalBatch implements Iterable<VectorWrapper<?>>{
   }
  
   public VectorWrapper<?> getValueAccessorById(int fieldId, Class<?> clazz){
-    return container.getVectorAccessor(fieldId, clazz);
+    return container.getValueAccessorById(fieldId, clazz);
   }
  
 }

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5232b0e1/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinEvaluator.java
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinEvaluator.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinEvaluator.java
deleted file mode 100644
index beb3e28..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.drill.exec.physical.impl.join;
-
-import org.apache.drill.exec.exception.SchemaChangeException;
-import org.apache.drill.exec.ops.FragmentContext;
-import org.apache.drill.exec.record.VectorContainer;
-
-public interface JoinEvaluator {
-  public abstract void doSetup(FragmentContext context, JoinStatus status, VectorContainer outgoing) throws SchemaChangeException;
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5232b0e1/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinInnerSignature.java
diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinInnerSignature.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinInnerSignature.java
deleted file mode 100644
index 1081244..0000000
+++ /dev/null
@@ -1,35 +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.apach