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

Switch to Plain View
Drill, mail # dev - git commit: DRILL-229: N-WAY merging receiver


Copy link to this message
-
git commit: DRILL-229: N-WAY merging receiver
jacques@... 2013-11-16, 04:16
Updated Branches:
  refs/heads/master b07682084 -> dd39a5b79
DRILL-229: N-WAY merging receiver
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/dd39a5b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/dd39a5b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/dd39a5b7

Branch: refs/heads/master
Commit: dd39a5b799a357e4372ffd243a0b887351010f5d
Parents: b076820
Author: Ben Becker <[EMAIL PROTECTED]>
Authored: Fri Nov 15 19:07:37 2013 -0800
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Fri Nov 15 19:17:15 2013 -0800

----------------------------------------------------------------------
 distribution/src/resources/drill-override.conf  |   2 +-
 .../physical/base/AbstractPhysicalVisitor.java  |   5 +
 .../exec/physical/base/PhysicalVisitor.java     |   1 +
 .../physical/config/MergingReceiverPOP.java     |  85 +++
 .../physical/config/SingleMergeExchange.java    |  92 +++
 .../drill/exec/physical/impl/ImplCreator.java   |   6 +
 .../physical/impl/MergingReceiverCreator.java   |  49 ++
 .../MergingReceiverGeneratorBase.java           |  53 ++
 .../mergereceiver/MergingReceiverTemplate.java  |  62 ++
 .../impl/mergereceiver/MergingRecordBatch.java  | 622 +++++++++++++++++++
 .../exec/physical/impl/sort/SortBatch.java      |   4 +
 .../impl/mergereceiver/TestMergingReceiver.java | 173 ++++++
 .../test/resources/mergerecv/empty_batch.json   |  50 ++
 .../resources/mergerecv/merging_receiver.json   |  50 ++
 .../resources/mergerecv/multiple_providers.json |  65 ++
 15 files changed, 1318 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/dd39a5b7/distribution/src/resources/drill-override.conf
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-override.conf b/distribution/src/resources/drill-override.conf
index 7694ced..18a2a6a 100644
--- a/distribution/src/resources/drill-override.conf
+++ b/distribution/src/resources/drill-override.conf
@@ -72,6 +72,6 @@ drill.exec: {
     executor.threads: 4
   }
   trace: {
-    directory: "/var/log/drill"
+    directory: "/tmp"
   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/dd39a5b7/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java
index d1188bf..b8a7247 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java
@@ -116,6 +116,11 @@ public abstract class AbstractPhysicalVisitor<T, X, E extends Throwable> impleme
   }
 
   @Override
+  public T visitMergingReceiver(MergingReceiverPOP op, X value) throws E {
+    return visitReceiver(op, value);
+  }
+
+  @Override
   public T visitHashPartitionSender(HashToRandomExchange op, X value) throws E {
     return visitExchange(op, value);
   }

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/dd39a5b7/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java
index 120306a..040a495 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java
@@ -50,6 +50,7 @@ public interface PhysicalVisitor<RETURN, EXTRA, EXCEP extends Throwable> {
   public RETURN visitHashPartitionSender(HashPartitionSender op, EXTRA value) throws EXCEP;
   public RETURN visitOrderedPartitionSender(OrderedPartitionSender op, EXTRA value) throws EXCEP;
   public RETURN visitRandomReceiver(RandomReceiver op, EXTRA value) throws EXCEP;
+  public RETURN visitMergingReceiver(MergingReceiverPOP op, EXTRA value) throws EXCEP;
   public RETURN visitHashPartitionSender(HashToRandomExchange op, EXTRA value) throws EXCEP;
   public RETURN visitRangeSender(RangeSender op, EXTRA value) throws EXCEP;
   public RETURN visitScreen(Screen op, EXTRA value) throws EXCEP;

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/dd39a5b7/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergingReceiverPOP.java
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergingReceiverPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergingReceiverPOP.java
new file mode 100644
index 0000000..667cc33
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergingReceiverPOP.java
@@ -0,0 +1,85 @@
+/**
+ * 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 governi