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/01/17 10:23:42 UTC

[12/12] git commit: Fixed union10.

Fixed union10.


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

Branch: refs/heads/master
Commit: ebb12b7dc6777321c8f5482cd698522522745617
Parents: 63ac233
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri Jan 17 17:30:17 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri Jan 17 17:30:17 2014 +0900

----------------------------------------------------------------------
 .../queries/TestUnionQuery/testUnion10.sql      | 214 ++++++++++---------
 .../results/TestUnionQuery/testUnion10.result   |  16 +-
 2 files changed, 119 insertions(+), 111 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ebb12b7d/tajo-core/tajo-core-backend/src/test/resources/queries/TestUnionQuery/testUnion10.sql
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/queries/TestUnionQuery/testUnion10.sql b/tajo-core/tajo-core-backend/src/test/resources/queries/TestUnionQuery/testUnion10.sql
index b4f01d9..d644a44 100644
--- a/tajo-core/tajo-core-backend/src/test/resources/queries/TestUnionQuery/testUnion10.sql
+++ b/tajo-core/tajo-core-backend/src/test/resources/queries/TestUnionQuery/testUnion10.sql
@@ -1,149 +1,157 @@
-SELECT
-  *
-FROM (
+SELECT * FROM (
   SELECT
-    n_nationkey,
-    n_name
-
+    *
   FROM (
     SELECT
       n_nationkey,
       n_name
-    FROM
-      nation
-    WHERE
-      n_regionkey = 0
-
-
-    UNION ALL
 
-    SELECT
-      n_nationkey,
-      n_name
-    FROM
-      nation
-    WHERE
-      n_regionkey = 0
+    FROM (
+      SELECT
+        n_nationkey,
+        n_name
+      FROM
+        nation
+      WHERE
+        n_regionkey = 0
 
-  ) T1
-  GROUP BY
-    n_nationkey,
-    n_name
-  ORDER BY
-    n_nationkey desc,
-    n_name desc
 
- UNION
+      UNION ALL
 
- SELECT
-  n_nationkey,
-  n_name
+      SELECT
+        n_nationkey,
+        n_name
+      FROM
+        nation
+      WHERE
+        n_regionkey = 0
 
- FROM (
-    SELECT
+    ) T1
+    GROUP BY
       n_nationkey,
       n_name
-    FROM
-      nation
-    WHERE
-      n_regionkey = 0
+    ORDER BY
+      n_nationkey desc,
+      n_name desc
 
-    UNION ALL
+   UNION
 
-    SELECT
-      n_nationkey,
-      n_name
-    FROM
-      nation
-    WHERE
-      n_regionkey = 0
- ) T2
+   SELECT
+    n_nationkey,
+    n_name
 
- GROUP BY
-   n_nationkey,
-   n_name
+   FROM (
+      SELECT
+        n_nationkey,
+        n_name
+      FROM
+        nation
+      WHERE
+        n_regionkey = 0
 
- ORDER BY
-   n_nationkey desc,
-   n_name desc
+      UNION ALL
 
-) TABLE1
+      SELECT
+        n_nationkey,
+        n_name
+      FROM
+        nation
+      WHERE
+        n_regionkey = 0
+   ) T2
 
-ORDER BY
-  n_nationkey desc
+   GROUP BY
+     n_nationkey,
+     n_name
 
-UNION
+   ORDER BY
+     n_nationkey desc,
+     n_name desc
 
-SELECT
-  *
-FROM (
-  SELECT
+  ) TABLE1
+
+  ORDER BY
     n_nationkey,
     n_name
 
+  UNION
+
+  SELECT
+    *
   FROM (
     SELECT
       n_nationkey,
       n_name
-    FROM
-      nation
-    WHERE
-      n_regionkey = 0
 
+    FROM (
+      SELECT
+        n_nationkey,
+        n_name
+      FROM
+        nation
+      WHERE
+        n_regionkey = 0
 
-    UNION ALL
 
-    SELECT
+      UNION ALL
+
+      SELECT
+        n_nationkey,
+        n_name
+      FROM
+        nation
+      WHERE
+        n_regionkey = 0
+
+    ) T3
+    GROUP BY
       n_nationkey,
       n_name
-    FROM
-      nation
-    WHERE
-      n_regionkey = 0
+    ORDER BY
+      n_nationkey desc,
+      n_name desc
+
+   UNION
 
-  ) T3
-  GROUP BY
+   SELECT
     n_nationkey,
     n_name
-  ORDER BY
-    n_nationkey desc,
-    n_name desc
 
- UNION
+   FROM (
+      SELECT
+        n_nationkey,
+        n_name
+      FROM
+        nation
+      WHERE
+        n_regionkey = 0
 
- SELECT
-  n_nationkey,
-  n_name
+      UNION ALL
 
- FROM (
-    SELECT
-      n_nationkey,
-      n_name
-    FROM
-      nation
-    WHERE
-      n_regionkey = 0
+      SELECT
+        n_nationkey,
+        n_name
+      FROM
+        nation
+      WHERE
+        n_regionkey = 0
+   ) T4
 
-    UNION ALL
+   GROUP BY
+     n_nationkey,
+     n_name
 
-    SELECT
-      n_nationkey,
-      n_name
-    FROM
-      nation
-    WHERE
-      n_regionkey = 0
- ) T4
+   ORDER BY
+     n_nationkey desc,
+     n_name desc
 
- GROUP BY
-   n_nationkey,
-   n_name
+  ) TABLE2
 
- ORDER BY
-   n_nationkey desc,
-   n_name desc
+  ORDER BY
+    n_nationkey,
+    n_name
 
-) TABLE2
+) TABLE3
 
 ORDER BY
   n_nationkey,

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/ebb12b7d/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion10.result
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion10.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion10.result
index 83e693d..effe340 100644
--- a/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion10.result
+++ b/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion10.result
@@ -1,22 +1,22 @@
 n_nationkey,n_name
 -------------------------------
-16,MOZAMBIQUE
-16,MOZAMBIQUE
-15,MOROCCO
-15,MOROCCO
-14,KENYA
-14,KENYA
-5,ETHIOPIA
-5,ETHIOPIA
 0,ALGERIA
 0,ALGERIA
 0,ALGERIA
 0,ALGERIA
 5,ETHIOPIA
 5,ETHIOPIA
+5,ETHIOPIA
+5,ETHIOPIA
+14,KENYA
+14,KENYA
 14,KENYA
 14,KENYA
 15,MOROCCO
 15,MOROCCO
+15,MOROCCO
+15,MOROCCO
+16,MOZAMBIQUE
+16,MOZAMBIQUE
 16,MOZAMBIQUE
 16,MOZAMBIQUE
\ No newline at end of file