DRILL-1703: Fix situation where repeated map vector was re-adding column name on second record batch.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/523d7805 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/523d7805 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/523d7805 Branch: refs/heads/master Commit: 523d7805bc0cacd83739a6e2baa9a193e3ae1a9a Parents: ba3d407 Author: Jacques Nadeau <jacq...@apache.org> Authored: Wed Nov 12 19:25:27 2014 -0800 Committer: Jacques Nadeau <jacq...@apache.org> Committed: Thu Nov 13 09:17:15 2014 -0800 ---------------------------------------------------------------------- .../org/apache/drill/exec/vector/complex/RepeatedMapVector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/523d7805/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java index 7ddac23..97f37e2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java @@ -453,6 +453,7 @@ public class RepeatedMapVector extends AbstractContainerVector implements Repeat if (v == null) { // if we arrive here, we didn't have a matching vector. v = TypeHelper.getNewVector(fieldDef, allocator); + put(fieldDef.getLastName(), v); } if (fmd.getValueCount() == 0) { v.clear(); @@ -460,7 +461,6 @@ public class RepeatedMapVector extends AbstractContainerVector implements Repeat v.load(fmd, buf.slice(bufOffset, fmd.getBufferLength())); } bufOffset += fmd.getBufferLength(); - put(fieldDef.getLastName(), v); } }
