You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by sm...@apache.org on 2014/10/01 05:19:30 UTC
[1/3] git commit: DRILL-1405: Fix bug when loading repeated vectors
with 0 valuecount
Repository: incubator-drill
Updated Branches:
refs/heads/smp-merge-140929c [created] 5c220e35a
DRILL-1405: Fix bug when loading repeated vectors with 0 valuecount
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/d8edf637
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/d8edf637
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/d8edf637
Branch: refs/heads/smp-merge-140929c
Commit: d8edf63781192923efb64a03de47df41242f309d
Parents: a13fc39
Author: Steven Phillips <sp...@maprtech.com>
Authored: Fri Sep 12 00:43:41 2014 -0700
Committer: Steven Phillips <sp...@maprtech.com>
Committed: Tue Sep 30 16:44:00 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/drill/exec/record/RecordBatchLoader.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d8edf637/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java
index d756685..8a12cbd 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchLoader.java
@@ -29,6 +29,7 @@ import org.apache.drill.exec.expr.TypeHelper;
import org.apache.drill.exec.memory.BufferAllocator;
import org.apache.drill.exec.proto.UserBitShared.RecordBatchDef;
import org.apache.drill.exec.proto.UserBitShared.SerializedField;
+import org.apache.drill.exec.vector.AllocationHelper;
import org.apache.drill.exec.vector.ValueVector;
import com.google.common.collect.Maps;
@@ -84,7 +85,8 @@ public class RecordBatchLoader implements VectorAccessible, Iterable<VectorWrapp
}
if (fmd.getValueCount() == 0 && (!fmd.hasGroupCount() || fmd.getGroupCount() == 0)) {
// v.clear();
- v.load(fmd, allocator.buffer(0));
+// v.load(fmd, allocator.buffer(8));
+ AllocationHelper.allocate(v, 0, 0, 0);
} else {
v.load(fmd, buf.slice(bufOffset, fmd.getBufferLength()));
}
[3/3] git commit: DRILL-1461: remove map and list repeated count
functions, as they are not working
Posted by sm...@apache.org.
DRILL-1461: remove map and list repeated count functions, as they are not working
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/5c220e35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/5c220e35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/5c220e35
Branch: refs/heads/smp-merge-140929c
Commit: 5c220e35a2b0afd6a360de01efd2525dbd5580a0
Parents: 3713881
Author: Steven Phillips <sp...@maprtech.com>
Authored: Tue Sep 30 18:33:08 2014 -0700
Committer: Steven Phillips <sp...@maprtech.com>
Committed: Tue Sep 30 18:33:08 2014 -0700
----------------------------------------------------------------------
.../drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5c220e35/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java
index 64de402..b1bfa1d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java
@@ -81,7 +81,8 @@ public class SimpleRepeatedFunctions {
}
}
- // TODO - need to confirm that these work
+ /*
+ // TODO - need to confirm that these work SMP: They do not
@FunctionTemplate(name = "repeated_count", scope = FunctionTemplate.FunctionScope.SIMPLE)
public static class RepeatedLengthMap implements DrillSimpleFunc {
@@ -98,7 +99,7 @@ public class SimpleRepeatedFunctions {
}
}
- // TODO - need to confirm that these work
+ // TODO - need to confirm that these work SMP: They do not
@FunctionTemplate(name = "repeated_count", scope = FunctionTemplate.FunctionScope.SIMPLE)
public static class RepeatedLengthList implements DrillSimpleFunc {
@@ -114,6 +115,7 @@ public class SimpleRepeatedFunctions {
out.value = input.end - input.start;
}
}
+ */
@FunctionTemplate(name = "repeated_count", scope = FunctionTemplate.FunctionScope.SIMPLE)
public static class RepeatedLengthBit implements DrillSimpleFunc {
[2/3] git commit: DRILL-1476: Clear transfer pair list when in Limit
when schema changes
Posted by sm...@apache.org.
DRILL-1476: Clear transfer pair list when in Limit when schema changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/37138810
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/37138810
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/37138810
Branch: refs/heads/smp-merge-140929c
Commit: 37138810418c25dc455d5fc6c30b33cb612c4c50
Parents: d8edf63
Author: Steven Phillips <sp...@maprtech.com>
Authored: Tue Sep 30 18:17:23 2014 -0700
Committer: Steven Phillips <sp...@maprtech.com>
Committed: Tue Sep 30 18:17:23 2014 -0700
----------------------------------------------------------------------
.../org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/37138810/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java
index 8f4d90f..8ffd7be 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java
@@ -60,6 +60,7 @@ public class LimitRecordBatch extends AbstractSingleRecordBatch<Limit> {
@Override
protected void setupNewSchema() throws SchemaChangeException {
container.clear();
+ transfers.clear();
for(VectorWrapper<?> v : incoming){