You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2016/09/23 00:42:12 UTC
phoenix git commit: PHOENIX-3273 Replace "!=" with "<>" in all test
cases
Repository: phoenix
Updated Branches:
refs/heads/calcite 026bc8a0c -> 7115be51c
PHOENIX-3273 Replace "!=" with "<>" in all test cases
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7115be51
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7115be51
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7115be51
Branch: refs/heads/calcite
Commit: 7115be51c8c5600aa1f2c82c192060ed19ecbac6
Parents: 026bc8a
Author: maryannxue <ma...@gmail.com>
Authored: Thu Sep 22 17:42:03 2016 -0700
Committer: maryannxue <ma...@gmail.com>
Committed: Thu Sep 22 17:42:03 2016 -0700
----------------------------------------------------------------------
.../apache/phoenix/end2end/CaseStatementIT.java | 2 +-
.../apache/phoenix/end2end/DerivedTableIT.java | 28 +++++-----
.../org/apache/phoenix/end2end/HashJoinIT.java | 58 ++++++++++----------
.../org/apache/phoenix/end2end/InListIT.java | 2 +-
.../org/apache/phoenix/end2end/NotQueryIT.java | 14 ++---
.../apache/phoenix/end2end/SortMergeJoinIT.java | 8 +--
.../org/apache/phoenix/end2end/SubqueryIT.java | 14 ++---
.../end2end/SubqueryUsingSortMergeJoinIT.java | 12 ++--
.../org/apache/phoenix/end2end/UnionAllIT.java | 4 +-
.../java/org/apache/phoenix/end2end/ViewIT.java | 2 +-
.../phoenix/end2end/index/IndexMetadataIT.java | 2 +-
.../org/apache/phoenix/tx/TransactionIT.java | 4 +-
.../java/org/apache/phoenix/util/QueryUtil.java | 2 +-
.../phoenix/compile/WhereCompilerTest.java | 2 +-
.../phoenix/compile/WhereOptimizerTest.java | 8 +--
.../apache/phoenix/parse/QueryParserTest.java | 2 +-
.../org/apache/phoenix/query/QueryPlanTest.java | 4 +-
17 files changed, 84 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
index 59b0f41..a578d48 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
@@ -178,7 +178,7 @@ public class CaseStatementIT extends BaseQueryIT {
@Test
public void testUnfoundSingleColumnCaseStatement() throws Exception {
- String query = "SELECT entity_id, b_string FROM ATABLE WHERE organization_id=? and CASE WHEN a_integer = 0 or a_integer != 0 THEN 1 ELSE 0 END = 0";
+ String query = "SELECT entity_id, b_string FROM ATABLE WHERE organization_id=? and CASE WHEN a_integer = 0 or a_integer <> 0 THEN 1 ELSE 0 END = 0";
String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(url, props);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
index 67be132..6b715fb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
@@ -192,7 +192,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
assertFalse(rs.next());
// (groupby where) where
- query = "SELECT t.a, t.c, t.m FROM (SELECT a_string a, count(*) c, max(a_byte) m FROM aTable WHERE a_byte != 8 GROUP BY a_string) AS t WHERE t.c > 1";
+ query = "SELECT t.a, t.c, t.m FROM (SELECT a_string a, count(*) c, max(a_byte) m FROM aTable WHERE a_byte <> 8 GROUP BY a_string) AS t WHERE t.c > 1";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -207,7 +207,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
assertFalse(rs.next());
// (groupby having where) where
- query = "SELECT t.a, t.c, t.m FROM (SELECT a_string a, count(*) c, max(a_byte) m FROM aTable WHERE a_byte != 8 GROUP BY a_string HAVING count(*) >= 2) AS t WHERE t.a != '" + A_VALUE + "'";
+ query = "SELECT t.a, t.c, t.m FROM (SELECT a_string a, count(*) c, max(a_byte) m FROM aTable WHERE a_byte <> 8 GROUP BY a_string HAVING count(*) >= 2) AS t WHERE t.a <> '" + A_VALUE + "'";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -298,7 +298,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
// () groupby having
- String query = "SELECT t.a, count(*), max(t.s) FROM (SELECT a_string a, a_byte s FROM aTable WHERE a_byte != 8) AS t GROUP BY t.a HAVING count(*) > 1";
+ String query = "SELECT t.a, count(*), max(t.s) FROM (SELECT a_string a, a_byte s FROM aTable WHERE a_byte <> 8) AS t GROUP BY t.a HAVING count(*) > 1";
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
assertTrue (rs.next());
@@ -388,7 +388,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
assertEquals(plans[1], QueryUtil.getExplainPlan(rs));
// (orderby) groupby
- query = "SELECT t.a_string, count(*) FROM (SELECT * FROM aTable order by a_integer) AS t where a_byte != 8 group by t.a_string";
+ query = "SELECT t.a_string, count(*) FROM (SELECT * FROM aTable order by a_integer) AS t where a_byte <> 8 group by t.a_string";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -708,7 +708,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
// (distinct)
- String query = "SELECT * FROM (SELECT DISTINCT a_string, b_string FROM aTable) AS t WHERE t.b_string != '" + C_VALUE + "' ORDER BY t.b_string, t.a_string";
+ String query = "SELECT * FROM (SELECT DISTINCT a_string, b_string FROM aTable) AS t WHERE t.b_string <> '" + C_VALUE + "' ORDER BY t.b_string, t.a_string";
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
assertTrue (rs.next());
@@ -730,7 +730,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
assertFalse(rs.next());
// distinct ()
- query = "SELECT DISTINCT t.a, t.b FROM (SELECT a_string a, b_string b FROM aTable) AS t WHERE t.b != '" + C_VALUE + "' ORDER BY t.b, t.a";
+ query = "SELECT DISTINCT t.a, t.b FROM (SELECT a_string a, b_string b FROM aTable) AS t WHERE t.b <> '" + C_VALUE + "' ORDER BY t.b, t.a";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -811,7 +811,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
// (count)
- String query = "SELECT * FROM (SELECT count(*) FROM aTable WHERE a_byte != 8) AS t";
+ String query = "SELECT * FROM (SELECT count(*) FROM aTable WHERE a_byte <> 8) AS t";
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
assertTrue (rs.next());
@@ -820,7 +820,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
assertFalse(rs.next());
// count ()
- query = "SELECT count(*) FROM (SELECT a_byte FROM aTable) AS t WHERE t.a_byte != 8";
+ query = "SELECT count(*) FROM (SELECT a_byte FROM aTable) AS t WHERE t.a_byte <> 8";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -856,7 +856,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
assertFalse(rs.next());
// count (subquery)
- query = "SELECT count(*) FROM (SELECT * FROM aTable WHERE (organization_id, entity_id) in (SELECT organization_id, entity_id FROM aTable WHERE a_byte != 8)) AS t";
+ query = "SELECT count(*) FROM (SELECT * FROM aTable WHERE (organization_id, entity_id) in (SELECT organization_id, entity_id FROM aTable WHERE a_byte <> 8)) AS t";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -865,7 +865,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
assertFalse(rs.next());
// count (orderby)
- query = "SELECT count(a_byte) FROM (SELECT * FROM aTable order by a_integer) AS t where a_byte != 8";
+ query = "SELECT count(a_byte) FROM (SELECT * FROM aTable order by a_integer) AS t where a_byte <> 8";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -887,7 +887,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
// groupby (join)
String query = "SELECT q.id1, count(q.id2) FROM (SELECT t1.entity_id id1, t2.entity_id id2, t2.a_byte b2"
+ " FROM aTable t1 JOIN aTable t2 ON t1.a_string = t2.b_string"
- + " WHERE t1.a_byte >= 8) AS q WHERE q.b2 != 5 GROUP BY q.id1";
+ + " WHERE t1.a_byte >= 8) AS q WHERE q.b2 <> 5 GROUP BY q.id1";
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
assertTrue (rs.next());
@@ -902,7 +902,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
// distinct (join)
query = "SELECT DISTINCT q.id1 FROM (SELECT t1.entity_id id1, t2.a_byte b2"
+ " FROM aTable t1 JOIN aTable t2 ON t1.a_string = t2.b_string"
- + " WHERE t1.a_byte >= 8) AS q WHERE q.b2 != 5";
+ + " WHERE t1.a_byte >= 8) AS q WHERE q.b2 <> 5";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -915,7 +915,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
// count (join)
query = "SELECT COUNT(*) FROM (SELECT t2.a_byte b2"
+ " FROM aTable t1 JOIN aTable t2 ON t1.a_string = t2.b_string"
- + " WHERE t1.a_byte >= 8) AS q WHERE q.b2 != 5";
+ + " WHERE t1.a_byte >= 8) AS q WHERE q.b2 <> 5";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -966,7 +966,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
// select(select(select) join (select(select)))
query = "SELECT q1.id, q2.id FROM (SELECT t.eid id, t.astr a, t.bstr b FROM (SELECT entity_id eid, a_string astr, b_string bstr, a_byte abyte FROM aTable) AS t WHERE t.abyte >= ?) AS q1"
+ " JOIN (SELECT t.eid id, t.astr a, t.bstr b, t.abyte x FROM (SELECT entity_id eid, a_string astr, b_string bstr, a_byte abyte FROM aTable) AS t) AS q2 ON q1.a = q2.b"
- + " WHERE q2.x != ? ORDER BY q1.id, q2.id DESC";
+ + " WHERE q2.x <> ? ORDER BY q1.id, q2.id DESC";
statement = conn.prepareStatement(query);
statement.setInt(1, 8);
statement.setInt(2, 5);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/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 7afed13..6f63f78 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
@@ -290,8 +290,8 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
* ON o.item_id = i.item_id)
* ON c.customer_id = o.customer_id
* WHERE c.customer_id <= '0000000005'
- * AND order_id != '000000000000003'
- * AND i.name != 'T3'
+ * AND order_id <> '000000000000003'
+ * AND i.name <> 'T3'
* ORDER BY c.customer_id, i.name
*/
"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + JOIN_CUSTOMER_TABLE_DISPLAY_NAME + " [*] - ['0000000005']\n" +
@@ -299,10 +299,10 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
"CLIENT MERGE SORT\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
- " SERVER FILTER BY \"order_id\" != '000000000000003'\n" +
+ " SERVER FILTER BY \"order_id\" <> '000000000000003'\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_ITEM_TABLE_DISPLAY_NAME + "\n" +
- " SERVER FILTER BY NAME != 'T3'\n" +
+ " SERVER FILTER BY NAME <> 'T3'\n" +
" PARALLEL LEFT-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_SUPPLIER_TABLE_DISPLAY_NAME + "\n" +
" DYNAMIC SERVER FILTER BY \"C.customer_id\" IN (\"O.customer_id\")",
@@ -380,8 +380,8 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
* ON o.iid = qi.iiid) as qo
* ON c.cid = qo.ocid
* WHERE c.cid <= '0000000005'
- * AND qo.ooid != '000000000000003'
- * AND qo.iname != 'T3'
+ * AND qo.ooid <> '000000000000003'
+ * AND qo.iname <> 'T3'
* ORDER BY c.cid, qo.iname
*/
"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + JOIN_CUSTOMER_TABLE_DISPLAY_NAME + " [*] - ['0000000005']\n" +
@@ -389,10 +389,10 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
"CLIENT MERGE SORT\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
- " SERVER FILTER BY \"order_id\" != '000000000000003'\n" +
+ " SERVER FILTER BY \"order_id\" <> '000000000000003'\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_ITEM_TABLE_DISPLAY_NAME + "\n" +
- " SERVER FILTER BY NAME != 'T3'\n" +
+ " SERVER FILTER BY NAME <> 'T3'\n" +
" PARALLEL LEFT-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_SUPPLIER_TABLE_DISPLAY_NAME,
/*
@@ -650,8 +650,8 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
* ON o.item_id = i.item_id)
* ON c.customer_id = o.customer_id
* WHERE c.customer_id <= '0000000005'
- * AND order_id != '000000000000003'
- * AND i.name != 'T3'
+ * AND order_id <> '000000000000003'
+ * AND i.name <> 'T3'
* ORDER BY c.customer_id, i.name
*/
"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + JOIN_CUSTOMER_TABLE_DISPLAY_NAME + " [*] - ['0000000005']\n" +
@@ -659,10 +659,10 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
"CLIENT MERGE SORT\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
- " SERVER FILTER BY \"order_id\" != '000000000000003'\n" +
+ " SERVER FILTER BY \"order_id\" <> '000000000000003'\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_SCHEMA + ".idx_item\n" +
- " SERVER FILTER BY \"NAME\" != 'T3'\n" +
+ " SERVER FILTER BY \"NAME\" <> 'T3'\n" +
" PARALLEL LEFT-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_SUPPLIER_TABLE_DISPLAY_NAME + "\n" +
" DYNAMIC SERVER FILTER BY \"C.customer_id\" IN (\"O.customer_id\")",
@@ -741,8 +741,8 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
* ON o.iid = qi.iiid) as qo
* ON c.cid = qo.ocid
* WHERE c.cid <= '0000000005'
- * AND qo.ooid != '000000000000003'
- * AND qo.iname != 'T3'
+ * AND qo.ooid <> '000000000000003'
+ * AND qo.iname <> 'T3'
* ORDER BY c.cid, qo.iname
*/
"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + JOIN_CUSTOMER_TABLE_DISPLAY_NAME + " [*] - ['0000000005']\n" +
@@ -750,10 +750,10 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
"CLIENT MERGE SORT\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
- " SERVER FILTER BY \"order_id\" != '000000000000003'\n" +
+ " SERVER FILTER BY \"order_id\" <> '000000000000003'\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_SCHEMA + ".idx_item\n" +
- " SERVER FILTER BY \"NAME\" != 'T3'\n" +
+ " SERVER FILTER BY \"NAME\" <> 'T3'\n" +
" PARALLEL LEFT-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_SUPPLIER_TABLE_DISPLAY_NAME,
/*
@@ -1028,8 +1028,8 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
* ON o.item_id = i.item_id)
* ON c.customer_id = o.customer_id
* WHERE c.customer_id <= '0000000005'
- * AND order_id != '000000000000003'
- * AND i.name != 'T3'
+ * AND order_id <> '000000000000003'
+ * AND i.name <> 'T3'
* ORDER BY c.customer_id, i.name
*/
"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + JOIN_CUSTOMER_TABLE_DISPLAY_NAME + " [*] - ['0000000005']\n" +
@@ -1037,10 +1037,10 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
"CLIENT MERGE SORT\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
- " SERVER FILTER BY \"order_id\" != '000000000000003'\n" +
+ " SERVER FILTER BY \"order_id\" <> '000000000000003'\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + JOIN_ITEM_TABLE_DISPLAY_NAME +" [1]\n" +
- " SERVER FILTER BY \"NAME\" != 'T3'\n" +
+ " SERVER FILTER BY \"NAME\" <> 'T3'\n" +
" CLIENT MERGE SORT\n" +
" PARALLEL LEFT-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_SUPPLIER_TABLE_DISPLAY_NAME + "\n" +
@@ -1122,8 +1122,8 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
* ON o.iid = qi.iiid) as qo
* ON c.cid = qo.ocid
* WHERE c.cid <= '0000000005'
- * AND qo.ooid != '000000000000003'
- * AND qo.iname != 'T3'
+ * AND qo.ooid <> '000000000000003'
+ * AND qo.iname <> 'T3'
* ORDER BY c.cid, qo.iname
*/
"CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + JOIN_CUSTOMER_TABLE_DISPLAY_NAME + " [*] - ['0000000005']\n" +
@@ -1131,10 +1131,10 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
"CLIENT MERGE SORT\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
- " SERVER FILTER BY \"order_id\" != '000000000000003'\n" +
+ " SERVER FILTER BY \"order_id\" <> '000000000000003'\n" +
" PARALLEL INNER-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY RANGE SCAN OVER " + JOIN_ITEM_TABLE_DISPLAY_NAME + " [1]\n" +
- " SERVER FILTER BY \"NAME\" != 'T3'\n" +
+ " SERVER FILTER BY \"NAME\" <> 'T3'\n" +
" CLIENT MERGE SORT\n" +
" PARALLEL LEFT-JOIN TABLE 0\n" +
" CLIENT PARALLEL 1-WAY FULL SCAN OVER " + JOIN_SUPPLIER_TABLE_DISPLAY_NAME,
@@ -2781,7 +2781,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
+ "SELECT t1.TID, t1.A, t2.A, COUNT(*) "
+ "FROM " + sourceTable + " t1 "
+ "INNER JOIN " + sourceTable + " t2 ON t1.B = t2.B "
- + "WHERE t1.A != t2.A AND t1.TID = '1' AND t2.TID = '1' "
+ + "WHERE t1.A <> t2.A AND t1.TID = '1' AND t2.TID = '1' "
+ "GROUP BY t1.TID, t1.A, t2.A");
upsertStmt.execute();
conn.commit();
@@ -2814,7 +2814,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
+ "(" + JOIN_ORDER_TABLE_FULL_NAME + " o INNER JOIN "
+ "(" + JOIN_SUPPLIER_TABLE_FULL_NAME + " s RIGHT JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON i.\"supplier_id\" = s.\"supplier_id\")"
+ " ON o.\"item_id\" = i.\"item_id\") ON c.\"customer_id\" = o.\"customer_id\""
- + " WHERE c.\"customer_id\" <= '0000000005' AND \"order_id\" != '000000000000003' AND i.name != 'T3' ORDER BY c.\"customer_id\", i.name";
+ + " WHERE c.\"customer_id\" <= '0000000005' AND \"order_id\" <> '000000000000003' AND i.name <> 'T3' ORDER BY c.\"customer_id\", i.name";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
@@ -2997,7 +2997,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
- String query = "SELECT item.\"item_id\", item.name, supp.\"supplier_id\", supp.name FROM " + JOIN_ITEM_TABLE_FULL_NAME + " item INNER JOIN (SELECT reverse(loc_id), \"supplier_id\", name FROM " + JOIN_SUPPLIER_TABLE_FULL_NAME + " LIMIT 5) AS supp ON item.\"supplier_id\" = supp.\"supplier_id\" AND (supp.name != 'S1')";
+ String query = "SELECT item.\"item_id\", item.name, supp.\"supplier_id\", supp.name FROM " + JOIN_ITEM_TABLE_FULL_NAME + " item INNER JOIN (SELECT reverse(loc_id), \"supplier_id\", name FROM " + JOIN_SUPPLIER_TABLE_FULL_NAME + " LIMIT 5) AS supp ON item.\"supplier_id\" = supp.\"supplier_id\" AND (supp.name <> 'S1')";
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
assertTrue (rs.next());
@@ -3022,7 +3022,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
+ JOIN_ITEM_TABLE_FULL_NAME
+ " item INNER JOIN (SELECT reverse(loc_id), \"supplier_id\", name FROM "
+ JOIN_SUPPLIER_TABLE_FULL_NAME
- + " ORDER BY \"supplier_id\" OFFSET 2) AS supp ON item.\"supplier_id\" = supp.\"supplier_id\" AND (supp.name != 'S1')";
+ + " ORDER BY \"supplier_id\" OFFSET 2) AS supp ON item.\"supplier_id\" = supp.\"supplier_id\" AND (supp.name <> 'S1')";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue(rs.next());
@@ -3158,7 +3158,7 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT {
+ "(SELECT o.oid ooid, o.cid ocid, o.iid oiid, o.price * o.quantity, o.\"DATE\" odate, qi.iiid iiid, qi.iname iname, qi.iprice iprice, qi.idiscount1 idiscount1, qi.idiscount2 idiscount2, qi.isid isid, qi.idescription idescription, qi.ssid ssid, qi.sname sname, qi.sphone sphone, qi.saddress saddress, qi.sloc_id sloc_id FROM (SELECT \"item_id\" iid, \"customer_id\" cid, \"order_id\" oid, price, quantity, \"DATE\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + ") AS o INNER JOIN "
+ "(SELECT i.iid iiid, i.name iname, i.price iprice, i.discount1 idiscount1, i.discount2 idiscount2, i.sid isid, i.description idescription, s.sid ssid, s.name sname, s.phone sphone, s.address saddress, s.loc_id sloc_id FROM (SELECT \"supplier_id\" sid, name, phone, address, loc_id FROM " + JOIN_SUPPLIER_TABLE_FULL_NAME + ") AS s RIGHT JOIN (SELECT \"item_id\" iid, name, price, discount1, discount2, \"supplier_id\" sid, description FROM " + JOIN_ITEM_TABLE_FULL_NAME + ") AS i ON i.sid = s.sid) as qi"
+ " ON o.iid = qi.iiid) as qo ON c.cid = qo.ocid"
- + " WHERE c.cid <= '0000000005' AND qo.ooid != '000000000000003' AND qo.iname != 'T3' ORDER BY c.cid, qo.iname";
+ + " WHERE c.cid <= '0000000005' AND qo.ooid <> '000000000000003' AND qo.iname <> 'T3' ORDER BY c.cid, qo.iname";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index b0c661e..93d67df 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -289,7 +289,7 @@ public class InListIT extends ParallelStatsDisabledIT {
@Test
public void testLeadingPKWithTrailingRVCNoResults() throws Exception {
- String whereClause = "WHERE pk1 != 2 AND (pk3, pk4, pk5) IN ((6, 4, 5), (5, 6, 4))";
+ String whereClause = "WHERE pk1 <> 2 AND (pk3, pk4, pk5) IN ((6, 4, 5), (5, 6, 4))";
List<String> expecteds = Collections.<String>emptyList();
testWithIntegerTypesWithVariedSaltingAndTenancy(DEFAULT_UPSERT_BODIES, whereClause, expecteds);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
index 76627be..b8859df 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
@@ -148,7 +148,7 @@ public class NotQueryIT extends BaseQueryIT {
@Test
public void testNotEquals() throws Exception {
String query = "SELECT entity_id -- and here comment\n" +
- "FROM aTable WHERE organization_id=? and a_integer != 1 and a_integer <= 2";
+ "FROM aTable WHERE organization_id=? and a_integer <> 1 and a_integer <= 2";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -167,7 +167,7 @@ public class NotQueryIT extends BaseQueryIT {
@Test
public void testNotEqualsByTinyInt() throws Exception {
String query = "SELECT a_byte -- and here comment\n" +
- "FROM aTable WHERE organization_id=? and a_byte != 1 and a_byte <= 2";
+ "FROM aTable WHERE organization_id=? and a_byte <> 1 and a_byte <= 2";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -186,7 +186,7 @@ public class NotQueryIT extends BaseQueryIT {
@Test
public void testNotEqualsBySmallInt() throws Exception {
String query = "SELECT a_short -- and here comment\n" +
- "FROM aTable WHERE organization_id=? and a_short != 128 and a_short !=0 and a_short <= 129";
+ "FROM aTable WHERE organization_id=? and a_short <> 128 and a_short <>0 and a_short <= 129";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -205,7 +205,7 @@ public class NotQueryIT extends BaseQueryIT {
@Test
public void testNotEqualsByFloat() throws Exception {
String query = "SELECT a_float -- and here comment\n" +
- "FROM aTable WHERE organization_id=? and a_float != CAST(0.01 AS FLOAT) and a_float <= CAST(0.02 AS FLOAT)";
+ "FROM aTable WHERE organization_id=? and a_float <> CAST(0.01 AS FLOAT) and a_float <= CAST(0.02 AS FLOAT)";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -224,7 +224,7 @@ public class NotQueryIT extends BaseQueryIT {
@Test
public void testNotEqualsByUnsignedFloat() throws Exception {
String query = "SELECT a_unsigned_float -- and here comment\n" +
- "FROM aTable WHERE organization_id=? and a_unsigned_float != 0.01 and a_unsigned_float <= 0.02";
+ "FROM aTable WHERE organization_id=? and a_unsigned_float <> 0.01 and a_unsigned_float <= 0.02";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -243,7 +243,7 @@ public class NotQueryIT extends BaseQueryIT {
@Test
public void testNotEqualsByDouble() throws Exception {
String query = "SELECT a_double -- and here comment\n" +
- "FROM aTable WHERE organization_id=? and a_double != CAST(0.0001 AS DOUBLE) and a_double <= CAST(0.0002 AS DOUBLE)";
+ "FROM aTable WHERE organization_id=? and a_double <> CAST(0.0001 AS DOUBLE) and a_double <= CAST(0.0002 AS DOUBLE)";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
Connection conn = DriverManager.getConnection(getUrl(), props);
@@ -262,7 +262,7 @@ public class NotQueryIT extends BaseQueryIT {
@Test
public void testNotEqualsByUnsignedDouble() throws Exception {
String query = "SELECT a_unsigned_double -- and here comment\n" +
- "FROM aTable WHERE organization_id=? and a_unsigned_double != 0.0001 and a_unsigned_double <= 0.0002";
+ "FROM aTable WHERE organization_id=? and a_unsigned_double <> 0.0001 and a_unsigned_double <= 0.0002";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2)); // Execute at timestamp 2
Connection conn = DriverManager.getConnection(getUrl(), props);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/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 38ee4cd..2907d96 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
@@ -1862,7 +1862,7 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT {
+ "SELECT t1.TID, t1.A, t2.A, COUNT(*) "
+ "FROM " + sourceTable + " t1 "
+ "INNER JOIN " + sourceTable + " t2 ON t1.B = t2.B "
- + "WHERE t1.A != t2.A AND t1.TID = '1' AND t2.TID = '1' "
+ + "WHERE t1.A <> t2.A AND t1.TID = '1' AND t2.TID = '1' "
+ "GROUP BY t1.TID, t1.A, t2.A");
upsertStmt.execute();
conn.commit();
@@ -1895,7 +1895,7 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT {
+ "(" + JOIN_ORDER_TABLE_FULL_NAME + " o INNER JOIN "
+ "(" + JOIN_SUPPLIER_TABLE_FULL_NAME + " s RIGHT JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON i.\"supplier_id\" = s.\"supplier_id\")"
+ " ON o.\"item_id\" = i.\"item_id\") ON c.\"customer_id\" = o.\"customer_id\""
- + " WHERE c.\"customer_id\" <= '0000000005' AND \"order_id\" != '000000000000003' AND i.name != 'T3' ORDER BY c.\"customer_id\", i.name";
+ + " WHERE c.\"customer_id\" <= '0000000005' AND \"order_id\" <> '000000000000003' AND i.name <> 'T3' ORDER BY c.\"customer_id\", i.name";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
@@ -2075,7 +2075,7 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
- String query = "SELECT item.\"item_id\", item.name, supp.\"supplier_id\", supp.name FROM " + JOIN_ITEM_TABLE_FULL_NAME + " item INNER JOIN (SELECT reverse(loc_id), \"supplier_id\", name FROM " + JOIN_SUPPLIER_TABLE_FULL_NAME + " LIMIT 5) AS supp ON item.\"supplier_id\" = supp.\"supplier_id\" AND (supp.name != 'S1') ORDER BY \"item_id\"";
+ String query = "SELECT item.\"item_id\", item.name, supp.\"supplier_id\", supp.name FROM " + JOIN_ITEM_TABLE_FULL_NAME + " item INNER JOIN (SELECT reverse(loc_id), \"supplier_id\", name FROM " + JOIN_SUPPLIER_TABLE_FULL_NAME + " LIMIT 5) AS supp ON item.\"supplier_id\" = supp.\"supplier_id\" AND (supp.name <> 'S1') ORDER BY \"item_id\"";
PreparedStatement statement = conn.prepareStatement(query);
ResultSet rs = statement.executeQuery();
assertTrue (rs.next());
@@ -2204,7 +2204,7 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT {
+ "(SELECT /*+ USE_SORT_MERGE_JOIN*/ o.oid ooid, o.cid ocid, o.iid oiid, o.price * o.quantity, o.date odate, qi.iiid iiid, qi.iname iname, qi.iprice iprice, qi.idiscount1 idiscount1, qi.idiscount2 idiscount2, qi.isid isid, qi.idescription idescription, qi.ssid ssid, qi.sname sname, qi.sphone sphone, qi.saddress saddress, qi.sloc_id sloc_id FROM (SELECT \"item_id\" iid, \"customer_id\" cid, \"order_id\" oid, price, quantity, date FROM " + JOIN_ORDER_TABLE_FULL_NAME + ") AS o INNER JOIN "
+ "(SELECT /*+ USE_SORT_MERGE_JOIN*/ i.iid iiid, i.name iname, i.price iprice, i.discount1 idiscount1, i.discount2 idiscount2, i.sid isid, i.description idescription, s.sid ssid, s.name sname, s.phone sphone, s.address saddress, s.loc_id sloc_id FROM (SELECT \"supplier_id\" sid, name, phone, address, loc_id FROM " + JOIN_SUPPLIER_TABLE_FULL_NAME + ") AS s RIGHT JOIN (SELECT \"item_id\" iid, name, price, discount1, discount2, \"supplier_id\" sid, description FROM " + JOIN_ITEM_TABLE_FULL_NAME + ") AS i ON i.sid = s.sid) as qi"
+ " ON o.iid = qi.iiid) as qo ON c.cid = qo.ocid"
- + " WHERE c.cid <= '0000000005' AND qo.ooid != '000000000000003' AND qo.iname != 'T3' ORDER BY c.cid, qo.iname";
+ + " WHERE c.cid <= '0000000005' AND qo.ooid <> '000000000000003' AND qo.iname <> 'T3' ORDER BY c.cid, qo.iname";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
index d94d4e3..f4de5f1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
@@ -436,7 +436,7 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
assertFalse(rs.next());
- query = "SELECT * FROM " + JOIN_COITEM_TABLE_FULL_NAME + " WHERE (item_id, item_name) != ALL (SELECT \"item_id\", name FROM " + JOIN_ITEM_TABLE_FULL_NAME + ")";
+ query = "SELECT * FROM " + JOIN_COITEM_TABLE_FULL_NAME + " WHERE (item_id, item_name) <> ALL (SELECT \"item_id\", name FROM " + JOIN_ITEM_TABLE_FULL_NAME + ")";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -704,7 +704,7 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
query = "SELECT \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME +
" o WHERE quantity = (SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME +
- " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" != '000000000000004')";
+ " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" <> '000000000000004')";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -720,7 +720,7 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
query = "SELECT \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME +
" o WHERE quantity = (SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME +
- " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" != '000000000000003')";
+ " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" <> '000000000000003')";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
try {
@@ -731,7 +731,7 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
query = "SELECT \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME +
" o WHERE quantity = (SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME +
- " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" != '000000000000004' GROUP BY \"order_id\")";
+ " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" <> '000000000000004' GROUP BY \"order_id\")";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -747,7 +747,7 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
query = "SELECT \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME +
" o WHERE quantity = (SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME +
- " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" != '000000000000003' GROUP BY \"order_id\")";
+ " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" <> '000000000000003' GROUP BY \"order_id\")";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
try {
@@ -780,7 +780,7 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
assertFalse(rs.next());
- query = "SELECT \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity != ALL(SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\")";
+ query = "SELECT \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity <> ALL(SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\")";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -789,7 +789,7 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
assertFalse(rs.next());
- query = "SELECT \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity != ANY(SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\" GROUP BY quantity)";
+ query = "SELECT \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity <> ANY(SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\" GROUP BY quantity)";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryUsingSortMergeJoinIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryUsingSortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryUsingSortMergeJoinIT.java
index 435c649..00d60a2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryUsingSortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryUsingSortMergeJoinIT.java
@@ -760,7 +760,7 @@ public class SubqueryUsingSortMergeJoinIT extends BaseHBaseManagedTimeIT {
String plan = QueryUtil.getExplainPlan(rs);
assertTrue("\"" + plan + "\" does not match \"" + plans[2] + "\"", Pattern.matches(plans[2], plan));
- query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o WHERE quantity = (SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME + " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" != '000000000000004')";
+ query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o WHERE quantity = (SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME + " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" <> '000000000000004')";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -774,7 +774,7 @@ public class SubqueryUsingSortMergeJoinIT extends BaseHBaseManagedTimeIT {
assertFalse(rs.next());
- query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o WHERE quantity = (SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME + " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" != '000000000000003')";
+ query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o WHERE quantity = (SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME + " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" <> '000000000000003')";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
try {
@@ -783,7 +783,7 @@ public class SubqueryUsingSortMergeJoinIT extends BaseHBaseManagedTimeIT {
} catch (SQLException e) {
}
- query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o WHERE quantity = (SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" != '000000000000004' GROUP BY \"order_id\")";
+ query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o WHERE quantity = (SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" <> '000000000000004' GROUP BY \"order_id\")";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -797,7 +797,7 @@ public class SubqueryUsingSortMergeJoinIT extends BaseHBaseManagedTimeIT {
assertFalse(rs.next());
- query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o WHERE quantity = (SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" != '000000000000003' GROUP BY \"order_id\")";
+ query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o WHERE quantity = (SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " WHERE o.\"item_id\" = \"item_id\" AND \"order_id\" <> '000000000000003' GROUP BY \"order_id\")";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
try {
@@ -830,7 +830,7 @@ public class SubqueryUsingSortMergeJoinIT extends BaseHBaseManagedTimeIT {
assertFalse(rs.next());
- query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity != ALL(SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\")";
+ query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity <> ALL(SELECT max(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\")";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
@@ -839,7 +839,7 @@ public class SubqueryUsingSortMergeJoinIT extends BaseHBaseManagedTimeIT {
assertFalse(rs.next());
- query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity != ANY(SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\" GROUP BY quantity)";
+ query = "SELECT /*+ USE_SORT_MERGE_JOIN*/ \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity <> ANY(SELECT quantity FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\" GROUP BY quantity)";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
assertTrue (rs.next());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
index 8f9a294..6619c05 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnionAllIT.java
@@ -536,9 +536,9 @@ public class UnionAllIT extends ParallelStatsDisabledIT {
String[] queries = new String[2];
queries[0] = "select a_string, col1 from " + tableName1 + " where a_string in " +
- "(select a_string aa from " + tableName2 + " where a_string != 'a' union all select a_string bb from " + tableName2 + ")";
+ "(select a_string aa from " + tableName2 + " where a_string <> 'a' union all select a_string bb from " + tableName2 + ")";
queries[1] = "select a_string, col1 from " + tableName1 + " where a_string in (select a_string from " +
- "(select a_string from " + tableName2 + " where a_string != 'a' union all select a_string from " + tableName2 + "))";
+ "(select a_string from " + tableName2 + " where a_string <> 'a' union all select a_string from " + tableName2 + "))";
for (String query : queries) {
ResultSet rs = conn.createStatement().executeQuery(query);
assertTrue(rs.next());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 35e1c62..9120f96 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -222,7 +222,7 @@ public class ViewIT extends BaseViewIT {
assertEquals(SQLExceptionCode.CANNOT_MUTATE_TABLE.getErrorCode(), e.getErrorCode());
}
- ddl = "CREATE VIEW v2 AS SELECT * FROM v1 WHERE v2 != 'foo'";
+ ddl = "CREATE VIEW v2 AS SELECT * FROM v1 WHERE v2 <> 'foo'";
conn.createStatement().execute(ddl);
try {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 3372b6a..61ef170 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -519,7 +519,7 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
conn.commit();
conn.createStatement().executeQuery(
- "select v1,v2,v3,v4 FROM " + testTable + " where v2 = 'abc' and v3 != 'a'");
+ "select v1,v2,v3,v4 FROM " + testTable + " where v2 = 'abc' and v3 <> 'a'");
} finally {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index c219158..6817a9f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -969,14 +969,14 @@ public class TransactionIT extends ParallelStatsDisabledIT {
// If the AndExpression were to see the uncommitted row from conn2, the filter would
// filter the row out early and no longer continue to evaluate other cells due to
// the way partial evaluation holds state.
- rs = conn1.createStatement().executeQuery("SELECT * FROM " + transactTableName + " WHERE v1 != 'c' AND v2 = 'x'");
+ rs = conn1.createStatement().executeQuery("SELECT * FROM " + transactTableName + " WHERE v1 <> 'c' AND v2 = 'x'");
assertTrue(rs.next());
assertEquals("a", rs.getString(1));
assertEquals("b", rs.getString(2));
assertFalse(rs.next());
// Same as above for conn1 data
- rs = conn2.createStatement().executeQuery("SELECT * FROM " + transactTableName + " WHERE v1 != 'b' AND v2 = 'x'");
+ rs = conn2.createStatement().executeQuery("SELECT * FROM " + transactTableName + " WHERE v1 <> 'b' AND v2 = 'x'");
assertTrue(rs.next());
assertEquals("a", rs.getString(1));
assertEquals("c", rs.getString(2));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
index 4d343b4..499bf5d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
@@ -92,7 +92,7 @@ public final class QueryUtil {
static {
CompareOpString[CompareOp.EQUAL.ordinal()] = "=";
- CompareOpString[CompareOp.NOT_EQUAL.ordinal()] = "!=";
+ CompareOpString[CompareOp.NOT_EQUAL.ordinal()] = "<>";
CompareOpString[CompareOp.GREATER.ordinal()] = ">";
CompareOpString[CompareOp.LESS.ordinal()] = "<";
CompareOpString[CompareOp.GREATER_OR_EQUAL.ordinal()] = ">=";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
index 7315ad6..cba8c9d 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
@@ -594,7 +594,7 @@ public class WhereCompilerTest extends BaseConnectionlessQueryTest {
@Test
public void testOrFalseFilter() throws SQLException {
String tenantId = "000000000000001";
- String query = "select * from atable where organization_id='" + tenantId + "' and (a_integer=0 or 3!=3)";
+ String query = "select * from atable where organization_id='" + tenantId + "' and (a_integer=0 or 3<>3)";
PhoenixConnection pconn = DriverManager.getConnection(getUrl(), PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
PhoenixPreparedStatement pstmt = newPreparedStatement(pconn, query);
QueryPlan plan = pstmt.optimizeQuery();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java
index a116a2c..5f79eeb 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java
@@ -1052,7 +1052,7 @@ public class WhereOptimizerTest extends BaseConnectionlessQueryTest {
assertQueryConditionAlwaysFalse(query);
// Case 2: int != long, comparison always true, no key set since we need to do a full
// scan all the time.
- query = "SELECT * FROM PKintValueTest where pk != " + Long.MAX_VALUE;
+ query = "SELECT * FROM PKintValueTest where pk <> " + Long.MAX_VALUE;
assertQueryConditionAlwaysTrue(query);
// Case 3: int > positive long, comparison always false;
query = "SELECT * FROM PKintValueTest where pk >= " + Long.MAX_VALUE;
@@ -1077,7 +1077,7 @@ public class WhereOptimizerTest extends BaseConnectionlessQueryTest {
query = "SELECT * FROM PKUnsignedIntValueTest where pk = -1";
assertQueryConditionAlwaysFalse(query);
// Case 2: unsigned_int != negative int, always true;
- query = "SELECT * FROM PKUnsignedIntValueTest where pk != -1";
+ query = "SELECT * FROM PKUnsignedIntValueTest where pk <> -1";
assertQueryConditionAlwaysTrue(query);
// Case 3: unsigned_int > negative int, always true;
query = "SELECT * FROM PKUnsignedIntValueTest where pk > " + (Long.MIN_VALUE + 1);
@@ -1090,7 +1090,7 @@ public class WhereOptimizerTest extends BaseConnectionlessQueryTest {
query = "SELECT * FROM PKUnsignedIntValueTest where pk = " + Long.MAX_VALUE;
assertQueryConditionAlwaysFalse(query);
// Case 2: unsigned_int != big positive long, always true;
- query = "SELECT * FROM PKUnsignedIntValueTest where pk != " + Long.MAX_VALUE;
+ query = "SELECT * FROM PKUnsignedIntValueTest where pk <> " + Long.MAX_VALUE;
assertQueryConditionAlwaysTrue(query);
// Case 3: unsigned_int > big positive long, always false;
query = "SELECT * FROM PKUnsignedIntValueTest where pk >= " + Long.MAX_VALUE;
@@ -1109,7 +1109,7 @@ public class WhereOptimizerTest extends BaseConnectionlessQueryTest {
query = "SELECT * FROM PKUnsignedLongValueTest where pk = -1";
assertQueryConditionAlwaysFalse(query);
// Case 2: unsigned_long = negative int/long, always true;
- query = "SELECT * FROM PKUnsignedLongValueTest where pk != " + (Long.MIN_VALUE + 1);
+ query = "SELECT * FROM PKUnsignedLongValueTest where pk <> " + (Long.MIN_VALUE + 1);
assertQueryConditionAlwaysTrue(query);
// Case 3: unsigned_long > negative int/long, always true;
query = "SELECT * FROM PKUnsignedLongValueTest where pk > -1";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/test/java/org/apache/phoenix/parse/QueryParserTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/parse/QueryParserTest.java b/phoenix-core/src/test/java/org/apache/phoenix/parse/QueryParserTest.java
index e7127b7..b3da9c3 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/parse/QueryParserTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/parse/QueryParserTest.java
@@ -162,7 +162,7 @@ public class QueryParserTest {
"and (cft.organization_id = '00D300000000XHP')\n" +
"and (t.organization_id = '00D300000000XHP')\n" +
"and (t.deleted = '0')\n" +
- "and (t.account_id != '000000000000000'))\n" +
+ "and (t.account_id <> '000000000000000'))\n" +
"where (\"Marketing_Offer_Code__c\" = 'FSCR')"
));
parseQuery(sql);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7115be51/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
index 37010b3..156d763 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryPlanTest.java
@@ -135,9 +135,9 @@ public class QueryPlanTest extends BaseConnectionlessQueryTest {
"CLIENT FILTER BY MAX(A_STRING) = 'a'\n" +
"CLIENT SORTED BY [B_STRING]",
- "SELECT a_string,b_string FROM atable WHERE organization_id = '000000000000001' AND entity_id != '000000000000002' AND x_integer = 2 AND a_integer < 5 LIMIT 10",
+ "SELECT a_string,b_string FROM atable WHERE organization_id = '000000000000001' AND entity_id <> '000000000000002' AND x_integer = 2 AND a_integer < 5 LIMIT 10",
"CLIENT PARALLEL 1-WAY RANGE SCAN OVER ATABLE ['000000000000001']\n" +
- " SERVER FILTER BY (ENTITY_ID != '000000000000002' AND X_INTEGER = 2 AND A_INTEGER < 5)\n" +
+ " SERVER FILTER BY (ENTITY_ID <> '000000000000002' AND X_INTEGER = 2 AND A_INTEGER < 5)\n" +
" SERVER 10 ROW LIMIT\n" +
"CLIENT 10 ROW LIMIT",