You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2018/02/17 00:19:39 UTC
orc git commit: ORC-304. Fix TestRecordReaderImpl to work with newer
storage-api releases.
Repository: orc
Updated Branches:
refs/heads/master 28e88da63 -> 21a05eea8
ORC-304. Fix TestRecordReaderImpl to work with newer storage-api releases.
Fixes #219
Signed-off-by: Owen O'Malley <om...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/21a05eea
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/21a05eea
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/21a05eea
Branch: refs/heads/master
Commit: 21a05eea85c1edc7002d2ffe4d30d0f030233e4c
Parents: 28e88da
Author: Owen O'Malley <om...@apache.org>
Authored: Fri Feb 16 15:17:45 2018 -0800
Committer: Owen O'Malley <om...@apache.org>
Committed: Fri Feb 16 16:19:24 2018 -0800
----------------------------------------------------------------------
.../apache/orc/impl/TestRecordReaderImpl.java | 31 ++++++++------------
1 file changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/orc/blob/21a05eea/java/core/src/test/org/apache/orc/impl/TestRecordReaderImpl.java
----------------------------------------------------------------------
diff --git a/java/core/src/test/org/apache/orc/impl/TestRecordReaderImpl.java b/java/core/src/test/org/apache/orc/impl/TestRecordReaderImpl.java
index b259873..bc85724 100644
--- a/java/core/src/test/org/apache/orc/impl/TestRecordReaderImpl.java
+++ b/java/core/src/test/org/apache/orc/impl/TestRecordReaderImpl.java
@@ -1250,10 +1250,8 @@ public class TestRecordReaderImpl {
// filter by rows and groups
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
- columns, rowGroups, false, encodings, types, 32768, false);
- assertThat(result, is(diskRanges(0, 1000, 100, 1000, 400, 1000,
- 1000, 11000 + RecordReaderUtils.WORST_UNCOMPRESSED_SLOP,
- 11000, 21000 + RecordReaderUtils.WORST_UNCOMPRESSED_SLOP,
+ columns, rowGroups, false, encodings, types, 32768, true);
+ assertThat(result, is(diskRanges(0, 21000 + RecordReaderUtils.WORST_UNCOMPRESSED_SLOP,
41000, 51000 + RecordReaderUtils.WORST_UNCOMPRESSED_SLOP)));
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
columns, rowGroups, false, encodings, types, 32768, true);
@@ -1263,15 +1261,15 @@ public class TestRecordReaderImpl {
// if we read no rows, don't read any bytes
rowGroups = new boolean[]{false, false, false, false, false, false};
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
- columns, rowGroups, false, encodings, types, 32768, false);
+ columns, rowGroups, false, encodings, types, 32768, true);
assertNull(result);
// all rows, but only columns 0 and 2.
rowGroups = null;
columns = new boolean[]{true, false, true};
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
- columns, null, false, encodings, types, 32768, false);
- assertThat(result, is(diskRanges(100000, 102000, 102000, 200000)));
+ columns, null, false, encodings, types, 32768, true);
+ assertThat(result, is(diskRanges(100000, 200000)));
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
columns, null, false, encodings, types, 32768, true);
assertThat(result, is(diskRanges(100000, 200000)));
@@ -1280,7 +1278,7 @@ public class TestRecordReaderImpl {
indexes[2] = indexes[1];
indexes[1] = null;
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
- columns, rowGroups, false, encodings, types, 32768, false);
+ columns, rowGroups, false, encodings, types, 32768, true);
assertThat(result, is(diskRanges(100100, 102000,
112000, 122000 + RecordReaderUtils.WORST_UNCOMPRESSED_SLOP)));
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
@@ -1292,7 +1290,7 @@ public class TestRecordReaderImpl {
indexes[1] = indexes[2];
columns = new boolean[]{true, true, true};
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
- columns, rowGroups, false, encodings, types, 32768, false);
+ columns, rowGroups, false, encodings, types, 32768, true);
assertThat(result, is(diskRanges(500, 1000, 51000, 100000, 100500, 102000,
152000, 200000)));
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
@@ -1373,14 +1371,12 @@ public class TestRecordReaderImpl {
// filter by rows and groups
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
- columns, rowGroups, true, encodings, types, 32768, false);
- assertThat(result, is(diskRanges(0, 1000, 100, 1000,
- 400, 1000, 1000, 11000+(2*32771),
- 11000, 21000+(2*32771), 41000, 100000)));
+ columns, rowGroups, true, encodings, types, 32768, true);
+ assertThat(result, is(diskRanges(0, 100000)));
rowGroups = new boolean[]{false, false, false, false, false, true};
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
- columns, rowGroups, true, encodings, types, 32768, false);
+ columns, rowGroups, true, encodings, types, 32768, true);
assertThat(result, is(diskRanges(500, 1000, 51000, 100000)));
}
@@ -1461,11 +1457,10 @@ public class TestRecordReaderImpl {
// filter by rows and groups
result = RecordReaderImpl.planReadPartialDataStreams(streams, indexes,
- columns, rowGroups, false, encodings, types, 32768, false);
- assertThat(result, is(diskRanges(100, 1000, 400, 1000, 500, 1000,
+ columns, rowGroups, false, encodings, types, 32768, true);
+ assertThat(result, is(diskRanges(100, 1000,
11000, 21000 + RecordReaderUtils.WORST_UNCOMPRESSED_SLOP,
- 41000, 51000 + RecordReaderUtils.WORST_UNCOMPRESSED_SLOP,
- 51000, 95000, 95000, 97000, 97000, 100000)));
+ 41000, 100000)));
}
@Test