You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2017/05/10 18:04:16 UTC
[17/46] phoenix git commit: PHOENIX-3770 Double quote SYSTEM, USER,
DATE keywords in some more IT tests(Rajeshbabu)
PHOENIX-3770 Double quote SYSTEM, USER,DATE keywords in some more IT tests(Rajeshbabu)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/92e728e0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/92e728e0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/92e728e0
Branch: refs/heads/omid
Commit: 92e728e09ace5dfac93cd04a747f3db8043569ee
Parents: 8b3cc71
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
Authored: Thu Apr 6 18:47:50 2017 +0530
Committer: Rajeshbabu Chintaguntla <ra...@apache.org>
Committed: Thu Apr 6 18:47:50 2017 +0530
----------------------------------------------------------------------
.../apache/phoenix/end2end/AlterTableIT.java | 9 ++--
.../org/apache/phoenix/end2end/ArrayIT.java | 2 +-
.../phoenix/end2end/AutomaticRebuildIT.java | 4 +-
.../phoenix/end2end/CoalesceFunctionIT.java | 12 +++---
.../apache/phoenix/end2end/CreateTableIT.java | 2 +-
.../end2end/IndexToolForPartialBuildIT.java | 4 +-
.../end2end/SequenceBulkAllocationIT.java | 44 ++++++++++----------
.../org/apache/phoenix/end2end/SequenceIT.java | 44 ++++++++++----------
.../phoenix/end2end/SpillableGroupByIT.java | 2 +-
.../phoenix/end2end/StatsCollectorIT.java | 11 ++---
.../phoenix/end2end/StoreNullsPropIT.java | 2 +-
.../apache/phoenix/end2end/UpsertSelectIT.java | 18 ++++----
.../apache/phoenix/end2end/index/IndexIT.java | 5 +--
.../phoenix/end2end/index/IndexMetadataIT.java | 6 +--
.../phoenix/end2end/index/IndexTestUtil.java | 2 +-
.../phoenix/end2end/index/LocalIndexIT.java | 2 +-
.../org/apache/phoenix/rpc/UpdateCacheIT.java | 2 +-
.../phoenix/tx/ParameterizedTransactionIT.java | 8 ++--
.../org/apache/phoenix/util/UpgradeUtil.java | 2 +-
19 files changed, 92 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index d13b8d2..5c1374f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -759,8 +759,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
try {
String ddl = "CREATE TABLE " + dataTableFullName + " " + " (a_string varchar not null, col1 integer, cf1.col2 integer"
+ " CONSTRAINT pk PRIMARY KEY (a_string)) " + tableDDLOptions;
- stmt = conn.prepareStatement(ddl);
- stmt.execute();
+ conn.createStatement().execute(ddl);
} finally {
closeStatement(stmt);
}
@@ -2476,7 +2475,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
}
private void assertEncodedCQValue(String columnFamily, String columnName, String schemaName, String tableName, int expectedValue) throws Exception {
- String query = "SELECT " + COLUMN_QUALIFIER + " FROM SYSTEM.CATALOG WHERE " + TABLE_SCHEM + " = ? AND " + TABLE_NAME
+ String query = "SELECT " + COLUMN_QUALIFIER + " FROM \"SYSTEM\".CATALOG WHERE " + TABLE_SCHEM + " = ? AND " + TABLE_NAME
+ " = ? " + " AND " + COLUMN_FAMILY + " = ?" + " AND " + COLUMN_NAME + " = ?" + " AND " + COLUMN_QUALIFIER + " IS NOT NULL";
try (Connection conn = DriverManager.getConnection(getUrl())) {
PreparedStatement stmt = conn.prepareStatement(query);
@@ -2496,7 +2495,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
}
private void assertEncodedCQCounter(String columnFamily, String schemaName, String tableName, int expectedValue) throws Exception {
- String query = "SELECT " + COLUMN_QUALIFIER_COUNTER + " FROM SYSTEM.CATALOG WHERE " + TABLE_SCHEM + " = ? AND " + TABLE_NAME
+ String query = "SELECT " + COLUMN_QUALIFIER_COUNTER + " FROM \"SYSTEM\".CATALOG WHERE " + TABLE_SCHEM + " = ? AND " + TABLE_NAME
+ " = ? " + " AND " + COLUMN_FAMILY + " = ? AND " + COLUMN_QUALIFIER_COUNTER + " IS NOT NULL";
try (Connection conn = DriverManager.getConnection(getUrl())) {
PreparedStatement stmt = conn.prepareStatement(query);
@@ -2515,7 +2514,7 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
}
private void assertSequenceNumber(String schemaName, String tableName, long expectedSequenceNumber) throws Exception {
- String query = "SELECT " + TABLE_SEQ_NUM + " FROM SYSTEM.CATALOG WHERE " + TABLE_SCHEM + " = ? AND " + TABLE_NAME
+ String query = "SELECT " + TABLE_SEQ_NUM + " FROM \"SYSTEM\".CATALOG WHERE " + TABLE_SCHEM + " = ? AND " + TABLE_NAME
+ " = ? AND " + TABLE_SEQ_NUM + " IS NOT NULL AND " + COLUMN_NAME + " IS NULL AND "
+ COLUMN_FAMILY + " IS NULL ";
try (Connection conn = DriverManager.getConnection(getUrl())) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
index 77af84c..26fba02 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
@@ -1773,7 +1773,7 @@ public class ArrayIT extends BaseClientManagedTimeIT {
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
conn = DriverManager.getConnection(getUrl(), props);
try {
- PreparedStatement stmt = conn.prepareStatement("select ?[2] from system.\"catalog\" limit 1");
+ PreparedStatement stmt = conn.prepareStatement("select ?[2] from \"SYSTEM\".\"catalog\" limit 1");
Array array = conn.createArrayOf("CHAR", new String[] {"a","b","c"});
stmt.setArray(1, array);
ResultSet rs = stmt.executeQuery();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutomaticRebuildIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutomaticRebuildIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutomaticRebuildIT.java
index cbb7745..25cab35 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutomaticRebuildIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AutomaticRebuildIT.java
@@ -17,6 +17,8 @@
*/
package org.apache.phoenix.end2end;
+import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA;
+import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -156,7 +158,7 @@ public class AutomaticRebuildIT extends BaseOwnClusterIT {
rs = conn.createStatement()
.executeQuery(String.format("SELECT " + PhoenixDatabaseMetaData.INDEX_STATE + ","
+ PhoenixDatabaseMetaData.INDEX_DISABLE_TIMESTAMP + " FROM "
- + PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME + " ("
+ +"\""+ SYSTEM_CATALOG_SCHEMA + "\"." + SYSTEM_CATALOG_TABLE + " ("
+ PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " bigint) where "
+ PhoenixDatabaseMetaData.TABLE_SCHEM + "='" + schemaName + "' and "
+ PhoenixDatabaseMetaData.TABLE_NAME + "='" + indxTable + "'"));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
index 828051f..c6d7db9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CoalesceFunctionIT.java
@@ -176,7 +176,7 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
//second param to coalesce is signed int
ResultSet rs = conn.createStatement().executeQuery(
"SELECT "
- + " COALESCE(NTH_VALUE(\"COUNT\", 100) WITHIN GROUP (ORDER BY COUNT DESC), 1) "
+ + " COALESCE(NTH_VALUE(\"COUNT\", 100) WITHIN GROUP (ORDER BY \"COUNT\" DESC), 1) "
+ " FROM " + tableName
+ " GROUP BY ID");
@@ -192,14 +192,14 @@ public class CoalesceFunctionIT extends ParallelStatsDisabledIT {
String ddl = "CREATE TABLE " + tableName + "("
+ " ID BIGINT NOT NULL, "
- + " DATE TIMESTAMP NOT NULL, "
+ + " \"DATE\" TIMESTAMP NOT NULL, "
+ " \"COUNT\" BIGINT "
- + " CONSTRAINT pk PRIMARY KEY(ID, DATE))";
+ + " CONSTRAINT pk PRIMARY KEY(ID, \"DATE\"))";
conn.createStatement().execute(ddl);
- conn.createStatement().execute("UPSERT INTO " + tableName + "(ID, DATE, \"COUNT\") VALUES(1, CURRENT_TIME(), 1)");
- conn.createStatement().execute("UPSERT INTO " + tableName + "(ID, DATE, \"COUNT\") VALUES(1, CURRENT_TIME(), 2)");
- conn.createStatement().execute("UPSERT INTO " + tableName + "(ID, DATE, \"COUNT\") VALUES(2, CURRENT_TIME(), 1)");
+ conn.createStatement().execute("UPSERT INTO " + tableName + "(ID, \"DATE\", \"COUNT\") VALUES(1, CURRENT_TIME(), 1)");
+ conn.createStatement().execute("UPSERT INTO " + tableName + "(ID, \"DATE\", \"COUNT\") VALUES(1, CURRENT_TIME(), 2)");
+ conn.createStatement().execute("UPSERT INTO " + tableName + "(ID, \"DATE\", \"COUNT\") VALUES(2, CURRENT_TIME(), 1)");
conn.commit();
//second param to coalesce is signed int
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
index cec95f4..96ba71d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
@@ -98,7 +98,7 @@ public class CreateTableIT extends BaseClientManagedTimeIT {
" data.stat_minute VARCHAR ,\n" +
" data.state VARCHAR ,\n" +
" data.title VARCHAR ,\n" +
- " data.user VARCHAR ,\n" +
+ " data.\"user\" VARCHAR ,\n" +
" data.inrow VARCHAR ,\n" +
" data.jobid VARCHAR ,\n" +
" data.jobtype VARCHAR ,\n" +
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
index 116c47f..599e601 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
@@ -17,6 +17,8 @@
*/
package org.apache.phoenix.end2end;
+import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA;
+import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -163,7 +165,7 @@ public class IndexToolForPartialBuildIT extends BaseOwnClusterIT {
rs = conn.createStatement()
.executeQuery(String.format("SELECT " + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + ","
+ PhoenixDatabaseMetaData.INDEX_DISABLE_TIMESTAMP + " FROM "
- + PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME + " ("
+ +"\""+ SYSTEM_CATALOG_SCHEMA + "\"." + SYSTEM_CATALOG_TABLE + " ("
+ PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " bigint) where "
+ PhoenixDatabaseMetaData.TABLE_SCHEM + "='" + schemaName + "' and "
+ PhoenixDatabaseMetaData.TABLE_NAME + "='" + indxTable + "'"));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java
index 7ea3477..c057f49 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceBulkAllocationIT.java
@@ -61,9 +61,9 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
private static final long BATCH_SIZE = 3;
private static final String SELECT_NEXT_VALUE_SQL =
- "SELECT NEXT VALUE FOR %s FROM SYSTEM.\"SEQUENCE\" LIMIT 1";
+ "SELECT NEXT VALUE FOR %s FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1";
private static final String SELECT_CURRENT_VALUE_SQL =
- "SELECT CURRENT VALUE FOR %s FROM SYSTEM.\"SEQUENCE\" LIMIT 1";
+ "SELECT CURRENT VALUE FOR %s FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1";
private static final String CREATE_SEQUENCE_NO_MIN_MAX_TEMPLATE =
"CREATE SEQUENCE bulkalloc.alpha START WITH %s INCREMENT BY %s CACHE %s";
private static final String CREATE_SEQUENCE_WITH_MIN_MAX_TEMPLATE =
@@ -107,7 +107,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
nextConnection();
try {
conn.createStatement().executeQuery(
- "SELECT NEXT NULL VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\" LIMIT 1");
+ "SELECT NEXT NULL VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1");
fail("null is not allowed to be used for <n> in NEXT <n> VALUES FOR <seq>");
} catch (SQLException e) {
assertEquals(SQLExceptionCode.NUM_SEQ_TO_ALLOCATE_MUST_BE_CONSTANT.getErrorCode(),
@@ -121,7 +121,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
nextConnection();
try {
conn.createStatement().executeQuery(
- "SELECT NEXT '89b' VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\" LIMIT 1");
+ "SELECT NEXT '89b' VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1");
fail("Only integers and longs are allowed to be used for <n> in NEXT <n> VALUES FOR <seq>");
} catch (SQLException e) {
assertEquals(SQLExceptionCode.NUM_SEQ_TO_ALLOCATE_MUST_BE_CONSTANT.getErrorCode(),
@@ -136,7 +136,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
nextConnection();
try {
conn.createStatement().executeQuery(
- "SELECT NEXT '-1' VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\" LIMIT 1");
+ "SELECT NEXT '-1' VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1");
fail("null is not allowed to be used for <n> in NEXT <n> VALUES FOR <seq>");
} catch (SQLException e) {
assertEquals(SQLExceptionCode.NUM_SEQ_TO_ALLOCATE_MUST_BE_CONSTANT.getErrorCode(),
@@ -150,7 +150,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
nextConnection();
try {
conn.createStatement().executeQuery(
- "SELECT NEXT 0 VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\" LIMIT 1");
+ "SELECT NEXT 0 VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1");
fail("Only integers and longs are allowed to be used for <n> in NEXT <n> VALUES FOR <seq>");
} catch (SQLException e) {
assertEquals(SQLExceptionCode.NUM_SEQ_TO_ALLOCATE_MUST_BE_CONSTANT.getErrorCode(),
@@ -415,7 +415,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
try {
conn.createStatement().executeQuery(
"SELECT NEXT " + sequenceProps.numAllocated
- + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\" LIMIT 1");
+ + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1");
fail("Invoking SELECT NEXT VALUES should have thrown Reached Max Value Exception");
} catch (SQLException e) {
assertEquals(SQLExceptionCode.SEQUENCE_VAL_REACHED_MAX_VALUE.getErrorCode(),
@@ -453,7 +453,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
try {
conn.createStatement().executeQuery(
"SELECT NEXT " + sequenceProps.numAllocated
- + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\" LIMIT 1");
+ + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1");
fail("Invoking SELECT NEXT VALUES should have thrown Reached Max Value Exception");
} catch (SQLException e) {
assertEquals(SQLExceptionCode.SEQUENCE_VAL_REACHED_MIN_VALUE.getErrorCode(),
@@ -543,7 +543,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
try {
conn.createStatement().executeQuery(
"SELECT NEXT " + Long.MAX_VALUE
- + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
} catch (SQLException e) {
assertEquals(SQLExceptionCode.SEQUENCE_VAL_REACHED_MAX_VALUE.getErrorCode(),
e.getErrorCode());
@@ -644,7 +644,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
try {
conn.createStatement().executeQuery(
"SELECT NEXT " + sequenceProps.numAllocated
- + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\" LIMIT 1");
+ + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\" LIMIT 1");
fail("Invoking SELECT NEXT VALUES should have failed as operation is not supported for sequences with Cycles.");
} catch (SQLException e) {
assertEquals(SQLExceptionCode.NUM_SEQ_TO_ALLOCATE_NOT_SUPPORTED.getErrorCode(),
@@ -682,7 +682,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
int startValueAfterAllocation = 101;
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT CURRENT VALUE FOR bulkalloc.alpha, NEXT " + props.numAllocated + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT CURRENT VALUE FOR bulkalloc.alpha, NEXT " + props.numAllocated + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertBulkAllocationSucceeded(props, currentValueAfterAllocation, startValueAfterAllocation);
int currentValueFor = rs.getInt(1);
@@ -720,7 +720,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
int startValueAfterAllocation = 101;
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT NEXT 5 VALUES FOR bulkalloc.alpha, NEXT " + props.numAllocated + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT 5 VALUES FOR bulkalloc.alpha, NEXT " + props.numAllocated + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
int firstValue = rs.getInt(1);
int secondValue = rs.getInt(2);
@@ -761,7 +761,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
+ "NEXT " + props.numAllocated + " VALUES FOR bulkalloc.alpha, "
+ "CURRENT VALUE FOR bulkalloc.alpha, "
+ "NEXT 999 VALUES FOR bulkalloc.alpha "
- + "FROM SYSTEM.\"SEQUENCE\"");
+ + "FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertBulkAllocationSucceeded(props, currentValueAfterAllocation, startValueAfterAllocation);
@@ -801,7 +801,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
// Bulk Allocate Sequence Slots for Two Sequences
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT NEXT 100 VALUES FOR bulkalloc.alpha, NEXT 1000 VALUES FOR bulkalloc.beta FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT 100 VALUES FOR bulkalloc.alpha, NEXT 1000 VALUES FOR bulkalloc.beta FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertEquals(30, rs.getInt(1));
assertEquals(100, rs.getInt(2));
@@ -919,7 +919,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
public Long call() throws Exception {
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT NEXT " + numSlotToAllocate + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT " + numSlotToAllocate + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
latch1.countDown(); // Allows NEXT VALUE FOR thread to proceed
latch2.await(); // Waits until NEXT VALUE FOR thread reads and increments currentValue
rs.next();
@@ -985,7 +985,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
public Long call() throws Exception {
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT NEXT " + numSlotToAllocate1 + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT " + numSlotToAllocate1 + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
rs.next();
latch1.countDown(); // Allows other thread to proceed
latch2.await();
@@ -1001,7 +1001,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
latch1.await(); // Wait for other thread to execut of NEXT <n> VALUES FOR expression
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT NEXT " + numSlotToAllocate2 + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT " + numSlotToAllocate2 + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
rs.next();
long retVal = rs.getLong(1);
latch2.countDown(); // Allow thread to completed
@@ -1054,7 +1054,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
public Long call() throws Exception {
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT NEXT " + numSlotToAllocate1 + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT " + numSlotToAllocate1 + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
latch1.countDown(); // Allows other thread to proceed
latch2.await();
rs.next();
@@ -1070,7 +1070,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
latch1.await(); // Wait for other thread to execut of NEXT <n> VALUES FOR expression
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT NEXT " + numSlotToAllocate2 + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT " + numSlotToAllocate2 + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
rs.next();
long retVal = rs.getLong(1);
latch2.countDown(); // Allow thread to completed
@@ -1124,14 +1124,14 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
throws SQLException {
ResultSet rs =
conn.createStatement().executeQuery(
- "SELECT NEXT " + numSlotToAllocate + " VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT " + numSlotToAllocate + " VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertEquals(expectedValue, rs.getInt(1));
}
private void reserveSlotsInBulkUsingBindsAndAssertValue(int expectedValue, long numSlotToAllocate)
throws SQLException {
- PreparedStatement ps = conn.prepareStatement("SELECT NEXT ? VALUES FOR bulkalloc.alpha FROM SYSTEM.\"SEQUENCE\"");
+ PreparedStatement ps = conn.prepareStatement("SELECT NEXT ? VALUES FOR bulkalloc.alpha FROM \"SYSTEM\".\"SEQUENCE\"");
ps.setLong(1, numSlotToAllocate);
ResultSet rs = ps.executeQuery();
assertTrue(rs.next());
@@ -1195,7 +1195,7 @@ public class SequenceBulkAllocationIT extends BaseClientManagedTimeIT {
ResultSet rs =
conn.createStatement()
.executeQuery(
- "SELECT start_with, current_value, increment_by, cache_size, min_value, max_value, cycle_flag, sequence_schema, sequence_name FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT start_with, current_value, increment_by, cache_size, min_value, max_value, cycle_flag, sequence_schema, sequence_name FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertEquals(props.startsWith, rs.getLong("start_with"));
assertEquals(props.incrementBy, rs.getLong("increment_by"));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
index 3ed4fd7..eec567e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java
@@ -54,8 +54,8 @@ import com.google.common.collect.Lists;
public class SequenceIT extends BaseClientManagedTimeIT {
- private static final String NEXT_VAL_SQL = "SELECT NEXT VALUE FOR foo.bar FROM SYSTEM.\"SEQUENCE\"";
- private static final String SELECT_NEXT_VALUE_SQL = "SELECT NEXT VALUE FOR %s FROM SYSTEM.\"SEQUENCE\"";
+ private static final String NEXT_VAL_SQL = "SELECT NEXT VALUE FOR foo.bar FROM \"SYSTEM\".\"SEQUENCE\"";
+ private static final String SELECT_NEXT_VALUE_SQL = "SELECT NEXT VALUE FOR %s FROM \"SYSTEM\".\"SEQUENCE\"";
private static final long BATCH_SIZE = 3;
private Connection conn;
@@ -80,7 +80,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
@Test
public void testSystemTable() throws Exception {
nextConnection();
- String query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM SYSTEM.\"SEQUENCE\"";
+ String query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM \"SYSTEM\".\"SEQUENCE\"";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertFalse(rs.next());
}
@@ -102,7 +102,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
@Test
public void testSequenceNotFound() throws Exception {
nextConnection();
- String query = "SELECT NEXT value FOR qwert.asdf FROM SYSTEM.\"SEQUENCE\"";
+ String query = "SELECT NEXT value FOR qwert.asdf FROM \"SYSTEM\".\"SEQUENCE\"";
try {
conn.prepareStatement(query).executeQuery();
fail("Sequence not found");
@@ -136,7 +136,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
conn.createStatement().execute("USE " + sequenceSchemaName);
conn.createStatement().execute("CREATE SEQUENCE " + sequenceName + " START WITH 2 INCREMENT BY 4");
nextConnection(props);
- String query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM SYSTEM.\"SEQUENCE\" WHERE sequence_name='"
+ String query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM \"SYSTEM\".\"SEQUENCE\" WHERE sequence_name='"
+ sequenceName + "'";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
@@ -159,7 +159,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
nextConnection();
conn.createStatement().execute("CREATE SEQUENCE alpha.omega START WITH 2 INCREMENT BY 4");
nextConnection();
- String query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM SYSTEM.\"SEQUENCE\" WHERE sequence_name='OMEGA'";
+ String query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM \"SYSTEM\".\"SEQUENCE\" WHERE sequence_name='OMEGA'";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals("ALPHA", rs.getString("sequence_schema"));
@@ -176,7 +176,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
conn.createStatement().execute("CREATE SEQUENCE used.nowhere START WITH 2 INCREMENT BY 4");
nextConnection();
try {
- rs = conn.createStatement().executeQuery("SELECT CURRENT VALUE FOR used.nowhere FROM SYSTEM.\"SEQUENCE\"");
+ rs = conn.createStatement().executeQuery("SELECT CURRENT VALUE FOR used.nowhere FROM \"SYSTEM\".\"SEQUENCE\"");
rs.next();
fail();
} catch (SQLException e) {
@@ -184,10 +184,10 @@ public class SequenceIT extends BaseClientManagedTimeIT {
assertTrue(e.getNextException()==null);
}
- rs = conn.createStatement().executeQuery("SELECT NEXT VALUE FOR used.nowhere FROM SYSTEM.\"SEQUENCE\"");
+ rs = conn.createStatement().executeQuery("SELECT NEXT VALUE FOR used.nowhere FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertEquals(2, rs.getInt(1));
- rs = conn.createStatement().executeQuery("SELECT CURRENT VALUE FOR used.nowhere FROM SYSTEM.\"SEQUENCE\"");
+ rs = conn.createStatement().executeQuery("SELECT CURRENT VALUE FOR used.nowhere FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertEquals(2, rs.getInt(1));
}
@@ -197,7 +197,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
nextConnection();
conn.createStatement().execute("CREATE SEQUENCE alpha.omega START WITH 2 INCREMENT BY 4");
nextConnection();
- String query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM SYSTEM.\"SEQUENCE\" WHERE sequence_name='OMEGA'";
+ String query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM \"SYSTEM\".\"SEQUENCE\" WHERE sequence_name='OMEGA'";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals("ALPHA", rs.getString("sequence_schema"));
@@ -208,7 +208,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
conn.createStatement().execute("DROP SEQUENCE alpha.omega");
nextConnection();
- query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM SYSTEM.\"SEQUENCE\" WHERE sequence_name='OMEGA'";
+ query = "SELECT sequence_schema, sequence_name, current_value, increment_by FROM \"SYSTEM\".\"SEQUENCE\" WHERE sequence_name='OMEGA'";
rs = conn.prepareStatement(query).executeQuery();
assertFalse(rs.next());
@@ -255,7 +255,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
ResultSet rs =
conn.createStatement()
.executeQuery(
- "SELECT start_with, current_value, increment_by, cache_size, min_value, max_value, cycle_flag, sequence_schema, sequence_name FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT start_with, current_value, increment_by, cache_size, min_value, max_value, cycle_flag, sequence_schema, sequence_name FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertEquals(2, rs.getLong("start_with"));
assertEquals(2, rs.getInt("current_value"));
@@ -270,7 +270,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
rs =
conn.createStatement()
.executeQuery(
- "SELECT NEXT VALUE FOR alpha.gamma, CURRENT VALUE FOR alpha.gamma FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT NEXT VALUE FOR alpha.gamma, CURRENT VALUE FOR alpha.gamma FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertEquals(2, rs.getLong(1));
assertEquals(2, rs.getLong(2));
@@ -278,7 +278,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
rs =
conn.createStatement()
.executeQuery(
- "SELECT CURRENT VALUE FOR alpha.gamma, NEXT VALUE FOR alpha.gamma FROM SYSTEM.\"SEQUENCE\"");
+ "SELECT CURRENT VALUE FOR alpha.gamma, NEXT VALUE FOR alpha.gamma FROM \"SYSTEM\".\"SEQUENCE\"");
assertTrue(rs.next());
assertEquals(5, rs.getLong(1));
assertEquals(5, rs.getLong(2));
@@ -290,7 +290,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
nextConnection();
conn.createStatement().execute("CREATE SEQUENCE alpha.zeta START WITH 4 INCREMENT BY 7");
nextConnection();
- String query = "SELECT NEXT VALUE FOR alpha.zeta, NEXT VALUE FOR alpha.zeta FROM SYSTEM.\"SEQUENCE\"";
+ String query = "SELECT NEXT VALUE FOR alpha.zeta, NEXT VALUE FOR alpha.zeta FROM \"SYSTEM\".\"SEQUENCE\"";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals(4, rs.getInt(1));
@@ -305,7 +305,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
conn.createStatement().execute("CREATE SEQUENCE alpha.zeta START WITH 4 INCREMENT BY 7");
conn.createStatement().execute("CREATE SEQUENCE alpha.kappa START WITH 9 INCREMENT BY 2");
nextConnection();
- String query = "SELECT NEXT VALUE FOR alpha.zeta, NEXT VALUE FOR alpha.kappa FROM SYSTEM.\"SEQUENCE\"";
+ String query = "SELECT NEXT VALUE FOR alpha.zeta, NEXT VALUE FOR alpha.kappa FROM \"SYSTEM\".\"SEQUENCE\"";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals(4, rs.getInt(1));
@@ -337,7 +337,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
"CREATE SEQUENCE alpha.kappa START WITH 9 INCREMENT BY -2 MINVALUE 5");
nextConnection();
String query =
- "SELECT NEXT VALUE FOR alpha.zeta, NEXT VALUE FOR alpha.kappa FROM SYSTEM.\"SEQUENCE\"";
+ "SELECT NEXT VALUE FOR alpha.zeta, NEXT VALUE FOR alpha.kappa FROM \"SYSTEM\".\"SEQUENCE\"";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals(4, rs.getInt(1));
@@ -377,7 +377,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
"CREATE SEQUENCE alpha.kappa START WITH 9 INCREMENT BY -2 MINVALUE 5 MAXVALUE 9 CYCLE");
nextConnection();
String query =
- "SELECT NEXT VALUE FOR alpha.zeta, NEXT VALUE FOR alpha.kappa FROM SYSTEM.\"SEQUENCE\"";
+ "SELECT NEXT VALUE FOR alpha.zeta, NEXT VALUE FOR alpha.kappa FROM \"SYSTEM\".\"SEQUENCE\"";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals(4, rs.getInt(1));
@@ -702,7 +702,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
"CLIENT RESERVE VALUES FROM 1 SEQUENCE", QueryUtil.getExplainPlan(rs));
nextConnection();
- rs = conn.createStatement().executeQuery("SELECT sequence_name, current_value FROM SYSTEM.\"SEQUENCE\" WHERE sequence_name='BAR'");
+ rs = conn.createStatement().executeQuery("SELECT sequence_name, current_value FROM \"SYSTEM\".\"SEQUENCE\" WHERE sequence_name='BAR'");
assertTrue(rs.next());
assertEquals("BAR", rs.getString(1));
assertEquals(1, rs.getInt(2));
@@ -724,7 +724,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
nextConnection();
conn.createStatement().execute("CREATE SEQUENCE foo.bar START WITH 3 INCREMENT BY 2");
nextConnection();
- String query = "SELECT LPAD(ENCODE(NEXT VALUE FOR foo.bar,'base62'),5,'0') FROM SYSTEM.\"SEQUENCE\"";
+ String query = "SELECT LPAD(ENCODE(NEXT VALUE FOR foo.bar,'base62'),5,'0') FROM \"SYSTEM\".\"SEQUENCE\"";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals("00003", rs.getString(1));
@@ -1356,7 +1356,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
nextConnection();
conn.createStatement().execute("CREATE SEQUENCE alpha.zeta START WITH 3 INCREMENT BY 2 CACHE 5");
nextConnection();
- String query = "SELECT NEXT VALUE FOR alpha.zeta FROM SYSTEM.\"SEQUENCE\"";
+ String query = "SELECT NEXT VALUE FOR alpha.zeta FROM \"SYSTEM\".\"SEQUENCE\"";
ResultSet rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals(3, rs.getInt(1));
@@ -1368,7 +1368,7 @@ public class SequenceIT extends BaseClientManagedTimeIT {
conn.close();
// verify that calling close() does not return sequence values back to the server
- query = "SELECT CURRENT_VALUE FROM SYSTEM.\"SEQUENCE\" WHERE SEQUENCE_SCHEMA='ALPHA' AND SEQUENCE_NAME='ZETA'";
+ query = "SELECT CURRENT_VALUE FROM \"SYSTEM\".\"SEQUENCE\" WHERE SEQUENCE_SCHEMA='ALPHA' AND SEQUENCE_NAME='ZETA'";
rs = conn.prepareStatement(query).executeQuery();
assertTrue(rs.next());
assertEquals(13, rs.getInt(1));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
index a11f808..dc04b53 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpillableGroupByIT.java
@@ -161,7 +161,7 @@ public class SpillableGroupByIT extends BaseOwnClusterIT {
stmt.execute("UPSERT INTO T1 VALUES (3, 'NAME3')");
conn.commit();
stmt.execute("UPDATE STATISTICS T1");
- ResultSet rs = stmt.executeQuery("SELECT * FROM SYSTEM.STATS");
+ ResultSet rs = stmt.executeQuery("SELECT * FROM \"SYSTEM\".STATS");
assertFalse(rs.next());
rs.close();
stmt.close();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 040c92c..65f0089 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -17,6 +17,8 @@
*/
package org.apache.phoenix.end2end;
+import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA;
+import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_STATS_TABLE;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.apache.phoenix.util.TestUtil.getAllSplits;
import static org.junit.Assert.assertEquals;
@@ -260,8 +262,7 @@ public class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
conn.createStatement().execute("upsert into " + fullTableName + " values ('abc',1,3)");
conn.createStatement().execute("upsert into " + fullTableName + " values ('def',2,4)");
conn.commit();
- stmt = conn.prepareStatement("UPDATE STATISTICS " + fullTableName);
- stmt.execute();
+ conn.createStatement().execute("UPDATE STATISTICS " + fullTableName);
rs = conn.createStatement().executeQuery("SELECT k FROM " + fullTableName + " order by k desc");
assertTrue(rs.next());
assertEquals("def", rs.getString(1));
@@ -503,7 +504,7 @@ public class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
keyRanges = getAllSplits(conn, tableName);
assertEquals(nRows/2+1, keyRanges.size());
ResultSet rs = conn.createStatement().executeQuery("SELECT SUM(GUIDE_POSTS_ROW_COUNT) FROM "
- + PhoenixDatabaseMetaData.SYSTEM_STATS_NAME + " WHERE PHYSICAL_NAME='" + physicalTableName + "'");
+ + "\""+ SYSTEM_CATALOG_SCHEMA + "\".\"" + SYSTEM_STATS_TABLE + "\"" + " WHERE PHYSICAL_NAME='" + physicalTableName + "'");
rs.next();
assertEquals(nRows - nDeletedRows, rs.getLong(1));
}
@@ -560,7 +561,7 @@ public class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
rs = conn
.createStatement()
.executeQuery(
- "SELECT COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH),COUNT(*) from SYSTEM.STATS where PHYSICAL_NAME = '"
+ "SELECT COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH),COUNT(*) from \"SYSTEM\".STATS where PHYSICAL_NAME = '"
+ physicalTableName + "' GROUP BY COLUMN_FAMILY ORDER BY COLUMN_FAMILY");
assertTrue(rs.next());
@@ -632,7 +633,7 @@ public class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT {
long c2Bytes = rows * (columnEncoded ? ( mutable ? 37 : 48 ) : 35);
String physicalTableName = SchemaUtil.getPhysicalHBaseTableName(fullTableName, userTableNamespaceMapped, PTableType.TABLE).getString();
rs = conn.createStatement().executeQuery(
- "SELECT COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH) from SYSTEM.STATS where PHYSICAL_NAME = '"
+ "SELECT COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH) from \"SYSTEM\".STATS where PHYSICAL_NAME = '"
+ physicalTableName + "' AND GUIDE_POST_KEY>= cast('" + strings[startIndex]
+ "' as varbinary) AND GUIDE_POST_KEY<cast('" + strings[endIndex]
+ "' as varbinary) and COLUMN_FAMILY='C2' group by COLUMN_FAMILY");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java
index 26ff629..8c2c944 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StoreNullsPropIT.java
@@ -42,7 +42,7 @@ public class StoreNullsPropIT extends ParallelStatsDisabledIT {
"id smallint primary key," +
"name varchar)");
- ResultSet rs = stmt.executeQuery("SELECT store_nulls FROM SYSTEM.CATALOG " +
+ ResultSet rs = stmt.executeQuery("SELECT store_nulls FROM \"SYSTEM\".CATALOG " +
"WHERE table_name = 'WITH_NULLS_DEFAULT' AND store_nulls is not null");
assertTrue(rs.next());
assertTrue(rs.getBoolean(1));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index d36e0fe..0a20d47 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -216,7 +216,7 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT {
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 1)); // Execute at timestamp 1
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(false);
- String upsert = "UPSERT INTO " + PTSDB_NAME + "(date, val, host) " +
+ String upsert = "UPSERT INTO " + PTSDB_NAME + "(\"DATE\", val, host) " +
"SELECT current_date(), x_integer+2, entity_id FROM ATABLE WHERE a_integer >= ?";
PreparedStatement upsertStmt = conn.prepareStatement(upsert);
upsertStmt.setInt(1, 6);
@@ -225,7 +225,7 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT {
conn.commit();
conn.close();
- String query = "SELECT inst,host,date,val FROM " + PTSDB_NAME;
+ String query = "SELECT inst,host,\"DATE\",val FROM " + PTSDB_NAME;
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2));
conn = DriverManager.getConnection(getUrl(), props);
PreparedStatement statement = conn.prepareStatement(query);
@@ -262,8 +262,8 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT {
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 3));
conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(true);
- upsert = "UPSERT INTO " + PTSDB_NAME + "(date, val, inst) " +
- "SELECT date+1, val*10, host FROM " + PTSDB_NAME;
+ upsert = "UPSERT INTO " + PTSDB_NAME + "(\"DATE\", val, inst) " +
+ "SELECT \"DATE\"+1, val*10, host FROM " + PTSDB_NAME;
upsertStmt = conn.prepareStatement(upsert);
rowsInserted = upsertStmt.executeUpdate();
assertEquals(4, rowsInserted);
@@ -271,7 +271,7 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT {
conn.close();
Date then = new Date(now.getTime() + QueryConstants.MILLIS_IN_DAY);
- query = "SELECT host,inst, date,val FROM " + PTSDB_NAME + " where inst is not null";
+ query = "SELECT host,inst, \"DATE\",val FROM " + PTSDB_NAME + " where inst is not null";
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 4)); // Execute at timestamp 2
conn = DriverManager.getConnection(getUrl(), props);
statement = conn.prepareStatement(query);
@@ -392,7 +392,7 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT {
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 1)); // Execute at timestamp 1
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(autoCommit);
- String upsert = "UPSERT INTO " + PTSDB_NAME + "(date, val, host) " +
+ String upsert = "UPSERT INTO " + PTSDB_NAME + "(\"DATE\", val, host) " +
"SELECT current_date(), sum(a_integer), a_string FROM ATABLE GROUP BY a_string";
PreparedStatement upsertStmt = conn.prepareStatement(upsert);
int rowsInserted = upsertStmt.executeUpdate();
@@ -402,7 +402,7 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT {
}
conn.close();
- String query = "SELECT inst,host,date,val FROM " + PTSDB_NAME;
+ String query = "SELECT inst,host,\"DATE\",val FROM " + PTSDB_NAME;
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 2));
conn = DriverManager.getConnection(getUrl(), props);
PreparedStatement statement = conn.prepareStatement(query);
@@ -431,7 +431,7 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT {
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 3));
conn = DriverManager.getConnection(getUrl(), props);
conn.setAutoCommit(true);
- upsert = "UPSERT INTO " + PTSDB_NAME + "(date, val, host, inst) " +
+ upsert = "UPSERT INTO " + PTSDB_NAME + "(\"DATE\", val, host, inst) " +
"SELECT current_date(), max(val), max(host), 'x' FROM " + PTSDB_NAME;
upsertStmt = conn.prepareStatement(upsert);
rowsInserted = upsertStmt.executeUpdate();
@@ -441,7 +441,7 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT {
}
conn.close();
- query = "SELECT inst,host,date,val FROM " + PTSDB_NAME + " WHERE inst='x'";
+ query = "SELECT inst,host,\"DATE\",val FROM " + PTSDB_NAME + " WHERE inst='x'";
props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 4));
conn = DriverManager.getConnection(getUrl(), props);
statement = conn.prepareStatement(query);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index b76d61d..12add12 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -755,8 +755,7 @@ public class IndexIT extends ParallelStatsDisabledIT {
assertFalse(rs.next());
String ddl = "DROP INDEX " + indexName + " ON " + fullTableName;
- stmt = conn.prepareStatement(ddl);
- stmt.execute();
+ conn.createStatement().execute(ddl);
stmt = conn.prepareStatement("UPSERT INTO " + fullTableName + "(k, v1) VALUES(?,?)");
stmt.setString(1, "a");
@@ -1060,7 +1059,7 @@ public class IndexIT extends ParallelStatsDisabledIT {
try (HBaseAdmin admin = driver.getConnectionQueryServices(null, null).getAdmin();
Connection c = DriverManager.getConnection(getUrl())) {
ResultSet rs = c.getMetaData().getTables("",
- PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA,
+ "\""+ PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA + "\"",
null,
new String[] {PTableType.SYSTEM.toString()});
ReadOnlyProps p = c.unwrap(PhoenixConnection.class).getQueryServices().getProps();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/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 fd6703e..e9f0194 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
@@ -548,7 +548,7 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
ResultSet rs = conn.createStatement().executeQuery(
"select table_name, " + PhoenixDatabaseMetaData.ASYNC_CREATED_DATE + " " +
- "from system.catalog (" + PhoenixDatabaseMetaData.ASYNC_CREATED_DATE + " " + PDate.INSTANCE.getSqlTypeName() + ") " +
+ "from \"SYSTEM\".catalog (" + PhoenixDatabaseMetaData.ASYNC_CREATED_DATE + " " + PDate.INSTANCE.getSqlTypeName() + ") " +
"where " + PhoenixDatabaseMetaData.ASYNC_CREATED_DATE + " is not null and table_name like 'ASYNCIND_%' " +
"order by " + PhoenixDatabaseMetaData.ASYNC_CREATED_DATE
);
@@ -589,7 +589,7 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
ResultSet rs = conn.createStatement().executeQuery(
"select table_name, " + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " " +
- "from system.catalog (" + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " " + PLong.INSTANCE.getSqlTypeName() + ") " +
+ "from \"SYSTEM\".catalog (" + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " " + PLong.INSTANCE.getSqlTypeName() + ") " +
"where " + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " !=0 and table_name like 'R_ASYNCIND_%' " +
"order by table_name");
assertTrue(rs.next());
@@ -602,7 +602,7 @@ public class IndexMetadataIT extends ParallelStatsDisabledIT {
conn.createStatement().execute("ALTER INDEX "+indexName+"3 ON " + testTable +" DISABLE");
rs = conn.createStatement().executeQuery(
"select table_name, " + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " " +
- "from system.catalog (" + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " " + PLong.INSTANCE.getSqlTypeName() + ") " +
+ "from \"SYSTEM\".catalog (" + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " " + PLong.INSTANCE.getSqlTypeName() + ") " +
"where " + PhoenixDatabaseMetaData.ASYNC_REBUILD_TIMESTAMP + " !=0 and table_name like 'ASYNCIND_%' " +
"order by table_name" );
assertFalse(rs.next());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
index fb9776e..52af966 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexTestUtil.java
@@ -60,7 +60,7 @@ public class IndexTestUtil {
// index table test.
private static final String SELECT_DATA_INDEX_ROW = "SELECT " + COLUMN_FAMILY
+ " FROM "
- + SYSTEM_CATALOG_SCHEMA + ".\"" + SYSTEM_CATALOG_TABLE
+ + "\""+SYSTEM_CATALOG_SCHEMA +"\""+ ".\"" + SYSTEM_CATALOG_TABLE
+ "\" WHERE "
+ TENANT_ID + " IS NULL AND " + TABLE_SCHEM + "=? AND " + TABLE_NAME + "=? AND " + COLUMN_NAME + " IS NULL AND " + COLUMN_FAMILY + "=?";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index f5135d9..a7d0028 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -562,7 +562,7 @@ public class LocalIndexIT extends BaseLocalIndexIT {
String tableName = generateUniqueName();
String indexName = generateUniqueName();
statement.execute("create table " + tableName + " (id integer not null,fn varchar,"
- + "ln varchar constraint pk primary key(id)) DEFAULT_COLUMN_FAMILY='F'");
+ + "\"ln\" varchar constraint pk primary key(id)) DEFAULT_COLUMN_FAMILY='F'");
statement.execute("upsert into " + tableName + " values(1,'fn','ln')");
statement
.execute("create local index " + indexName + " on " + tableName + " (fn)");
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
index ceb8714..ff9036f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
@@ -84,7 +84,7 @@ public class UpdateCacheIT extends ParallelStatsDisabledIT {
@Test
public void testUpdateCacheForNonTxnSystemTable() throws Exception {
- String fullTableName = QueryConstants.SYSTEM_SCHEMA_NAME + QueryConstants.NAME_SEPARATOR + generateUniqueName();
+ String fullTableName = "\""+ QueryConstants.SYSTEM_SCHEMA_NAME + "\""+ QueryConstants.NAME_SEPARATOR + generateUniqueName();
setupSystemTable(fullTableName);
helpTestUpdateCache(fullTableName, null, new int[] {0, 0});
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java
index badf39b..a5c1cf4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/ParameterizedTransactionIT.java
@@ -327,8 +327,8 @@ public class ParameterizedTransactionIT extends ParallelStatsDisabledIT {
Connection conn = DriverManager.getConnection(getUrl());
// Put table in SYSTEM schema to prevent attempts to update the cache after we disable SYSTEM.CATALOG
- conn.createStatement().execute("CREATE TABLE SYSTEM." + nonTxTableName + "(k INTEGER PRIMARY KEY, v VARCHAR)" + tableDDLOptions);
- conn.createStatement().execute("UPSERT INTO SYSTEM." + nonTxTableName + " VALUES (1)");
+ conn.createStatement().execute("CREATE TABLE \"SYSTEM\"." + nonTxTableName + "(k INTEGER PRIMARY KEY, v VARCHAR)" + tableDDLOptions);
+ conn.createStatement().execute("UPSERT INTO \"SYSTEM\"." + nonTxTableName + " VALUES (1)");
conn.commit();
// Reset empty column value to an empty value like it is pre-transactions
HTableInterface htable = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes("SYSTEM." + nonTxTableName));
@@ -342,7 +342,7 @@ public class ParameterizedTransactionIT extends ParallelStatsDisabledIT {
// This will succeed initially in updating the HBase metadata, but then will fail when
// the SYSTEM.CATALOG table is attempted to be updated, exercising the code to restore
// the coprocessors back to the non transactional ones.
- conn.createStatement().execute("ALTER TABLE SYSTEM." + nonTxTableName + " SET TRANSACTIONAL=true");
+ conn.createStatement().execute("ALTER TABLE \"SYSTEM\"." + nonTxTableName + " SET TRANSACTIONAL=true");
fail();
} catch (SQLException e) {
assertTrue(e.getMessage().contains(PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME + " is disabled"));
@@ -351,7 +351,7 @@ public class ParameterizedTransactionIT extends ParallelStatsDisabledIT {
admin.close();
}
- ResultSet rs = conn.createStatement().executeQuery("SELECT k FROM SYSTEM." + nonTxTableName + " WHERE v IS NULL");
+ ResultSet rs = conn.createStatement().executeQuery("SELECT k FROM \"SYSTEM\"." + nonTxTableName + " WHERE v IS NULL");
assertTrue(rs.next());
assertEquals(1,rs.getInt(1));
assertFalse(rs.next());
http://git-wip-us.apache.org/repos/asf/phoenix/blob/92e728e0/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
index 02e4ec2..5bd3ef1 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
@@ -145,7 +145,7 @@ public class UpgradeUtil {
public static String SELECT_BASE_COLUMN_COUNT_FROM_HEADER_ROW = "SELECT "
+ "BASE_COLUMN_COUNT "
- + "FROM SYSTEM.CATALOG "
+ + "FROM \"SYSTEM\".CATALOG "
+ "WHERE "
+ "COLUMN_NAME IS NULL "
+ "AND "