drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject drill git commit: DRILL-4250: Fix directory-based partition pruning when directory has both subdirectory and file.
Date Fri, 08 Jan 2016 00:27:05 GMT
Repository: drill
Updated Branches:
  refs/heads/master 884c5b095 -> b9bc35a89


DRILL-4250: Fix directory-based partition pruning when directory has both subdirectory and
file.


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/b9bc35a8
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/b9bc35a8
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/b9bc35a8

Branch: refs/heads/master
Commit: b9bc35a89208d2dd03f1ed751f71a0cd23651c9a
Parents: 884c5b0
Author: Jinfeng Ni <jni@apache.org>
Authored: Wed Jan 6 16:40:50 2016 -0800
Committer: Jinfeng Ni <jni@apache.org>
Committed: Wed Jan 6 16:40:50 2016 -0800

----------------------------------------------------------------------
 .../planner/FileSystemPartitionDescriptor.java  |   3 +-
 .../org/apache/drill/TestPartitionFilter.java   |  18 ++++
 .../jsonFileMixDir/1995/Q1/orders_95_q1.json    | 101 +++++++++++++++++++
 .../jsonFileMixDir/1995/Q2/orders_95_q2.json    | 101 +++++++++++++++++++
 .../jsonFileMixDir/1995/Q3/orders_95_q3.json    | 101 +++++++++++++++++++
 .../jsonFileMixDir/1995/Q4/orders_95_q4.json    | 101 +++++++++++++++++++
 .../1995/orders_95_additional.json              |  51 ++++++++++
 7 files changed, 475 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/b9bc35a8/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java
index 7297c27..c4e4cb9 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/FileSystemPartitionDescriptor.java
@@ -96,7 +96,8 @@ public class FileSystemPartitionDescriptor extends AbstractPartitionDescriptor
{
     for (PartitionLocation partitionLocation: partitions) {
       for (int partitionColumnIndex : BitSets.toIter(partitionColumnBitSet)) {
         if (partitionLocation.getPartitionValue(partitionColumnIndex) == null) {
-          throw new DrillRuntimeException("Value for directory cannot be null");
+          // set null if dirX does not exist for the location.
+          ((NullableVarCharVector) vectors[partitionColumnIndex]).getMutator().setNull(record);
         } else {
           byte[] bytes = (partitionLocation.getPartitionValue(partitionColumnIndex)).getBytes(Charsets.UTF_8);
           ((NullableVarCharVector) vectors[partitionColumnIndex]).getMutator().setSafe(record,
bytes, 0, bytes.length);

http://git-wip-us.apache.org/repos/asf/drill/blob/b9bc35a8/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java b/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java
index dc299f5..ba70788 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java
@@ -74,6 +74,24 @@ public class TestPartitionFilter extends PlanTestBase {
     testExcludeFilter(query, 1, "Filter", 10);
   }
 
+  @Test  //Json: basic test with dir0 and dir1 filters
+  public void testPartitionFilter1_JsonFileMixDir() throws Exception {
+    String query = String.format("select dir0, dir1, o_custkey, o_orderdate from dfs_test.`%s/multilevel/jsonFileMixDir`
where dir0=1995 and dir1='Q1'", TEST_RES_PATH);
+    testExcludeFilter(query, 1, "Filter", 10);
+  }
+
+  @Test  //Json: basic test with dir0 = and dir1 is null filters
+  public void testPartitionFilterIsNull_JsonFileMixDir() throws Exception {
+    String query = String.format("select dir0, dir1, o_custkey, o_orderdate from dfs_test.`%s/multilevel/jsonFileMixDir`
where dir0=1995 and dir1 is null", TEST_RES_PATH);
+    testExcludeFilter(query, 1, "Filter", 5);
+  }
+
+  @Test  //Json: basic test with dir0 = and dir1 is not null filters
+  public void testPartitionFilterIsNotNull_JsonFileMixDir() throws Exception {
+    String query = String.format("select dir0, dir1, o_custkey, o_orderdate from dfs_test.`%s/multilevel/jsonFileMixDir`
where dir0=1995 and dir1 is not null", TEST_RES_PATH);
+    testExcludeFilter(query, 4, "Filter", 40);
+  }
+
   @Test  //CSV: basic test with dir0 and dir1 filters in
   public void testPartitionFilter1_Csv() throws Exception {
     String query = String.format("select * from dfs_test.`%s/multilevel/csv` where dir0=1994
and dir1='Q1'", TEST_RES_PATH);

http://git-wip-us.apache.org/repos/asf/drill/blob/b9bc35a8/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q1/orders_95_q1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q1/orders_95_q1.json
b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q1/orders_95_q1.json
new file mode 100644
index 0000000..704b664
--- /dev/null
+++ b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q1/orders_95_q1.json
@@ -0,0 +1,101 @@
+{
+  "o_orderkey" : 65,
+  "o_custkey" : 163,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 95469.44,
+  "o_orderdate" : "1995-03-18T00:00:00.000-08:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000632",
+  "o_shippriority" : 0,
+  "o_comment" : "ular requests are blithely pending orbits-- even requests against the deposit"
+} {
+  "o_orderkey" : 386,
+  "o_custkey" : 602,
+  "o_orderstatus" : "F",
+  "o_totalprice" : 119718.02,
+  "o_orderdate" : "1995-01-25T00:00:00.000-08:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000648",
+  "o_shippriority" : 0,
+  "o_comment" : " haggle quickly. stealthily bold asymptotes haggle among the furiously even
re"
+} {
+  "o_orderkey" : 450,
+  "o_custkey" : 475,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 213638.07,
+  "o_orderdate" : "1995-03-05T00:00:00.000-08:00",
+  "o_orderpriority" : "4-NOT SPECIFIED",
+  "o_clerk" : "Clerk#000000293",
+  "o_shippriority" : 0,
+  "o_comment" : "d theodolites. boldly bold foxes since the pack"
+} {
+  "o_orderkey" : 643,
+  "o_custkey" : 578,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 261882.19,
+  "o_orderdate" : "1995-03-25T00:00:00.000-08:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000354",
+  "o_shippriority" : 0,
+  "o_comment" : "g dependencies. regular accounts "
+} {
+  "o_orderkey" : 775,
+  "o_custkey" : 1333,
+  "o_orderstatus" : "F",
+  "o_totalprice" : 75392.93,
+  "o_orderdate" : "1995-03-18T00:00:00.000-08:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000191",
+  "o_shippriority" : 0,
+  "o_comment" : "kly express requests. fluffily silent accounts poach furiously"
+} {
+  "o_orderkey" : 802,
+  "o_custkey" : 1367,
+  "o_orderstatus" : "F",
+  "o_totalprice" : 192178.48,
+  "o_orderdate" : "1995-01-05T00:00:00.000-08:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000516",
+  "o_shippriority" : 0,
+  "o_comment" : "posits. ironic, pending requests cajole. even theodol"
+} {
+  "o_orderkey" : 897,
+  "o_custkey" : 490,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 88281.28,
+  "o_orderdate" : "1995-03-20T00:00:00.000-08:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000316",
+  "o_shippriority" : 0,
+  "o_comment" : " wake quickly against "
+} {
+  "o_orderkey" : 928,
+  "o_custkey" : 658,
+  "o_orderstatus" : "F",
+  "o_totalprice" : 315638.02,
+  "o_orderdate" : "1995-03-02T00:00:00.000-08:00",
+  "o_orderpriority" : "5-LOW",
+  "o_clerk" : "Clerk#000000450",
+  "o_shippriority" : 0,
+  "o_comment" : "ithely express pinto beans. "
+} {
+  "o_orderkey" : 1056,
+  "o_custkey" : 275,
+  "o_orderstatus" : "F",
+  "o_totalprice" : 41838.38,
+  "o_orderdate" : "1995-02-11T00:00:00.000-08:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000125",
+  "o_shippriority" : 0,
+  "o_comment" : "t, even deposits hang about the slyly special i"
+} {
+  "o_orderkey" : 1092,
+  "o_custkey" : 1232,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 131664.83,
+  "o_orderdate" : "1995-03-04T00:00:00.000-08:00",
+  "o_orderpriority" : "3-MEDIUM",
+  "o_clerk" : "Clerk#000000006",
+  "o_shippriority" : 0,
+  "o_comment" : "re quickly along the blithe"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/b9bc35a8/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q2/orders_95_q2.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q2/orders_95_q2.json
b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q2/orders_95_q2.json
new file mode 100644
index 0000000..affbc1d
--- /dev/null
+++ b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q2/orders_95_q2.json
@@ -0,0 +1,101 @@
+{
+  "o_orderkey" : 162,
+  "o_custkey" : 142,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 3553.15,
+  "o_orderdate" : "1995-05-08T00:00:00.000-07:00",
+  "o_orderpriority" : "3-MEDIUM",
+  "o_clerk" : "Clerk#000000378",
+  "o_shippriority" : 0,
+  "o_comment" : "nts hinder fluffily ironic instructions. express, express excuses "
+} {
+  "o_orderkey" : 197,
+  "o_custkey" : 326,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 155247.48,
+  "o_orderdate" : "1995-04-07T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000969",
+  "o_shippriority" : 0,
+  "o_comment" : "solve quickly about the even braids. carefully express deposits affix care"
+} {
+  "o_orderkey" : 225,
+  "o_custkey" : 331,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 226028.98,
+  "o_orderdate" : "1995-05-25T00:00:00.000-07:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000177",
+  "o_shippriority" : 0,
+  "o_comment" : "s. blithely ironic accounts wake quickly fluffily special acc"
+} {
+  "o_orderkey" : 326,
+  "o_custkey" : 760,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 325448.68,
+  "o_orderdate" : "1995-06-04T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000466",
+  "o_shippriority" : 0,
+  "o_comment" : " requests. furiously ironic asymptotes mold carefully alongside of the blit"
+} {
+  "o_orderkey" : 327,
+  "o_custkey" : 1447,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 32302.12,
+  "o_orderdate" : "1995-04-17T00:00:00.000-07:00",
+  "o_orderpriority" : "5-LOW",
+  "o_clerk" : "Clerk#000000992",
+  "o_shippriority" : 0,
+  "o_comment" : "ng the slyly final courts. slyly even escapades eat "
+} {
+  "o_orderkey" : 418,
+  "o_custkey" : 949,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 39431.46,
+  "o_orderdate" : "1995-04-13T00:00:00.000-07:00",
+  "o_orderpriority" : "4-NOT SPECIFIED",
+  "o_clerk" : "Clerk#000000643",
+  "o_shippriority" : 0,
+  "o_comment" : ". furiously ironic instruc"
+} {
+  "o_orderkey" : 512,
+  "o_custkey" : 631,
+  "o_orderstatus" : "P",
+  "o_totalprice" : 183939.48,
+  "o_orderdate" : "1995-05-20T00:00:00.000-07:00",
+  "o_orderpriority" : "5-LOW",
+  "o_clerk" : "Clerk#000000814",
+  "o_shippriority" : 0,
+  "o_comment" : "ding requests. carefully express theodolites was quickly. furious"
+} {
+  "o_orderkey" : 513,
+  "o_custkey" : 607,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 78769.71,
+  "o_orderdate" : "1995-05-01T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000522",
+  "o_shippriority" : 0,
+  "o_comment" : "regular packages. pinto beans cajole carefully against the even"
+} {
+  "o_orderkey" : 551,
+  "o_custkey" : 898,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 64301.4,
+  "o_orderdate" : "1995-05-30T00:00:00.000-07:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000179",
+  "o_shippriority" : 0,
+  "o_comment" : "xpress accounts boost quic"
+} {
+  "o_orderkey" : 613,
+  "o_custkey" : 1384,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 56355.92,
+  "o_orderdate" : "1995-06-18T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000172",
+  "o_shippriority" : 0,
+  "o_comment" : "ts hinder among the deposits. fluffily ironic depos"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/b9bc35a8/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q3/orders_95_q3.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q3/orders_95_q3.json
b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q3/orders_95_q3.json
new file mode 100644
index 0000000..acb4dbc
--- /dev/null
+++ b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q3/orders_95_q3.json
@@ -0,0 +1,101 @@
+{
+  "o_orderkey" : 32,
+  "o_custkey" : 1301,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 198665.57,
+  "o_orderdate" : "1995-07-16T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000616",
+  "o_shippriority" : 0,
+  "o_comment" : "ise blithely bold, regular requests. quickly unusual dep"
+} {
+  "o_orderkey" : 166,
+  "o_custkey" : 1079,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 158207.39,
+  "o_orderdate" : "1995-09-12T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000440",
+  "o_shippriority" : 0,
+  "o_comment" : "lets. ironic, bold asymptotes kindle"
+} {
+  "o_orderkey" : 448,
+  "o_custkey" : 1498,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 157247.56,
+  "o_orderdate" : "1995-08-21T00:00:00.000-07:00",
+  "o_orderpriority" : "3-MEDIUM",
+  "o_clerk" : "Clerk#000000597",
+  "o_shippriority" : 0,
+  "o_comment" : " regular, express foxes use blithely. quic"
+} {
+  "o_orderkey" : 449,
+  "o_custkey" : 958,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 55082.33,
+  "o_orderdate" : "1995-07-20T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000841",
+  "o_shippriority" : 0,
+  "o_comment" : ". furiously regular theodolites affix blithely "
+} {
+  "o_orderkey" : 483,
+  "o_custkey" : 349,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 66194.38,
+  "o_orderdate" : "1995-07-11T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000025",
+  "o_shippriority" : 0,
+  "o_comment" : "cross the carefully final e"
+} {
+  "o_orderkey" : 550,
+  "o_custkey" : 236,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 54818.45,
+  "o_orderdate" : "1995-08-02T00:00:00.000-07:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000204",
+  "o_shippriority" : 0,
+  "o_comment" : "t requests. blithely "
+} {
+  "o_orderkey" : 610,
+  "o_custkey" : 508,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 229411.94,
+  "o_orderdate" : "1995-08-02T00:00:00.000-07:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000610",
+  "o_shippriority" : 0,
+  "o_comment" : "totes. ironic, unusual packag"
+} {
+  "o_orderkey" : 706,
+  "o_custkey" : 1474,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 40836.77,
+  "o_orderdate" : "1995-09-09T00:00:00.000-07:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000448",
+  "o_shippriority" : 0,
+  "o_comment" : "g the packages. deposits caj"
+} {
+  "o_orderkey" : 740,
+  "o_custkey" : 436,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 126713.42,
+  "o_orderdate" : "1995-07-16T00:00:00.000-07:00",
+  "o_orderpriority" : "3-MEDIUM",
+  "o_clerk" : "Clerk#000000583",
+  "o_shippriority" : 0,
+  "o_comment" : "courts haggle furiously across the final, regul"
+} {
+  "o_orderkey" : 805,
+  "o_custkey" : 1261,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 145879.67,
+  "o_orderdate" : "1995-07-05T00:00:00.000-07:00",
+  "o_orderpriority" : "4-NOT SPECIFIED",
+  "o_clerk" : "Clerk#000000856",
+  "o_shippriority" : 0,
+  "o_comment" : "y according to the fluffily "
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/b9bc35a8/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q4/orders_95_q4.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q4/orders_95_q4.json
b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q4/orders_95_q4.json
new file mode 100644
index 0000000..68fbbec
--- /dev/null
+++ b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/Q4/orders_95_q4.json
@@ -0,0 +1,101 @@
+{
+  "o_orderkey" : 4,
+  "o_custkey" : 1369,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 56000.91,
+  "o_orderdate" : "1995-10-11T00:00:00.000-07:00",
+  "o_orderpriority" : "5-LOW",
+  "o_clerk" : "Clerk#000000124",
+  "o_shippriority" : 0,
+  "o_comment" : "sits. slyly regular warthogs cajole. regular, regular theodolites acro"
+} {
+  "o_orderkey" : 35,
+  "o_custkey" : 1276,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 194641.93,
+  "o_orderdate" : "1995-10-23T00:00:00.000-07:00",
+  "o_orderpriority" : "4-NOT SPECIFIED",
+  "o_clerk" : "Clerk#000000259",
+  "o_shippriority" : 0,
+  "o_comment" : "zzle. carefully enticing deposits nag furio"
+} {
+  "o_orderkey" : 36,
+  "o_custkey" : 1153,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 42011.04,
+  "o_orderdate" : "1995-11-03T00:00:00.000-08:00",
+  "o_orderpriority" : "1-URGENT",
+  "o_clerk" : "Clerk#000000358",
+  "o_shippriority" : 0,
+  "o_comment" : " quick packages are blithely. slyly silent accounts wake qu"
+} {
+  "o_orderkey" : 135,
+  "o_custkey" : 605,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 230472.84,
+  "o_orderdate" : "1995-10-21T00:00:00.000-07:00",
+  "o_orderpriority" : "4-NOT SPECIFIED",
+  "o_clerk" : "Clerk#000000804",
+  "o_shippriority" : 0,
+  "o_comment" : "l platelets use according t"
+} {
+  "o_orderkey" : 227,
+  "o_custkey" : 100,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 69020.68,
+  "o_orderdate" : "1995-11-10T00:00:00.000-08:00",
+  "o_orderpriority" : "5-LOW",
+  "o_clerk" : "Clerk#000000919",
+  "o_shippriority" : 0,
+  "o_comment" : " express instructions. slyly regul"
+} {
+  "o_orderkey" : 262,
+  "o_custkey" : 304,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 173401.63,
+  "o_orderdate" : "1995-11-25T00:00:00.000-08:00",
+  "o_orderpriority" : "4-NOT SPECIFIED",
+  "o_clerk" : "Clerk#000000551",
+  "o_shippriority" : 0,
+  "o_comment" : "l packages. blithely final pinto beans use carefu"
+} {
+  "o_orderkey" : 420,
+  "o_custkey" : 902,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 269064.47,
+  "o_orderdate" : "1995-10-31T00:00:00.000-08:00",
+  "o_orderpriority" : "4-NOT SPECIFIED",
+  "o_clerk" : "Clerk#000000756",
+  "o_shippriority" : 0,
+  "o_comment" : "leep carefully final excuses. fluffily pending requests unwind carefully
above"
+} {
+  "o_orderkey" : 454,
+  "o_custkey" : 488,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 24543.95,
+  "o_orderdate" : "1995-12-27T00:00:00.000-08:00",
+  "o_orderpriority" : "5-LOW",
+  "o_clerk" : "Clerk#000000890",
+  "o_shippriority" : 0,
+  "o_comment" : "dolites sleep carefully blithely regular deposits. quickly regul"
+} {
+  "o_orderkey" : 545,
+  "o_custkey" : 632,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 35129.54,
+  "o_orderdate" : "1995-11-07T00:00:00.000-08:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000537",
+  "o_shippriority" : 0,
+  "o_comment" : "as. blithely final hockey players about th"
+} {
+  "o_orderkey" : 679,
+  "o_custkey" : 485,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 14905.06,
+  "o_orderdate" : "1995-12-15T00:00:00.000-08:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000853",
+  "o_shippriority" : 0,
+  "o_comment" : "tealthy, final pinto beans haggle slyly. pending platelets about the special,
"
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/b9bc35a8/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/orders_95_additional.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/orders_95_additional.json
b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/orders_95_additional.json
new file mode 100644
index 0000000..0027743
--- /dev/null
+++ b/exec/java-exec/src/test/resources/multilevel/jsonFileMixDir/1995/orders_95_additional.json
@@ -0,0 +1,51 @@
+{
+  "o_orderkey" : 10032,
+  "o_custkey" : 1301,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 198665.57,
+  "o_orderdate" : "1995-07-16T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000616",
+  "o_shippriority" : 0,
+  "o_comment" : "ise blithely bold, regular requests. quickly unusual dep"
+} {
+  "o_orderkey" : 10166,
+  "o_custkey" : 1079,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 158207.39,
+  "o_orderdate" : "1995-09-12T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000440",
+  "o_shippriority" : 0,
+  "o_comment" : "lets. ironic, bold asymptotes kindle"
+} {
+  "o_orderkey" : 10448,
+  "o_custkey" : 1498,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 157247.56,
+  "o_orderdate" : "1995-08-21T00:00:00.000-07:00",
+  "o_orderpriority" : "3-MEDIUM",
+  "o_clerk" : "Clerk#000000597",
+  "o_shippriority" : 0,
+  "o_comment" : " regular, express foxes use blithely. quic"
+} {
+  "o_orderkey" : 10449,
+  "o_custkey" : 958,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 55082.33,
+  "o_orderdate" : "1995-07-20T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000841",
+  "o_shippriority" : 0,
+  "o_comment" : ". furiously regular theodolites affix blithely "
+} {
+  "o_orderkey" : 10483,
+  "o_custkey" : 349,
+  "o_orderstatus" : "O",
+  "o_totalprice" : 66194.38,
+  "o_orderdate" : "1995-07-11T00:00:00.000-07:00",
+  "o_orderpriority" : "2-HIGH",
+  "o_clerk" : "Clerk#000000025",
+  "o_shippriority" : 0,
+  "o_comment" : "cross the carefully final e"
+} 


Mime
View raw message