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 2015/04/01 20:41:18 UTC
[1/3] drill git commit: DRILL-2268: Added unit tests
Repository: drill
Updated Branches:
refs/heads/master d05ff9d84 -> 767711919
DRILL-2268: Added unit tests
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/565c9954
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/565c9954
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/565c9954
Branch: refs/heads/master
Commit: 565c9954f1c5f9580297540583ce41422f65b559
Parents: d05ff9d
Author: Parth Chandra <pc...@maprtech.com>
Authored: Tue Mar 31 08:52:24 2015 -0700
Committer: Parth Chandra <pc...@maprtech.com>
Committed: Wed Apr 1 11:40:27 2015 -0700
----------------------------------------------------------------------
.../exec/physical/impl/flatten/TestFlatten.java | 40 ++++++++++++++++++++
.../resources/complex/drill-2268-1-result.json | 4 ++
.../resources/complex/drill-2268-2-result.json | 4 ++
.../resources/complex/drill-2268-3-result.json | 5 +++
.../resources/complex/json/flatten_join.json | 18 +++++++++
5 files changed, 71 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/565c9954/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java
index b9bd99f..6f5a303 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java
@@ -305,4 +305,44 @@ public class TestFlatten extends BaseTestQuery {
.jsonBaselineFile("flatten/drill-2099-result.json")
.go();
}
+
+ @Test //DRILL-2268
+ public void testFlattenAfterJoin1() throws Exception {
+ String query = "select flatten(sub1.events) flat_events from "+
+ "(select t1.events events from cp.`complex/json/flatten_join.json` t1 "+
+ "inner join cp.`complex/json/flatten_join.json` t2 on t1.id=t2.id) sub1";
+
+ testBuilder()
+ .sqlQuery(query)
+ .unOrdered()
+ .jsonBaselineFile("complex/drill-2268-1-result.json")
+ .go();
+ }
+
+ @Test //DRILL-2268
+ public void testFlattenAfterJoin2() throws Exception {
+ String query = "select flatten(t1.events) flat_events from cp.`complex/json/flatten_join.json` t1 " +
+ "inner join cp.`complex/json/flatten_join.json` t2 on t1.id=t2.id";
+
+ testBuilder()
+ .sqlQuery(query)
+ .unOrdered()
+ .jsonBaselineFile("complex/drill-2268-2-result.json")
+ .go();
+ }
+
+ @Test //DRILL-2268
+ public void testFlattenAfterJoin3() throws Exception {
+ String query = "select flatten(sub1.lst_lst) flat_lst_lst from "+
+ "(select t1.lst_lst lst_lst from cp.`complex/json/flatten_join.json` t1 "+
+ "inner join cp.`complex/json/flatten_join.json` t2 on t1.id=t2.id) sub1";
+
+ testBuilder()
+ .sqlQuery(query)
+ .unOrdered()
+ .jsonBaselineFile("complex/drill-2268-3-result.json")
+ .go();
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/drill/blob/565c9954/exec/java-exec/src/test/resources/complex/drill-2268-1-result.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/drill-2268-1-result.json b/exec/java-exec/src/test/resources/complex/drill-2268-1-result.json
new file mode 100644
index 0000000..d7926ce
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/drill-2268-1-result.json
@@ -0,0 +1,4 @@
+{flat_events:{"evnt_id":"e1","campaign_id":"c1","event_name":"e1_name","event_time":1000000,"type":"cmpgn9"}}
+{flat_events:{"evnt_id":"e2","campaign_id":"c1","event_name":"e2_name","event_time":2000000,"type":"cmpgn4"}}
+{flat_events:{"evnt_id":"e1","campaign_id":"c1","event_name":"e1_name","event_time":1000000,"type":"cmpgn9"}}
+{flat_events:{"evnt_id":"e2","campaign_id":"c1","event_name":"e2_name","event_time":2000000,"type":"cmpgn4"}}
http://git-wip-us.apache.org/repos/asf/drill/blob/565c9954/exec/java-exec/src/test/resources/complex/drill-2268-2-result.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/drill-2268-2-result.json b/exec/java-exec/src/test/resources/complex/drill-2268-2-result.json
new file mode 100644
index 0000000..d7926ce
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/drill-2268-2-result.json
@@ -0,0 +1,4 @@
+{flat_events:{"evnt_id":"e1","campaign_id":"c1","event_name":"e1_name","event_time":1000000,"type":"cmpgn9"}}
+{flat_events:{"evnt_id":"e2","campaign_id":"c1","event_name":"e2_name","event_time":2000000,"type":"cmpgn4"}}
+{flat_events:{"evnt_id":"e1","campaign_id":"c1","event_name":"e1_name","event_time":1000000,"type":"cmpgn9"}}
+{flat_events:{"evnt_id":"e2","campaign_id":"c1","event_name":"e2_name","event_time":2000000,"type":"cmpgn4"}}
http://git-wip-us.apache.org/repos/asf/drill/blob/565c9954/exec/java-exec/src/test/resources/complex/drill-2268-3-result.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/drill-2268-3-result.json b/exec/java-exec/src/test/resources/complex/drill-2268-3-result.json
new file mode 100644
index 0000000..951e46d
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/drill-2268-3-result.json
@@ -0,0 +1,5 @@
+{flat_lst_lst:[1,2]}
+{flat_lst_lst:[3,4]}
+{flat_lst_lst:[1,2]}
+{flat_lst_lst:[3,4]}
+
http://git-wip-us.apache.org/repos/asf/drill/blob/565c9954/exec/java-exec/src/test/resources/complex/json/flatten_join.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/json/flatten_join.json b/exec/java-exec/src/test/resources/complex/json/flatten_join.json
new file mode 100644
index 0000000..a0aa528
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/json/flatten_join.json
@@ -0,0 +1,18 @@
+{
+ "id" : 1,
+ "events" : [
+ { "evnt_id":"e1", "campaign_id":"c1", "event_name":"e1_name", "event_time":1000000, "type" : "cmpgn9"},
+ { "evnt_id":"e2", "campaign_id":"c1", "event_name":"e2_name", "event_time":2000000, "type" : "cmpgn4"}
+ ],
+ "lst_lst" : [[1,2],[3,4]],
+ "lst" : [1,2,3,4]
+}
+{
+ "id" : 2,
+ "events" : [
+ { "evnt_id":"e1", "campaign_id":"c1", "event_name":"e1_name", "event_time":1000000, "type" : "cmpgn9"},
+ { "evnt_id":"e2", "campaign_id":"c1", "event_name":"e2_name", "event_time":2000000, "type" : "cmpgn4"}
+ ],
+ "lst_lst" : [[1,2],[3,4]],
+ "lst" : [1,2,3,4]
+}
[2/3] drill git commit: DRILL-1962: Added unit tests
Posted by pa...@apache.org.
DRILL-1962: Added unit tests
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/fb4533fe
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/fb4533fe
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/fb4533fe
Branch: refs/heads/master
Commit: fb4533fea25470e297b66b3c1aa320db60c32511
Parents: 565c995
Author: Parth Chandra <pc...@maprtech.com>
Authored: Tue Mar 31 14:23:35 2015 -0700
Committer: Parth Chandra <pc...@maprtech.com>
Committed: Wed Apr 1 11:40:45 2015 -0700
----------------------------------------------------------------------
.../exec/expr/TestSchemaPathMaterialization.java | 12 ++++++++++++
.../test/resources/complex/drill-1962-result.json | 3 +++
.../test/resources/complex/json/multiple/j1.json | 18 ++++++++++++++++++
.../test/resources/complex/json/multiple/j2.json | 18 ++++++++++++++++++
4 files changed, 51 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/fb4533fe/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestSchemaPathMaterialization.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestSchemaPathMaterialization.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestSchemaPathMaterialization.java
index 66947f1..c2ab18a 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestSchemaPathMaterialization.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestSchemaPathMaterialization.java
@@ -81,4 +81,16 @@ public class TestSchemaPathMaterialization extends BaseTestQuery {
.baselineValues(1L, 3L)
.go();
}
+
+ @Test //DRILL-1962
+ public void testProjectionMultipleFiles() throws Exception {
+ final String query="select t.oooa.oa.oab.oabc[1].rowValue1 rowValue from dfs.`${WORKING_PATH}/src/test/resources/complex/json/multiple/*.json` t";
+
+ testBuilder()
+ .sqlQuery(query)
+ .unOrdered()
+ .jsonBaselineFile("complex/drill-1962-result.json")
+ .go();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/drill/blob/fb4533fe/exec/java-exec/src/test/resources/complex/drill-1962-result.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/drill-1962-result.json b/exec/java-exec/src/test/resources/complex/drill-1962-result.json
new file mode 100644
index 0000000..d4dac85
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/drill-1962-result.json
@@ -0,0 +1,3 @@
+{rowValue:[{"rv1":1,"rv2":2},{"rva1":3,"rva2":4}]}
+{rowValue:[{"rv1":1,"rv2":2},{"rva1":3,"rva2":4}]}
+
http://git-wip-us.apache.org/repos/asf/drill/blob/fb4533fe/exec/java-exec/src/test/resources/complex/json/multiple/j1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/json/multiple/j1.json b/exec/java-exec/src/test/resources/complex/json/multiple/j1.json
new file mode 100644
index 0000000..8d20176
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/json/multiple/j1.json
@@ -0,0 +1,18 @@
+{
+ "id": 2,
+ "oooa": {
+ "oa": {
+ "oab": {
+ "oabc": [
+ {
+ "rowId": 2
+ },
+ {
+ "rowValue1": [{"rv1":1, "rv2":2}, {"rva1":3, "rva2":4}],
+ "rowValue2": [{"rw1":1, "rw2":2}, {"rwa1":3, "rwa2":4}]
+ }
+ ]
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/drill/blob/fb4533fe/exec/java-exec/src/test/resources/complex/json/multiple/j2.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/json/multiple/j2.json b/exec/java-exec/src/test/resources/complex/json/multiple/j2.json
new file mode 100644
index 0000000..8d20176
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/json/multiple/j2.json
@@ -0,0 +1,18 @@
+{
+ "id": 2,
+ "oooa": {
+ "oa": {
+ "oab": {
+ "oabc": [
+ {
+ "rowId": 2
+ },
+ {
+ "rowValue1": [{"rv1":1, "rv2":2}, {"rva1":3, "rva2":4}],
+ "rowValue2": [{"rw1":1, "rw2":2}, {"rwa1":3, "rwa2":4}]
+ }
+ ]
+ }
+ }
+ }
+}
[3/3] drill git commit: DRILL-1649: Added unit tests
Posted by pa...@apache.org.
DRILL-1649: Added unit tests
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/76771191
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/76771191
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/76771191
Branch: refs/heads/master
Commit: 767711919f087d72fb94d2b94823b9ae0af660db
Parents: fb4533f
Author: Parth Chandra <pc...@maprtech.com>
Authored: Tue Mar 31 16:55:45 2015 -0700
Committer: Parth Chandra <pc...@maprtech.com>
Committed: Wed Apr 1 11:41:01 2015 -0700
----------------------------------------------------------------------
.../exec/nested/TestNestedComplexSchema.java | 29 ++++++++++++++++++++
.../resources/complex/drill-1649-result.json | 2 ++
.../complex/json/single-user-transactions.json | 18 ++++++++++++
3 files changed, 49 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/76771191/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java b/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java
index 1865120..05a5308 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java
@@ -37,4 +37,33 @@ public class TestNestedComplexSchema extends BaseTestQuery {
test("select tbl.a.arrayval[0].val1[0] from cp.`nested/nested_3.json` tbl");
}
+ @Test //DRILL-1649
+ public void testNestedFlattenWithJoin() throws Exception {
+
+ final String query="" +
+ " select event_info.uid, transaction_info.trans_id, event_info.event.evnt_id evnt_id "+
+ "from ( "+
+ " select userinfo.transaction.trans_id trans_id, max(userinfo.event.event_time) max_event_time "+
+ " from ( "+
+ " select uid, flatten(events) event, flatten(transactions) transaction from cp.`complex/json/single-user-transactions.json` "+
+ ") userinfo "+
+ "where userinfo.transaction.trans_time >= userinfo.event.event_time "+
+ "group by userinfo.transaction.trans_id "+
+ ") transaction_info "+
+ "inner join "+
+ "( "+
+ " select uid, flatten(events) event "+
+ " from cp.`complex/json/single-user-transactions.json` "+
+ ") event_info "+
+ "on transaction_info.max_event_time = event_info.event.event_time "+
+ "";
+
+ testBuilder()
+ .sqlQuery(query)
+ .unOrdered()
+ .jsonBaselineFile("complex/drill-1649-result.json")
+ .go();
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/drill/blob/76771191/exec/java-exec/src/test/resources/complex/drill-1649-result.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/drill-1649-result.json b/exec/java-exec/src/test/resources/complex/drill-1649-result.json
new file mode 100644
index 0000000..3add8d5
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/drill-1649-result.json
@@ -0,0 +1,2 @@
+{"uid":1,"trans_id":"t1","evnt_id":"e7"}
+{"uid":1,"trans_id":"t2","evnt_id":"e8"}
http://git-wip-us.apache.org/repos/asf/drill/blob/76771191/exec/java-exec/src/test/resources/complex/json/single-user-transactions.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/complex/json/single-user-transactions.json b/exec/java-exec/src/test/resources/complex/json/single-user-transactions.json
new file mode 100644
index 0000000..cff5532
--- /dev/null
+++ b/exec/java-exec/src/test/resources/complex/json/single-user-transactions.json
@@ -0,0 +1,18 @@
+{
+ "uid" : 1,
+ "events" : [
+ { "evnt_id":"e1", "campaign_id":"c1", "event_name":"e1_name", "event_time":1000000},
+ { "evnt_id":"e2", "campaign_id":"c1", "event_name":"e2_name", "event_time":2000000},
+ { "evnt_id":"e3", "campaign_id":"c1", "event_name":"e3_name", "event_time":3000000},
+ { "evnt_id":"e4", "campaign_id":"c1", "event_name":"e4_name", "event_time":4000000},
+ { "evnt_id":"e5", "campaign_id":"c2", "event_name":"e5_name", "event_time":5000000},
+ { "evnt_id":"e6", "campaign_id":"c1", "event_name":"e6_name", "event_time":6000000},
+ { "evnt_id":"e7", "campaign_id":"c1", "event_name":"e7_name", "event_time":7000000},
+ { "evnt_id":"e8", "campaign_id":"c2", "event_name":"e8_name", "event_time":8000000},
+ { "evnt_id":"e9", "campaign_id":"c2", "event_name":"e9_name", "event_time":9000000}
+ ],
+ "transactions" : [
+ { "trans_id":"t1", "amount":100, "trans_time":7777777},
+ { "trans_id":"t2", "amount":100, "trans_time":8888888}
+ ]
+}