[06/35] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-28 Thread maryannxue 
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e280cb9b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index b387ee8..099f6f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -582,19 +582,19 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName3 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, " 
+query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, "
 + tableName3 + " c, " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM (" + tableName4 + " o, " 
+query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM (" + tableName4 + " o, "
 + tableName3 + " c), " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, (" 
+query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, ("
 + tableName3 + " c, " 
 + tableName1 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -794,10 +794,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName2 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + "(" + tableName1 + " i RIGHT JOIN " + tableName2 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")" 
 + " ON o.\"item_id\" = i.\"item_id\" ORDER BY \"order_id\", 
s.\"supplier_id\" DESC";
 try {
@@ -900,10 +900,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " i RIGHT JOIN " 
+String query1 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " +

[08/35] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-28 Thread maryannxue 
PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)


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

Branch: refs/heads/calcite
Commit: 68845287959d84f215eeb8b0726425b92e215268
Parents: e280cb9
Author: maryannxue 
Authored: Wed Oct 12 13:58:46 2016 -0700
Committer: maryannxue 
Committed: Wed Oct 12 13:58:46 2016 -0700

--
 .../org/apache/phoenix/end2end/HashJoinIT.java  | 54 ++--
 .../apache/phoenix/end2end/SortMergeJoinIT.java |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/68845287/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
index 1b90288..7bdea5f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
@@ -1563,19 +1563,19 @@ public class HashJoinIT extends BaseJoinIT {
 String tableName2 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName3 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o JOIN " 
+query[0] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o JOIN "
 + tableName2 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName3 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o, " 
+query[1] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o, "
 + tableName2 + " c, " 
 + tableName3 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ NO_STAR_JOIN*/ \"order_id\", c.name, i.name 
iname, quantity, o.date FROM " + tableName1 + " o JOIN " 
+query[2] = "SELECT /*+ NO_STAR_JOIN*/ \"order_id\", c.name, i.name 
iname, quantity, o.\"DATE\" FROM " + tableName1 + " o JOIN "
 + tableName2 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName3 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ NO_STAR_JOIN*/  \"order_id\", c.name, i.name 
iname, quantity, o.date FROM (" + tableName1 + " o, " 
+query[3] = "SELECT /*+ NO_STAR_JOIN*/  \"order_id\", c.name, i.name 
iname, quantity, o.\"DATE\" FROM (" + tableName1 + " o, "
 + tableName2 + " c), " 
 + tableName3 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o, (" 
+query[4] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o, ("
 + tableName2 + " c, " 
 + tableName3 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -1795,10 +1795,10 @@ public class HashJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName3 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " o LEFT JOIN " 
+String query1 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " + tableName1 + " o LEFT JOIN "
 + tableName2 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName3 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " o LEFT JOIN " 
+String query2 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " + tableName1 + " o LEFT JOIN "
 + "(" + tableName2 + " i RIGHT JOIN " + tableName3 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")"

[07/35] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-28 Thread maryannxue 
PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)


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

Branch: refs/heads/calcite
Commit: e280cb9b63619960c4b01510655515157298f1ef
Parents: d1156ea
Author: maryannxue 
Authored: Wed Oct 12 11:28:48 2016 -0700
Committer: maryannxue 
Committed: Wed Oct 12 11:30:25 2016 -0700

--
 .../phoenix/end2end/AbsFunctionEnd2EndIT.java   |   6 +-
 .../phoenix/end2end/ArrayFillFunctionIT.java|   6 +-
 .../phoenix/end2end/ExecuteStatementsIT.java|  12 +-
 .../phoenix/end2end/FirstValueFunctionIT.java   |  60 
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  18 +--
 .../phoenix/end2end/LastValueFunctionIT.java| 148 +--
 .../phoenix/end2end/NthValueFunctionIT.java |  48 +++---
 .../phoenix/end2end/ProductMetricsIT.java   |  68 -
 .../org/apache/phoenix/end2end/QueryMoreIT.java |   4 +-
 .../phoenix/end2end/RoundFloorCeilFuncIT.java   |  16 +-
 .../phoenix/end2end/SignFunctionEnd2EndIT.java  |   6 +-
 .../apache/phoenix/end2end/SortMergeJoinIT.java |  44 +++---
 .../org/apache/phoenix/end2end/SortOrderIT.java |   6 +-
 .../end2end/SubqueryUsingSortMergeJoinIT.java   |   2 +-
 .../apache/phoenix/end2end/UpsertValuesIT.java  |  10 +-
 .../phoenix/end2end/VariableLengthPKIT.java |  46 +++---
 .../phoenix/compile/JoinQueryCompilerTest.java  |   2 +-
 .../phoenix/compile/QueryOptimizerTest.java |  12 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   2 +-
 .../org/apache/phoenix/query/QueryPlanTest.java |  14 +-
 20 files changed, 265 insertions(+), 265 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e280cb9b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
index 8447286..3137cdf 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
@@ -46,7 +46,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 try {
 conn = DriverManager.getConnection(getUrl());
 String ddl;
-ddl = "CREATE TABLE " + TABLE_NAME + " (k VARCHAR NOT NULL PRIMARY 
KEY, dec DECIMAL, doub DOUBLE, fl FLOAT, inte INTEGER, lon BIGINT, smalli 
SMALLINT, tinyi TINYINT)";
+ddl = "CREATE TABLE " + TABLE_NAME + " (k VARCHAR NOT NULL PRIMARY 
KEY, \"DEC\" DECIMAL, doub DOUBLE, fl FLOAT, inte INTEGER, lon BIGINT, smalli 
SMALLINT, tinyi TINYINT)";
 conn.createStatement().execute(ddl);
 conn.commit();
 } finally {
@@ -71,7 +71,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 
 private void testSignedNumberSpec(Connection conn, double data) throws 
Exception {
 updateSignedTable(conn, data);
-ResultSet rs = conn.createStatement() .executeQuery("SELECT 
ABS(dec),ABS(doub),ABS(fl),ABS(inte),ABS(lon),ABS(smalli),ABS(tinyi) FROM " + 
TABLE_NAME);
+ResultSet rs = conn.createStatement() .executeQuery("SELECT 
ABS(\"DEC\"),ABS(doub),ABS(fl),ABS(inte),ABS(lon),ABS(smalli),ABS(tinyi) FROM " 
+ TABLE_NAME);
 assertTrue(rs.next());
 Double d = Double.valueOf(data);
 
assertEquals(rs.getBigDecimal(1).compareTo(BigDecimal.valueOf(data).abs()), 0);
@@ -83,7 +83,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 assertEquals(rs.getByte(7), Math.abs(d.byteValue()));
 assertTrue(!rs.next());
 
-PreparedStatement stmt = conn.prepareStatement("SELECT k FROM " + 
TABLE_NAME + " WHERE ABS(dec)=? AND ABS(doub)=? AND ABS(fl)=? AND ABS(inte)=? 
AND ABS(lon)=? AND ABS(smalli)=? AND ABS(tinyi)=?");
+PreparedStatement stmt = conn.prepareStatement("SELECT k FROM " + 
TABLE_NAME + " WHERE ABS(\"DEC\")=? AND ABS(doub)=? AND ABS(fl)=? AND 
ABS(inte)=? AND ABS(lon)=? AND ABS(smalli)=? AND ABS(tinyi)=?");
 stmt.setBigDecimal(1, BigDecimal.valueOf(data).abs());
 stmt.setDouble(2, Math.abs(d.doubleValue()));
 stmt.setFloat(3, Math.abs(d.floatValue()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e280cb9b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
--
diff --git

phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 5c70a2265 -> 22ec7c2be


PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 22ec7c2be0ed730d7d15636f191027bdf636058b
Parents: 5c70a22
Author: maryannxue 
Authored: Wed Oct 12 14:04:51 2016 -0700
Committer: maryannxue 
Committed: Wed Oct 12 14:04:51 2016 -0700

--
 .../org/apache/phoenix/end2end/HashJoinIT.java  | 54 ++--
 .../apache/phoenix/end2end/SortMergeJoinIT.java |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/22ec7c2b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
index 1b90288..7bdea5f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
@@ -1563,19 +1563,19 @@ public class HashJoinIT extends BaseJoinIT {
 String tableName2 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName3 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o JOIN " 
+query[0] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o JOIN "
 + tableName2 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName3 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o, " 
+query[1] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o, "
 + tableName2 + " c, " 
 + tableName3 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ NO_STAR_JOIN*/ \"order_id\", c.name, i.name 
iname, quantity, o.date FROM " + tableName1 + " o JOIN " 
+query[2] = "SELECT /*+ NO_STAR_JOIN*/ \"order_id\", c.name, i.name 
iname, quantity, o.\"DATE\" FROM " + tableName1 + " o JOIN "
 + tableName2 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName3 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ NO_STAR_JOIN*/  \"order_id\", c.name, i.name 
iname, quantity, o.date FROM (" + tableName1 + " o, " 
+query[3] = "SELECT /*+ NO_STAR_JOIN*/  \"order_id\", c.name, i.name 
iname, quantity, o.\"DATE\" FROM (" + tableName1 + " o, "
 + tableName2 + " c), " 
 + tableName3 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o, (" 
+query[4] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o, ("
 + tableName2 + " c, " 
 + tableName3 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -1795,10 +1795,10 @@ public class HashJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName3 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " o LEFT JOIN " 
+String query1 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " + tableName1 + " o LEFT JOIN "
 + tableName2 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName3 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " o LEFT JOIN " 
+String query2 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " + tableName1 + " o LEFT JOIN "
 + "(" +

phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 88c092f12 -> 300dd162f


PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 300dd162fb4045b46323342c12905f547ec9da34
Parents: 88c092f
Author: maryannxue 
Authored: Wed Oct 12 13:59:26 2016 -0700
Committer: maryannxue 
Committed: Wed Oct 12 13:59:26 2016 -0700

--
 .../org/apache/phoenix/end2end/HashJoinIT.java  | 54 ++--
 .../apache/phoenix/end2end/SortMergeJoinIT.java |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/300dd162/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
index 1b90288..7bdea5f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
@@ -1563,19 +1563,19 @@ public class HashJoinIT extends BaseJoinIT {
 String tableName2 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName3 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o JOIN " 
+query[0] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o JOIN "
 + tableName2 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName3 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o, " 
+query[1] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o, "
 + tableName2 + " c, " 
 + tableName3 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ NO_STAR_JOIN*/ \"order_id\", c.name, i.name 
iname, quantity, o.date FROM " + tableName1 + " o JOIN " 
+query[2] = "SELECT /*+ NO_STAR_JOIN*/ \"order_id\", c.name, i.name 
iname, quantity, o.\"DATE\" FROM " + tableName1 + " o JOIN "
 + tableName2 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName3 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ NO_STAR_JOIN*/  \"order_id\", c.name, i.name 
iname, quantity, o.date FROM (" + tableName1 + " o, " 
+query[3] = "SELECT /*+ NO_STAR_JOIN*/  \"order_id\", c.name, i.name 
iname, quantity, o.\"DATE\" FROM (" + tableName1 + " o, "
 + tableName2 + " c), " 
 + tableName3 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o, (" 
+query[4] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o, ("
 + tableName2 + " c, " 
 + tableName3 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -1795,10 +1795,10 @@ public class HashJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName3 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " o LEFT JOIN " 
+String query1 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " + tableName1 + " o LEFT JOIN "
 + tableName2 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName3 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " o LEFT JOIN " 
+String query2 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " + tableName1 + " o LEFT JOIN "
 + "(" + tableName2

phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/master e280cb9b6 -> 688452879


PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)


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

Branch: refs/heads/master
Commit: 68845287959d84f215eeb8b0726425b92e215268
Parents: e280cb9
Author: maryannxue 
Authored: Wed Oct 12 13:58:46 2016 -0700
Committer: maryannxue 
Committed: Wed Oct 12 13:58:46 2016 -0700

--
 .../org/apache/phoenix/end2end/HashJoinIT.java  | 54 ++--
 .../apache/phoenix/end2end/SortMergeJoinIT.java |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/68845287/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
index 1b90288..7bdea5f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java
@@ -1563,19 +1563,19 @@ public class HashJoinIT extends BaseJoinIT {
 String tableName2 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName3 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o JOIN " 
+query[0] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o JOIN "
 + tableName2 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName3 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o, " 
+query[1] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o, "
 + tableName2 + " c, " 
 + tableName3 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ NO_STAR_JOIN*/ \"order_id\", c.name, i.name 
iname, quantity, o.date FROM " + tableName1 + " o JOIN " 
+query[2] = "SELECT /*+ NO_STAR_JOIN*/ \"order_id\", c.name, i.name 
iname, quantity, o.\"DATE\" FROM " + tableName1 + " o JOIN "
 + tableName2 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName3 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ NO_STAR_JOIN*/  \"order_id\", c.name, i.name 
iname, quantity, o.date FROM (" + tableName1 + " o, " 
+query[3] = "SELECT /*+ NO_STAR_JOIN*/  \"order_id\", c.name, i.name 
iname, quantity, o.\"DATE\" FROM (" + tableName1 + " o, "
 + tableName2 + " c), " 
 + tableName3 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.date FROM " + tableName1 + " o, (" 
+query[4] = "SELECT \"order_id\", c.name, i.name iname, quantity, 
o.\"DATE\" FROM " + tableName1 + " o, ("
 + tableName2 + " c, " 
 + tableName3 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -1795,10 +1795,10 @@ public class HashJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName3 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " o LEFT JOIN " 
+String query1 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " + tableName1 + " o LEFT JOIN "
 + tableName2 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName3 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " o LEFT JOIN " 
+String query2 = "SELECT \"order_id\", i.name, s.name, quantity, 
\"DATE\" FROM " + tableName1 + " o LEFT JOIN "
 + "(" + tableName2 + " i RIGHT

[1/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 8fe0b86ce -> 5c70a2265


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5c70a226/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index b387ee8..099f6f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -582,19 +582,19 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName3 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, " 
+query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, "
 + tableName3 + " c, " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM (" + tableName4 + " o, " 
+query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM (" + tableName4 + " o, "
 + tableName3 + " c), " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, (" 
+query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, ("
 + tableName3 + " c, " 
 + tableName1 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -794,10 +794,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName2 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + "(" + tableName1 + " i RIGHT JOIN " + tableName2 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")" 
 + " ON o.\"item_id\" = i.\"item_id\" ORDER BY \"order_id\", 
s.\"supplier_id\" DESC";
 try {
@@ -900,10 +900,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " i RIGHT JOIN " 
+

[2/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 5c70a2265b4bf92031c74252a29e6d7d1e61804b
Parents: 8fe0b86
Author: maryannxue 
Authored: Wed Oct 12 11:37:33 2016 -0700
Committer: maryannxue 
Committed: Wed Oct 12 11:37:33 2016 -0700

--
 .../phoenix/end2end/AbsFunctionEnd2EndIT.java   |   6 +-
 .../phoenix/end2end/ArrayFillFunctionIT.java|   6 +-
 .../phoenix/end2end/ExecuteStatementsIT.java|  12 +-
 .../phoenix/end2end/FirstValueFunctionIT.java   |  60 
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  18 +--
 .../phoenix/end2end/LastValueFunctionIT.java| 148 +--
 .../phoenix/end2end/NthValueFunctionIT.java |  48 +++---
 .../phoenix/end2end/ProductMetricsIT.java   |  68 -
 .../org/apache/phoenix/end2end/QueryMoreIT.java |   4 +-
 .../phoenix/end2end/RoundFloorCeilFuncIT.java   |  16 +-
 .../phoenix/end2end/SignFunctionEnd2EndIT.java  |   6 +-
 .../apache/phoenix/end2end/SortMergeJoinIT.java |  44 +++---
 .../org/apache/phoenix/end2end/SortOrderIT.java |   6 +-
 .../end2end/SubqueryUsingSortMergeJoinIT.java   |   2 +-
 .../apache/phoenix/end2end/UpsertValuesIT.java  |  10 +-
 .../phoenix/end2end/VariableLengthPKIT.java |  46 +++---
 .../phoenix/compile/JoinQueryCompilerTest.java  |   2 +-
 .../phoenix/compile/QueryOptimizerTest.java |  12 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   2 +-
 .../org/apache/phoenix/query/QueryPlanTest.java |  14 +-
 20 files changed, 265 insertions(+), 265 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5c70a226/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
index 1613b81..95919ad 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
@@ -47,7 +47,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 System.out.println("TABLE_NAME = " + TABLE_NAME);
 conn = DriverManager.getConnection(getUrl());
 String ddl;
-ddl = "CREATE TABLE " + TABLE_NAME + " (k VARCHAR NOT NULL PRIMARY 
KEY, dec DECIMAL, doub DOUBLE, fl FLOAT, inte INTEGER, lon BIGINT, smalli 
SMALLINT, tinyi TINYINT)";
+ddl = "CREATE TABLE " + TABLE_NAME + " (k VARCHAR NOT NULL PRIMARY 
KEY, \"DEC\" DECIMAL, doub DOUBLE, fl FLOAT, inte INTEGER, lon BIGINT, smalli 
SMALLINT, tinyi TINYINT)";
 conn.createStatement().execute(ddl);
 conn.commit();
 } finally {
@@ -72,7 +72,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 
 private void testSignedNumberSpec(Connection conn, double data) throws 
Exception {
 updateSignedTable(conn, data);
-ResultSet rs = conn.createStatement() .executeQuery("SELECT 
ABS(dec),ABS(doub),ABS(fl),ABS(inte),ABS(lon),ABS(smalli),ABS(tinyi) FROM " + 
TABLE_NAME);
+ResultSet rs = conn.createStatement() .executeQuery("SELECT 
ABS(\"DEC\"),ABS(doub),ABS(fl),ABS(inte),ABS(lon),ABS(smalli),ABS(tinyi) FROM " 
+ TABLE_NAME);
 assertTrue(rs.next());
 Double d = Double.valueOf(data);
 
assertEquals(rs.getBigDecimal(1).compareTo(BigDecimal.valueOf(data).abs()), 0);
@@ -84,7 +84,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 assertEquals(rs.getByte(7), Math.abs(d.byteValue()));
 assertTrue(!rs.next());
 
-PreparedStatement stmt = conn.prepareStatement("SELECT k FROM " + 
TABLE_NAME + " WHERE ABS(dec)=? AND ABS(doub)=? AND ABS(fl)=? AND ABS(inte)=? 
AND ABS(lon)=? AND ABS(smalli)=? AND ABS(tinyi)=?");
+PreparedStatement stmt = conn.prepareStatement("SELECT k FROM " + 
TABLE_NAME + " WHERE ABS(\"DEC\")=? AND ABS(doub)=? AND ABS(fl)=? AND 
ABS(inte)=? AND ABS(lon)=? AND ABS(smalli)=? AND ABS(tinyi)=?");
 stmt.setBigDecimal(1, BigDecimal.valueOf(data).abs());
 stmt.setDouble(2, Math.abs(d.doubleValue()));
 stmt.setFloat(3, Math.abs(d.floatValue()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5c70a226/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java

[1/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 0a78f055b -> 88c092f12


http://git-wip-us.apache.org/repos/asf/phoenix/blob/88c092f1/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index b387ee8..099f6f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -582,19 +582,19 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName3 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, " 
+query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, "
 + tableName3 + " c, " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM (" + tableName4 + " o, " 
+query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM (" + tableName4 + " o, "
 + tableName3 + " c), " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, (" 
+query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, ("
 + tableName3 + " c, " 
 + tableName1 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -794,10 +794,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName2 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + "(" + tableName1 + " i RIGHT JOIN " + tableName2 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")" 
 + " ON o.\"item_id\" = i.\"item_id\" ORDER BY \"order_id\", 
s.\"supplier_id\" DESC";
 try {
@@ -900,10 +900,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " i RIGHT JOIN " 
+

[2/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 88c092f121b9d588576a9d2c917239da82b86e45
Parents: 0a78f05
Author: maryannxue 
Authored: Wed Oct 12 11:32:25 2016 -0700
Committer: maryannxue 
Committed: Wed Oct 12 11:32:25 2016 -0700

--
 .../phoenix/end2end/AbsFunctionEnd2EndIT.java   |   6 +-
 .../phoenix/end2end/ArrayFillFunctionIT.java|   6 +-
 .../phoenix/end2end/ExecuteStatementsIT.java|  12 +-
 .../phoenix/end2end/FirstValueFunctionIT.java   |  60 
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  18 +--
 .../phoenix/end2end/LastValueFunctionIT.java| 148 +--
 .../phoenix/end2end/NthValueFunctionIT.java |  48 +++---
 .../phoenix/end2end/ProductMetricsIT.java   |  68 -
 .../org/apache/phoenix/end2end/QueryMoreIT.java |   4 +-
 .../phoenix/end2end/RoundFloorCeilFuncIT.java   |  16 +-
 .../phoenix/end2end/SignFunctionEnd2EndIT.java  |   6 +-
 .../apache/phoenix/end2end/SortMergeJoinIT.java |  44 +++---
 .../org/apache/phoenix/end2end/SortOrderIT.java |   6 +-
 .../end2end/SubqueryUsingSortMergeJoinIT.java   |   2 +-
 .../apache/phoenix/end2end/UpsertValuesIT.java  |  10 +-
 .../phoenix/end2end/VariableLengthPKIT.java |  46 +++---
 .../phoenix/compile/JoinQueryCompilerTest.java  |   2 +-
 .../phoenix/compile/QueryOptimizerTest.java |  12 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   2 +-
 .../org/apache/phoenix/query/QueryPlanTest.java |  14 +-
 20 files changed, 265 insertions(+), 265 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/88c092f1/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
index 8447286..3137cdf 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
@@ -46,7 +46,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 try {
 conn = DriverManager.getConnection(getUrl());
 String ddl;
-ddl = "CREATE TABLE " + TABLE_NAME + " (k VARCHAR NOT NULL PRIMARY 
KEY, dec DECIMAL, doub DOUBLE, fl FLOAT, inte INTEGER, lon BIGINT, smalli 
SMALLINT, tinyi TINYINT)";
+ddl = "CREATE TABLE " + TABLE_NAME + " (k VARCHAR NOT NULL PRIMARY 
KEY, \"DEC\" DECIMAL, doub DOUBLE, fl FLOAT, inte INTEGER, lon BIGINT, smalli 
SMALLINT, tinyi TINYINT)";
 conn.createStatement().execute(ddl);
 conn.commit();
 } finally {
@@ -71,7 +71,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 
 private void testSignedNumberSpec(Connection conn, double data) throws 
Exception {
 updateSignedTable(conn, data);
-ResultSet rs = conn.createStatement() .executeQuery("SELECT 
ABS(dec),ABS(doub),ABS(fl),ABS(inte),ABS(lon),ABS(smalli),ABS(tinyi) FROM " + 
TABLE_NAME);
+ResultSet rs = conn.createStatement() .executeQuery("SELECT 
ABS(\"DEC\"),ABS(doub),ABS(fl),ABS(inte),ABS(lon),ABS(smalli),ABS(tinyi) FROM " 
+ TABLE_NAME);
 assertTrue(rs.next());
 Double d = Double.valueOf(data);
 
assertEquals(rs.getBigDecimal(1).compareTo(BigDecimal.valueOf(data).abs()), 0);
@@ -83,7 +83,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 assertEquals(rs.getByte(7), Math.abs(d.byteValue()));
 assertTrue(!rs.next());
 
-PreparedStatement stmt = conn.prepareStatement("SELECT k FROM " + 
TABLE_NAME + " WHERE ABS(dec)=? AND ABS(doub)=? AND ABS(fl)=? AND ABS(inte)=? 
AND ABS(lon)=? AND ABS(smalli)=? AND ABS(tinyi)=?");
+PreparedStatement stmt = conn.prepareStatement("SELECT k FROM " + 
TABLE_NAME + " WHERE ABS(\"DEC\")=? AND ABS(doub)=? AND ABS(fl)=? AND 
ABS(inte)=? AND ABS(lon)=? AND ABS(smalli)=? AND ABS(tinyi)=?");
 stmt.setBigDecimal(1, BigDecimal.valueOf(data).abs());
 stmt.setDouble(2, Math.abs(d.doubleValue()));
 stmt.setFloat(3, Math.abs(d.floatValue()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/88c092f1/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
--
diff --git

[2/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)

2016-10-12 Thread maryannxue 
PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore)


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

Branch: refs/heads/master
Commit: e280cb9b63619960c4b01510655515157298f1ef
Parents: d1156ea
Author: maryannxue 
Authored: Wed Oct 12 11:28:48 2016 -0700
Committer: maryannxue 
Committed: Wed Oct 12 11:30:25 2016 -0700

--
 .../phoenix/end2end/AbsFunctionEnd2EndIT.java   |   6 +-
 .../phoenix/end2end/ArrayFillFunctionIT.java|   6 +-
 .../phoenix/end2end/ExecuteStatementsIT.java|  12 +-
 .../phoenix/end2end/FirstValueFunctionIT.java   |  60 
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  18 +--
 .../phoenix/end2end/LastValueFunctionIT.java| 148 +--
 .../phoenix/end2end/NthValueFunctionIT.java |  48 +++---
 .../phoenix/end2end/ProductMetricsIT.java   |  68 -
 .../org/apache/phoenix/end2end/QueryMoreIT.java |   4 +-
 .../phoenix/end2end/RoundFloorCeilFuncIT.java   |  16 +-
 .../phoenix/end2end/SignFunctionEnd2EndIT.java  |   6 +-
 .../apache/phoenix/end2end/SortMergeJoinIT.java |  44 +++---
 .../org/apache/phoenix/end2end/SortOrderIT.java |   6 +-
 .../end2end/SubqueryUsingSortMergeJoinIT.java   |   2 +-
 .../apache/phoenix/end2end/UpsertValuesIT.java  |  10 +-
 .../phoenix/end2end/VariableLengthPKIT.java |  46 +++---
 .../phoenix/compile/JoinQueryCompilerTest.java  |   2 +-
 .../phoenix/compile/QueryOptimizerTest.java |  12 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   2 +-
 .../org/apache/phoenix/query/QueryPlanTest.java |  14 +-
 20 files changed, 265 insertions(+), 265 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e280cb9b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
index 8447286..3137cdf 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AbsFunctionEnd2EndIT.java
@@ -46,7 +46,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 try {
 conn = DriverManager.getConnection(getUrl());
 String ddl;
-ddl = "CREATE TABLE " + TABLE_NAME + " (k VARCHAR NOT NULL PRIMARY 
KEY, dec DECIMAL, doub DOUBLE, fl FLOAT, inte INTEGER, lon BIGINT, smalli 
SMALLINT, tinyi TINYINT)";
+ddl = "CREATE TABLE " + TABLE_NAME + " (k VARCHAR NOT NULL PRIMARY 
KEY, \"DEC\" DECIMAL, doub DOUBLE, fl FLOAT, inte INTEGER, lon BIGINT, smalli 
SMALLINT, tinyi TINYINT)";
 conn.createStatement().execute(ddl);
 conn.commit();
 } finally {
@@ -71,7 +71,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 
 private void testSignedNumberSpec(Connection conn, double data) throws 
Exception {
 updateSignedTable(conn, data);
-ResultSet rs = conn.createStatement() .executeQuery("SELECT 
ABS(dec),ABS(doub),ABS(fl),ABS(inte),ABS(lon),ABS(smalli),ABS(tinyi) FROM " + 
TABLE_NAME);
+ResultSet rs = conn.createStatement() .executeQuery("SELECT 
ABS(\"DEC\"),ABS(doub),ABS(fl),ABS(inte),ABS(lon),ABS(smalli),ABS(tinyi) FROM " 
+ TABLE_NAME);
 assertTrue(rs.next());
 Double d = Double.valueOf(data);
 
assertEquals(rs.getBigDecimal(1).compareTo(BigDecimal.valueOf(data).abs()), 0);
@@ -83,7 +83,7 @@ public class AbsFunctionEnd2EndIT extends 
ParallelStatsDisabledIT {
 assertEquals(rs.getByte(7), Math.abs(d.byteValue()));
 assertTrue(!rs.next());
 
-PreparedStatement stmt = conn.prepareStatement("SELECT k FROM " + 
TABLE_NAME + " WHERE ABS(dec)=? AND ABS(doub)=? AND ABS(fl)=? AND ABS(inte)=? 
AND ABS(lon)=? AND ABS(smalli)=? AND ABS(tinyi)=?");
+PreparedStatement stmt = conn.prepareStatement("SELECT k FROM " + 
TABLE_NAME + " WHERE ABS(\"DEC\")=? AND ABS(doub)=? AND ABS(fl)=? AND 
ABS(inte)=? AND ABS(lon)=? AND ABS(smalli)=? AND ABS(tinyi)=?");
 stmt.setBigDecimal(1, BigDecimal.valueOf(data).abs());
 stmt.setDouble(2, Math.abs(d.doubleValue()));
 stmt.setFloat(3, Math.abs(d.floatValue()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e280cb9b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayFillFunctionIT.java
--
diff --git

[1/2] phoenix git commit: PHOENIX-3265 Double-quote column names that use reserved keywords (Eric Lomore) [Forced Update!]

2016-10-12 Thread maryannxue 
Repository: phoenix
Updated Branches:
  refs/heads/master fd1dac0d4 -> e280cb9b6 (forced update)


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e280cb9b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index b387ee8..099f6f5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -582,19 +582,19 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName3 = getTableName(conn, JOIN_CUSTOMER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
 String[] query = new String[5];
-query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[0] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, " 
+query[1] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, "
 + tableName3 + " c, " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o JOIN " 
+query[2] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o JOIN "
 + tableName3 + " c ON o.\"customer_id\" = c.\"customer_id\" 
JOIN " 
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" ORDER BY 
\"order_id\"";
-query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM (" + tableName4 + " o, " 
+query[3] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM (" + tableName4 + " o, "
 + tableName3 + " c), " 
 + tableName1 + " i WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
-query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.date FROM " + tableName4 + " o, (" 
+query[4] = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", c.name, 
i.name iname, quantity, o.\"DATE\" FROM " + tableName4 + " o, ("
 + tableName3 + " c, " 
 + tableName1 + " i) WHERE o.\"item_id\" = i.\"item_id\" AND 
o.\"customer_id\" = c.\"customer_id\" ORDER BY \"order_id\"";
 try {
@@ -794,10 +794,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query1 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + tableName1 + " i ON o.\"item_id\" = i.\"item_id\" RIGHT JOIN 
"
 + tableName2 + " s ON i.\"supplier_id\" = s.\"supplier_id\" 
ORDER BY \"order_id\", s.\"supplier_id\" DESC";
-String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, date FROM " + tableName4 + " o LEFT JOIN " 
+String query2 = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", 
i.name, s.name, quantity, \"DATE\" FROM " + tableName4 + " o LEFT JOIN "
 + "(" + tableName1 + " i RIGHT JOIN " + tableName2 + " s ON 
i.\"supplier_id\" = s.\"supplier_id\")" 
 + " ON o.\"item_id\" = i.\"item_id\" ORDER BY \"order_id\", 
s.\"supplier_id\" DESC";
 try {
@@ -900,10 +900,10 @@ public class SortMergeJoinIT extends BaseJoinIT {
 String tableName1 = getTableName(conn, JOIN_ITEM_TABLE_FULL_NAME);
 String tableName2 = getTableName(conn, JOIN_SUPPLIER_TABLE_FULL_NAME);
 String tableName4 = getTableName(conn, JOIN_ORDER_TABLE_FULL_NAME);
-String query1 = "SELECT \"order_id\", i.name, s.name, quantity, date 
FROM " + tableName1 + " i RIGHT JOIN