You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/04/18 12:07:31 UTC
git commit: TAJO-752: Escalate sub modules in tajo-core into the
top-level modules. (fixed packaging problem.)
Repository: tajo
Updated Branches:
refs/heads/master 6594ac1c0 -> ba4729aff
TAJO-752: Escalate sub modules in tajo-core into the top-level modules. (fixed packaging problem.)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/ba4729af
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/ba4729af
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/ba4729af
Branch: refs/heads/master
Commit: ba4729aff60b2faab5a74797654c888cd7c92cec
Parents: 6594ac1
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri Apr 18 18:47:57 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri Apr 18 19:07:14 2014 +0900
----------------------------------------------------------------------
.../testJoinWithMultipleJoinQual1.sql | 20 ++++++++++++++++++++
.../testJoinWithMultipleJoinQual2.sql | 8 ++++++++
.../testJoinWithMultipleJoinQual3.sql | 9 +++++++++
.../testJoinWithMultipleJoinQual4.sql | 10 ++++++++++
.../testJoinWithMultipleJoinQual1.result | 2 ++
.../testJoinWithMultipleJoinQual2.result | 3 +++
.../testJoinWithMultipleJoinQual3.result | 5 +++++
.../testJoinWithMultipleJoinQual4.result | 4 ++++
.../testJoinWithMultipleJoinQual1.sql | 20 --------------------
.../testJoinWithMultipleJoinQual2.sql | 8 --------
.../testJoinWithMultipleJoinQual3.sql | 9 ---------
.../testJoinWithMultipleJoinQual4.sql | 10 ----------
.../testJoinWithMultipleJoinQual1.result | 2 --
.../testJoinWithMultipleJoinQual2.result | 3 ---
.../testJoinWithMultipleJoinQual3.result | 5 -----
.../testJoinWithMultipleJoinQual4.result | 4 ----
tajo-dist/pom.xml | 3 ++-
17 files changed, 63 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual1.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual1.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual1.sql
new file mode 100644
index 0000000..9a04dc5
--- /dev/null
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual1.sql
@@ -0,0 +1,20 @@
+select
+ s.s_acctbal,
+ s.s_name,
+ n.n_name,
+ p.p_partkey,
+ p.p_mfgr,
+ s.s_address,
+ s.s_phone,
+ s.s_comment
+from nation n
+join region r on (n.n_regionkey = r.r_regionkey)
+join supplier s on (s.s_nationkey = n.n_nationkey)
+join partsupp ps on (s.s_suppkey = ps.ps_suppkey)
+join part p on (p.p_partkey = ps.ps_partkey)
+where n.n_regionkey = ps.ps_suppkey
+order by
+ s.s_acctbal,
+ s.s_name,
+ n.n_name,
+ p.p_partkey;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual2.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual2.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual2.sql
new file mode 100644
index 0000000..4a40651
--- /dev/null
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual2.sql
@@ -0,0 +1,8 @@
+select t.n_nationkey, t.name, t.n_regionkey, t.n_comment
+from (
+ select n_nationkey, n_name as name, n_regionkey, n_comment
+ from nation n
+ join region r on (n.n_regionkey = r.r_regionkey)
+) t
+join supplier s on (s.s_nationkey = t.n_nationkey)
+where t.name = 'MOROCCO';
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual3.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual3.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual3.sql
new file mode 100644
index 0000000..b34e9de
--- /dev/null
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual3.sql
@@ -0,0 +1,9 @@
+select t.n_nationkey, t.n_name, t.n_regionkey, t.n_comment, ps.ps_availqty, s.s_suppkey
+from (
+ select n_nationkey, n_name, n_regionkey, n_comment
+ from nation n
+ join region r on (n.n_regionkey = r.r_regionkey)
+) t
+join supplier s on (s.s_nationkey = t.n_nationkey)
+join partsupp ps on (s.s_suppkey = ps.ps_suppkey)
+where t.n_name in ('ARGENTINA','ETHIOPIA', 'MOROCCO');
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual4.sql
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual4.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual4.sql
new file mode 100644
index 0000000..4519de7
--- /dev/null
+++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual4.sql
@@ -0,0 +1,10 @@
+select t.n_nationkey, t.n_name, t.n_regionkey, t.n_comment, ps.ps_availqty, s.s_suppkey
+from (
+ select n_nationkey, n_name, n_regionkey, n_comment
+ from nation n
+ join region r on (n.n_regionkey = r.r_regionkey)
+) t
+join supplier s on (s.s_nationkey = t.n_nationkey)
+join partsupp ps on (s.s_suppkey = ps.ps_suppkey)
+where t.n_name in ('ARGENTINA','ETHIOPIA', 'MOROCCO')
+and t.n_nationkey > s.s_suppkey ;
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual1.result
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual1.result b/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual1.result
new file mode 100644
index 0000000..79e96cc
--- /dev/null
+++ b/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual1.result
@@ -0,0 +1,2 @@
+s_acctbal,s_name,n_name,p_partkey,p_mfgr,s_address,s_phone,s_comment
+-------------------------------
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual2.result
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual2.result b/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual2.result
new file mode 100644
index 0000000..7c53027
--- /dev/null
+++ b/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual2.result
@@ -0,0 +1,3 @@
+n_nationkey,name,n_regionkey,n_comment
+-------------------------------
+15,MOROCCO,0,rns. blithely bold courts among the closely regular packages use furiously bold platelets?
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual3.result
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual3.result b/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual3.result
new file mode 100644
index 0000000..155ba42
--- /dev/null
+++ b/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual3.result
@@ -0,0 +1,5 @@
+n_nationkey,n_name,n_regionkey,n_comment,ps_availqty,s_suppkey
+-------------------------------
+1,ARGENTINA,1,al foxes promise slyly according to the regular accounts. bold requests alon,8895,3
+5,ETHIOPIA,0,ven packages wake quickly. regu,3325,2
+15,MOROCCO,0,rns. blithely bold courts among the closely regular packages use furiously bold platelets?,4651,4
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual4.result
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual4.result b/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual4.result
new file mode 100644
index 0000000..a72f35e
--- /dev/null
+++ b/tajo-core/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual4.result
@@ -0,0 +1,4 @@
+n_nationkey,n_name,n_regionkey,n_comment,ps_availqty,s_suppkey
+-------------------------------
+5,ETHIOPIA,0,ven packages wake quickly. regu,3325,2
+15,MOROCCO,0,rns. blithely bold courts among the closely regular packages use furiously bold platelets?,4651,4
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual1.sql
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual1.sql b/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual1.sql
deleted file mode 100644
index 9a04dc5..0000000
--- a/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual1.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-select
- s.s_acctbal,
- s.s_name,
- n.n_name,
- p.p_partkey,
- p.p_mfgr,
- s.s_address,
- s.s_phone,
- s.s_comment
-from nation n
-join region r on (n.n_regionkey = r.r_regionkey)
-join supplier s on (s.s_nationkey = n.n_nationkey)
-join partsupp ps on (s.s_suppkey = ps.ps_suppkey)
-join part p on (p.p_partkey = ps.ps_partkey)
-where n.n_regionkey = ps.ps_suppkey
-order by
- s.s_acctbal,
- s.s_name,
- n.n_name,
- p.p_partkey;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual2.sql
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual2.sql b/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual2.sql
deleted file mode 100644
index 4a40651..0000000
--- a/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual2.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-select t.n_nationkey, t.name, t.n_regionkey, t.n_comment
-from (
- select n_nationkey, n_name as name, n_regionkey, n_comment
- from nation n
- join region r on (n.n_regionkey = r.r_regionkey)
-) t
-join supplier s on (s.s_nationkey = t.n_nationkey)
-where t.name = 'MOROCCO';
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual3.sql
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual3.sql b/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual3.sql
deleted file mode 100644
index b34e9de..0000000
--- a/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual3.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-select t.n_nationkey, t.n_name, t.n_regionkey, t.n_comment, ps.ps_availqty, s.s_suppkey
-from (
- select n_nationkey, n_name, n_regionkey, n_comment
- from nation n
- join region r on (n.n_regionkey = r.r_regionkey)
-) t
-join supplier s on (s.s_nationkey = t.n_nationkey)
-join partsupp ps on (s.s_suppkey = ps.ps_suppkey)
-where t.n_name in ('ARGENTINA','ETHIOPIA', 'MOROCCO');
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual4.sql
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual4.sql b/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual4.sql
deleted file mode 100644
index 4519de7..0000000
--- a/tajo-core/tajo-core-backend/src/test/resources/queries/TestJoinQuery/testJoinWithMultipleJoinQual4.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-select t.n_nationkey, t.n_name, t.n_regionkey, t.n_comment, ps.ps_availqty, s.s_suppkey
-from (
- select n_nationkey, n_name, n_regionkey, n_comment
- from nation n
- join region r on (n.n_regionkey = r.r_regionkey)
-) t
-join supplier s on (s.s_nationkey = t.n_nationkey)
-join partsupp ps on (s.s_suppkey = ps.ps_suppkey)
-where t.n_name in ('ARGENTINA','ETHIOPIA', 'MOROCCO')
-and t.n_nationkey > s.s_suppkey ;
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual1.result
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual1.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual1.result
deleted file mode 100644
index 79e96cc..0000000
--- a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual1.result
+++ /dev/null
@@ -1,2 +0,0 @@
-s_acctbal,s_name,n_name,p_partkey,p_mfgr,s_address,s_phone,s_comment
--------------------------------
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual2.result
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual2.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual2.result
deleted file mode 100644
index 7c53027..0000000
--- a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual2.result
+++ /dev/null
@@ -1,3 +0,0 @@
-n_nationkey,name,n_regionkey,n_comment
--------------------------------
-15,MOROCCO,0,rns. blithely bold courts among the closely regular packages use furiously bold platelets?
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual3.result
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual3.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual3.result
deleted file mode 100644
index 155ba42..0000000
--- a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual3.result
+++ /dev/null
@@ -1,5 +0,0 @@
-n_nationkey,n_name,n_regionkey,n_comment,ps_availqty,s_suppkey
--------------------------------
-1,ARGENTINA,1,al foxes promise slyly according to the regular accounts. bold requests alon,8895,3
-5,ETHIOPIA,0,ven packages wake quickly. regu,3325,2
-15,MOROCCO,0,rns. blithely bold courts among the closely regular packages use furiously bold platelets?,4651,4
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual4.result
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual4.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual4.result
deleted file mode 100644
index a72f35e..0000000
--- a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinQuery/testJoinWithMultipleJoinQual4.result
+++ /dev/null
@@ -1,4 +0,0 @@
-n_nationkey,n_name,n_regionkey,n_comment,ps_availqty,s_suppkey
--------------------------------
-5,ETHIOPIA,0,ven packages wake quickly. regu,3325,2
-15,MOROCCO,0,rns. blithely bold courts among the closely regular packages use furiously bold platelets?,4651,4
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/ba4729af/tajo-dist/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-dist/pom.xml b/tajo-dist/pom.xml
index 1d937d6..5e956f6 100644
--- a/tajo-dist/pom.xml
+++ b/tajo-dist/pom.xml
@@ -109,7 +109,8 @@
run cp -r $ROOT/tajo-algebra/target/tajo-algebra-${project.version}/* .
run cp -r $ROOT/tajo-client/target/tajo-client-${project.version}/* .
run cp -r $ROOT/tajo-catalog/target/tajo-catalog-${project.version}/* .
- run cp -r $ROOT/tajo-core/target/tajo-core-${project.version}/* .
+ run cp -r $ROOT/tajo-core/target/tajo-core-${project.version}.jar .
+ run cp -r $ROOT/tajo-yarn-pullserver/target/tajo-yarn-pullserver-${project.version}.jar .
run cp -r $ROOT/tajo-storage/target/tajo-storage-${project.version}/* .
run cp -r ${project.basedir}/src/main/bin .
run cp -r ${project.basedir}/src/main/conf .