You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pa...@apache.org on 2017/01/14 01:47:45 UTC
[2/4] drill git commit: DRILL-5105: comment out unecessary recursive
buffer size check
DRILL-5105: comment out unecessary recursive buffer size check
This closes #715
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/77e50100
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/77e50100
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/77e50100
Branch: refs/heads/master
Commit: 77e501005bbfe1d5736feab78d8d6e2f495eb8a3
Parents: eef3b3f
Author: chunhui-shi <cs...@maprtech.com>
Authored: Tue Jan 3 17:39:49 2017 -0800
Committer: Parth Chandra <pa...@apache.org>
Committed: Fri Jan 13 17:44:40 2017 -0800
----------------------------------------------------------------------
.../java/org/apache/drill/exec/vector/complex/MapVector.java | 7 +++----
.../apache/drill/exec/vector/complex/RepeatedMapVector.java | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/77e50100/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java
----------------------------------------------------------------------
diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java
index e76e674..8447893 100644
--- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java
+++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/MapVector.java
@@ -134,10 +134,9 @@ public class MapVector extends AbstractMapVector {
@Override
public DrillBuf[] getBuffers(boolean clear) {
- int expectedSize = getBufferSize();
- int actualSize = super.getBufferSize();
-
- Preconditions.checkArgument(expectedSize == actualSize);
+ //int expectedSize = getBufferSize();
+ //int actualSize = super.getBufferSize();
+ //Preconditions.checkArgument(expectedSize == actualSize);
return super.getBuffers(clear);
}
http://git-wip-us.apache.org/repos/asf/drill/blob/77e50100/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java
----------------------------------------------------------------------
diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java
index 9839b2e..94cf4a6 100644
--- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java
+++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedMapVector.java
@@ -413,10 +413,9 @@ public class RepeatedMapVector extends AbstractMapVector
@Override
public DrillBuf[] getBuffers(boolean clear) {
- final int expectedBufferSize = getBufferSize();
- final int actualBufferSize = super.getBufferSize();
-
- Preconditions.checkArgument(expectedBufferSize == actualBufferSize + offsets.getBufferSize());
+ //final int expectedBufferSize = getBufferSize();
+ //final int actualBufferSize = super.getBufferSize();
+ //Preconditions.checkArgument(expectedBufferSize == actualBufferSize + offsets.getBufferSize());
return ArrayUtils.addAll(offsets.getBuffers(clear), super.getBuffers(clear));
}