This is an automated email from the ASF dual-hosted git repository.
chinmayskulkarni pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 0b9e734 PHOENIX-6075: DDLs issued via a tenant-specific connection do
not write SYSTEM.MUTEX cells
0b9e734 is described below
commit 0b9e7349517724d81f9a4ac005054cf36e9f75c8
Author: Chinmay Kulkarni <chinmayskulka...@gmail.com>
AuthorDate: Thu Sep 17 01:20:09 2020 -0700
PHOENIX-6075: DDLs issued via a tenant-specific connection do not write
SYSTEM.MUTEX cells
---
.../it/java/org/apache/phoenix/end2end/ViewIT.java | 1261 +++++++++++---------
.../query/DelegateConnectionQueryServices.java | 4 +-
2 files changed, 712 insertions(+), 553 deletions(-)
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 e896513..d4305ea 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
@@ -39,7 +39,6 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -96,8 +95,10 @@ public class ViewIT extends SplitSystemCatalogIT {
protected String transactionProvider;
protected boolean columnEncoded;
- private static final String FAILED_VIEWNAME =
SchemaUtil.getTableName(SCHEMA2, "FAILED_VIEW");
- private static final String SLOW_VIEWNAME_PREFIX =
SchemaUtil.getTableName(SCHEMA2, "SLOW_VIEW");
+ private static final String FAILED_VIEWNAME =
+ SchemaUtil.getTableName(SCHEMA2, "FAILED_VIEW");
+ private static final String SLOW_VIEWNAME_PREFIX =
+ SchemaUtil.getTableName(SCHEMA2, "SLOW_VIEW");
private static volatile CountDownLatch latch1 = null;
private static volatile CountDownLatch latch2 = null;
@@ -109,7 +110,7 @@ public class ViewIT extends SplitSystemCatalogIT {
this.transactionProvider = transactionProvider;
this.columnEncoded = columnEncoded;
if (transactionProvider != null) {
- optionBuilder.append(" TRANSACTION_PROVIDER='" +
transactionProvider + "'");
+ optionBuilder.append("
TRANSACTION_PROVIDER='").append(transactionProvider).append("'");
}
if (!columnEncoded) {
if (optionBuilder.length()!=0)
@@ -119,7 +120,8 @@ public class ViewIT extends SplitSystemCatalogIT {
this.tableDDLOptions = optionBuilder.toString();
}
- @Parameters(name="ViewIT_transactionProvider={0}, columnEncoded={1}") //
name is used by failsafe as file name in reports
+ // name is used by failsafe as file name in reports
+ @Parameters(name="ViewIT_transactionProvider={0}, columnEncoded={1}")
public static synchronized Collection<Object[]> data() {
return TestUtil.filterTxParamData(Arrays.asList(new Object[][] {
{ "TEPHRA", false }, { "TEPHRA", true },
@@ -130,14 +132,14 @@ public class ViewIT extends SplitSystemCatalogIT {
@BeforeClass
public static synchronized void doSetup() throws Exception {
NUM_SLAVES_BASE = 6;
- Map<String, String> props = Collections.emptyMap();
boolean splitSystemCatalog = (driver == null);
Map<String, String> serverProps = Maps.newHashMapWithExpectedSize(1);
serverProps.put(QueryServices.PHOENIX_ACLS_ENABLED, "true");
serverProps.put(PhoenixMetaDataCoprocessorHost.PHOENIX_META_DATA_COPROCESSOR_CONF_KEY,
TestMetaDataRegionObserver.class.getName());
serverProps.put("hbase.coprocessor.abortonerror", "false");
- setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()),
new ReadOnlyProps(props.entrySet().iterator()));
+ setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()),
+ ReadOnlyProps.EMPTY_PROPS);
// Split SYSTEM.CATALOG once after the mini-cluster is started
if (splitSystemCatalog) {
// splitSystemCatalog is incompatible with the balancer chore
@@ -157,21 +159,24 @@ public class ViewIT extends SplitSystemCatalogIT {
public static class TestMetaDataRegionObserver extends
BaseMetaDataEndpointObserver {
@Override
- public void
preAlterTable(ObserverContext<PhoenixMetaDataControllerEnvironment> ctx, String
tenantId,
- String tableName, TableName physicalTableName, TableName
parentPhysicalTableName, PTableType type) throws IOException{
+ public void
preAlterTable(ObserverContext<PhoenixMetaDataControllerEnvironment> ctx,
+ String tenantId, String tableName, TableName physicalTableName,
+ TableName parentPhysicalTableName, PTableType type) throws
IOException {
processTable(tableName);
}
@Override
- public void
preCreateTable(ObserverContext<PhoenixMetaDataControllerEnvironment> ctx,
String tenantId,
- String tableName, TableName physicalTableName, TableName
parentPhysicalTableName, PTableType tableType,
+ public void
preCreateTable(ObserverContext<PhoenixMetaDataControllerEnvironment> ctx,
+ String tenantId, String tableName, TableName physicalTableName,
+ TableName parentPhysicalTableName, PTableType tableType,
Set<byte[]> familySet, Set<TableName> indexes) throws
IOException {
processTable(tableName);
}
@Override
- public void
preDropTable(ObserverContext<PhoenixMetaDataControllerEnvironment> ctx, String
tenantId,
- String tableName, TableName physicalTableName, TableName
parentPhysicalTableName, PTableType tableType,
+ public void
preDropTable(ObserverContext<PhoenixMetaDataControllerEnvironment> ctx,
+ String tenantId, String tableName, TableName physicalTableName,
+ TableName parentPhysicalTableName, PTableType tableType,
List<PTable> indexes) throws IOException {
processTable(tableName);
}
@@ -205,7 +210,7 @@ public class ViewIT extends SplitSystemCatalogIT {
if (!result) {
throw new RuntimeException("Second task took took
long to complete");
}
- } catch (InterruptedException e) {
+ } catch (InterruptedException ignored) {
}
}
}
@@ -218,135 +223,153 @@ public class ViewIT extends SplitSystemCatalogIT {
String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
String fullViewName1 = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
String fullViewName2 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
- String ddl =
- "CREATE VIEW " + fullViewName2 + " AS SELECT * FROM " +
fullViewName1
- + " WHERE k3 > 1 and k3 < 50";
+ String ddl = "CREATE VIEW " + fullViewName2 + " AS SELECT * FROM " +
fullViewName1
+ + " WHERE k3 > 1 and k3 < 50";
testUpdatableView(fullTableName, fullViewName1, fullViewName2, ddl,
null, tableDDLOptions);
- Connection conn = DriverManager.getConnection(getUrl());
- ResultSet rs = conn.createStatement().executeQuery("SELECT k1, k2, k3
FROM " + fullViewName2);
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(109, rs.getInt(2));
- assertEquals(2, rs.getInt(3));
- assertFalse(rs.next());
- try {
- conn.createStatement().execute("UPSERT INTO " + fullViewName2 + "
VALUES(1)");
- fail();
- } catch (ReadOnlyTableException e) {
-
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ ResultSet rs = stmt.executeQuery("SELECT k1, k2, k3 FROM " +
fullViewName2);
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(109, rs.getInt(2));
+ assertEquals(2, rs.getInt(3));
+ assertFalse(rs.next());
+ try {
+ stmt.execute("UPSERT INTO " + fullViewName2 + " VALUES(1)");
+ fail();
+ } catch (ReadOnlyTableException ignored) {
+ }
+
+ stmt.execute("UPSERT INTO " + fullTableName + "(k1, k2,k3)
VALUES(1, 122, 5)");
+ conn.commit();
+ rs = stmt.executeQuery("SELECT k1, k2, k3 FROM " + fullViewName2 +
" WHERE k2 >= 120");
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(122, rs.getInt(2));
+ assertEquals(5, rs.getInt(3));
+ assertFalse(rs.next());
}
-
- conn.createStatement().execute("UPSERT INTO " + fullTableName + "(k1,
k2,k3) VALUES(1, 122, 5)");
- conn.commit();
- rs = conn.createStatement().executeQuery("SELECT k1, k2, k3 FROM " +
fullViewName2 + " WHERE k2 >= 120");
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(122, rs.getInt(2));
- assertEquals(5, rs.getInt(3));
- assertFalse(rs.next());
}
@Test
public void testReadOnlyViewWithCaseSensitiveTableNames() throws Exception
{
- Connection earlierCon = DriverManager.getConnection(getUrl());
- Connection conn = DriverManager.getConnection(getUrl());
- String schemaName = TestUtil.DEFAULT_SCHEMA_NAME + "_" +
generateUniqueName();
- String caseSensitiveTableName = "\"t_" + generateUniqueName() + "\"" ;
- String fullTableName = SchemaUtil.getTableName(schemaName,
caseSensitiveTableName);
- String caseSensitiveViewName = "\"v_" + generateUniqueName() + "\"" ;
-
- String ddl = "CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL
PRIMARY KEY, v1 DATE)" + tableDDLOptions;
- conn.createStatement().execute(ddl);
- ddl = "CREATE VIEW " + caseSensitiveViewName + " (v2 VARCHAR) AS
SELECT * FROM " + fullTableName + " WHERE k > 5";
- conn.createStatement().execute(ddl);
-
- try {
- conn.createStatement().execute("UPSERT INTO " +
caseSensitiveViewName + " VALUES(1)");
- fail();
- } catch (ReadOnlyTableException e) {
-
- }
- for (int i = 0; i < 10; i++) {
- conn.createStatement().execute("UPSERT INTO " + fullTableName + "
VALUES(" + i + ")");
- }
- conn.commit();
-
- int count = 0;
- ResultSet rs = conn.createStatement().executeQuery("SELECT k FROM " +
caseSensitiveViewName);
- while (rs.next()) {
- count++;
- assertEquals(count + 5, rs.getInt(1));
- }
- assertEquals(4, count);
- count = 0;
- rs = earlierCon.createStatement().executeQuery("SELECT k FROM " +
caseSensitiveViewName);
- while (rs.next()) {
- count++;
- assertEquals(count + 5, rs.getInt(1));
+ try (Connection earlierCon = DriverManager.getConnection(getUrl());
+ Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ String schemaName = TestUtil.DEFAULT_SCHEMA_NAME + "_" +
generateUniqueName();
+ String caseSensitiveTableName = "\"t_" + generateUniqueName() +
"\"";
+ String fullTableName = SchemaUtil.getTableName(schemaName,
caseSensitiveTableName);
+ String caseSensitiveViewName = "\"v_" + generateUniqueName() +
"\"";
+
+ String ddl = "CREATE TABLE " + fullTableName
+ + " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE)" +
tableDDLOptions;
+ stmt.execute(ddl);
+ ddl = "CREATE VIEW " + caseSensitiveViewName + " (v2 VARCHAR) AS
SELECT * FROM "
+ + fullTableName + " WHERE k > 5";
+ stmt.execute(ddl);
+
+ try {
+ stmt.execute("UPSERT INTO " + caseSensitiveViewName + "
VALUES(1)");
+ fail();
+ } catch (ReadOnlyTableException ignored) {
+ }
+
+ for (int i = 0; i < 10; i++) {
+ stmt.execute("UPSERT INTO " + fullTableName + " VALUES(" + i +
")");
+ }
+ conn.commit();
+
+ int count = 0;
+ ResultSet rs = conn.createStatement().executeQuery("SELECT k FROM "
+ + caseSensitiveViewName);
+ while (rs.next()) {
+ count++;
+ assertEquals(count + 5, rs.getInt(1));
+ }
+ assertEquals(4, count);
+ count = 0;
+ try (Statement earlierStmt = earlierCon.createStatement()) {
+ rs = earlierStmt.executeQuery("SELECT k FROM " +
caseSensitiveViewName);
+ while (rs.next()) {
+ count++;
+ assertEquals(count + 5, rs.getInt(1));
+ }
+ assertEquals(4, count);
+ }
}
- assertEquals(4, count);
}
@Test
public void testReadOnlyViewWithCaseSensitiveColumnNames() throws
Exception {
- Connection conn = DriverManager.getConnection(getUrl());
- String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
- String viewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
- String ddl = "CREATE TABLE " + fullTableName + " (\"k\" INTEGER NOT
NULL PRIMARY KEY, \"v1\" INTEGER, \"a\".v2 VARCHAR)" + tableDDLOptions;
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
+ String viewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
+ String ddl = "CREATE TABLE " + fullTableName
+ + " (\"k\" INTEGER NOT NULL PRIMARY KEY, \"v1\" INTEGER,
\"a\".v2 VARCHAR)"
+ + tableDDLOptions;
- conn.createStatement().execute(ddl);
- ddl = "CREATE VIEW " + viewName + " (v VARCHAR) AS SELECT * FROM " +
fullTableName + " WHERE \"k\" > 5 and \"v1\" > 1";
- conn.createStatement().execute(ddl);
-
- try {
- conn.createStatement().execute("UPSERT INTO " + viewName + "
VALUES(1)");
- fail();
- } catch (ReadOnlyTableException e) {
-
- }
- for (int i = 0; i < 10; i++) {
- conn.createStatement().execute("UPSERT INTO " + fullTableName + "
VALUES(" + i + ", " + (i+10) + ",'A')");
- }
- conn.commit();
-
- int count = 0;
- ResultSet rs = conn.createStatement().executeQuery("SELECT \"k\",
\"v1\",\"a\".v2 FROM " + viewName);
- while (rs.next()) {
- count++;
- assertEquals(count + 5, rs.getInt(1));
+ stmt.execute(ddl);
+ ddl = "CREATE VIEW " + viewName + " (v VARCHAR) AS SELECT * FROM "
+ fullTableName
+ + " WHERE \"k\" > 5 and \"v1\" > 1";
+ stmt.execute(ddl);
+
+ try {
+ stmt.execute("UPSERT INTO " + viewName + " VALUES(1)");
+ fail();
+ } catch (ReadOnlyTableException ignored) {
+
+ }
+ for (int i = 0; i < 10; i++) {
+ stmt.execute("UPSERT INTO " + fullTableName + " VALUES(" + i +
", "
+ + (i + 10) + ",'A')");
+ }
+ conn.commit();
+
+ int count = 0;
+ ResultSet rs = stmt.executeQuery("SELECT \"k\", \"v1\",\"a\".v2
FROM " + viewName);
+ while (rs.next()) {
+ count++;
+ assertEquals(count + 5, rs.getInt(1));
+ }
+ assertEquals(4, count);
}
- assertEquals(4, count);
}
@Test
public void testViewWithCurrentDate() throws Exception {
- Connection conn = DriverManager.getConnection(getUrl());
- String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
- String viewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
+ String viewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
- String ddl = "CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL
PRIMARY KEY, v1 INTEGER, v2 DATE)" + tableDDLOptions;
- conn.createStatement().execute(ddl);
- ddl = "CREATE VIEW " + viewName + " (v VARCHAR) AS SELECT * FROM " +
fullTableName + " WHERE v2 > CURRENT_DATE()-5 AND v2 > DATE '2010-01-01'";
- conn.createStatement().execute(ddl);
-
- try {
- conn.createStatement().execute("UPSERT INTO " + viewName + "
VALUES(1)");
- fail();
- } catch (ReadOnlyTableException e) {
-
- }
- for (int i = 0; i < 10; i++) {
- conn.createStatement().execute("UPSERT INTO " + fullTableName + "
VALUES(" + i + ", " + (i+10) + ",CURRENT_DATE()-" + i + ")");
- }
- conn.commit();
-
- int count = 0;
- ResultSet rs = conn.createStatement().executeQuery("SELECT k FROM " +
viewName);
- while (rs.next()) {
- assertEquals(count, rs.getInt(1));
- count++;
+ String ddl = "CREATE TABLE " + fullTableName + " (k INTEGER NOT
NULL PRIMARY KEY, "
+ + "v1 INTEGER, v2 DATE)" + tableDDLOptions;
+ stmt.execute(ddl);
+ ddl = "CREATE VIEW " + viewName + " (v VARCHAR) AS SELECT * FROM "
+ fullTableName
+ + " WHERE v2 > CURRENT_DATE()-5 AND v2 > DATE
'2010-01-01'";
+ stmt.execute(ddl);
+
+ try {
+ stmt.execute("UPSERT INTO " + viewName + " VALUES(1)");
+ fail();
+ } catch (ReadOnlyTableException ignored) {
+
+ }
+ for (int i = 0; i < 10; i++) {
+ stmt.execute("UPSERT INTO " + fullTableName + " VALUES(" + i +
", " + (i + 10)
+ + ",CURRENT_DATE()-" + i + ")");
+ }
+ conn.commit();
+
+ int count = 0;
+ ResultSet rs = stmt.executeQuery("SELECT k FROM " + viewName);
+ while (rs.next()) {
+ assertEquals(count, rs.getInt(1));
+ count++;
+ }
+ assertEquals(5, count);
}
- assertEquals(5, count);
}
@Test
@@ -358,59 +381,70 @@ public class ViewIT extends SplitSystemCatalogIT {
public void testViewUsesTableLocalIndex() throws Exception {
if (transactionProvider == null ||
!TransactionFactory.getTransactionProvider(
-
TransactionFactory.Provider.valueOf(transactionProvider)).isUnsupported(Feature.ALLOW_LOCAL_INDEX))
{
+
TransactionFactory.Provider.valueOf(transactionProvider))
+ .isUnsupported(Feature.ALLOW_LOCAL_INDEX)) {
testViewUsesTableIndex(true);
}
}
-
private void testViewUsesTableIndex(boolean localIndex) throws Exception {
ResultSet rs;
// Use unique name for table with local index as otherwise we run into
issues
// when we attempt to drop the table (with the drop metadata option
set to false
- String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName()) + (localIndex ? "_WITH_LI" : "_WITHOUT_LI");
- Connection conn = DriverManager.getConnection(getUrl());
- String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT
NULL, k2 INTEGER NOT NULL, k3 DECIMAL, s1 VARCHAR, s2 VARCHAR CONSTRAINT pk
PRIMARY KEY (k1, k2, k3))" + tableDDLOptions;
- conn.createStatement().execute(ddl);
- String indexName1 = "I_" + generateUniqueName();
- String fullIndexName1 = SchemaUtil.getTableName(SCHEMA1, indexName1);
- conn.createStatement().execute("CREATE " + (localIndex ? "LOCAL " :
"") + " INDEX " + indexName1 + " ON " + fullTableName + "(k3, k2) INCLUDE(s1,
s2)");
- String indexName2 = "I_" + generateUniqueName();
- conn.createStatement().execute("CREATE INDEX " + indexName2 + " ON " +
fullTableName + "(k3, k2, s2)");
-
- String fullViewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
- ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " +
fullTableName + " WHERE s1 = 'foo'";
- conn.createStatement().execute(ddl);
- String[] s1Values = {"foo","bar"};
- for (int i = 0; i < 10; i++) {
- conn.createStatement().execute("UPSERT INTO " + fullTableName + "
VALUES(" + (i % 4) + "," + (i+100) + "," + (i > 5 ? 2 : 1) + ",'" +
s1Values[i%2] + "','bas')");
- }
- conn.commit();
-
- rs = conn.createStatement().executeQuery("SELECT count(*) FROM " +
fullViewName);
- assertTrue(rs.next());
- assertEquals(5, rs.getLong(1));
- assertFalse(rs.next());
+ String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName()) +
+ (localIndex ? "_WITH_LI" : "_WITHOUT_LI");
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()){
+ String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT
NULL, "
+ + "k2 INTEGER NOT NULL, k3 DECIMAL, s1 VARCHAR, s2 VARCHAR"
+ + " CONSTRAINT pk PRIMARY KEY (k1, k2, k3))" +
tableDDLOptions;
+ stmt.execute(ddl);
+ String indexName1 = "I_" + generateUniqueName();
+ String fullIndexName1 = SchemaUtil.getTableName(SCHEMA1,
indexName1);
+ stmt.execute("CREATE " + (localIndex ? "LOCAL " : "") + " INDEX "
+ indexName1 + " ON "
+ + fullTableName + "(k3, k2) INCLUDE(s1, s2)");
+ String indexName2 = "I_" + generateUniqueName();
+ stmt.execute("CREATE INDEX " + indexName2 + " ON " + fullTableName
+ "(k3, k2, s2)");
+
+ String fullViewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
+ ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " +
fullTableName
+ + " WHERE s1 = 'foo'";
+ stmt.execute(ddl);
+ String[] s1Values = { "foo", "bar" };
+ for (int i = 0; i < 10; i++) {
+ stmt.execute("UPSERT INTO " + fullTableName + " VALUES(" + (i
% 4) + "," + (i + 100)
+ + "," + (i > 5 ? 2 : 1) + ",'" + s1Values[i % 2] +
"','bas')");
+ }
+ conn.commit();
- String viewIndexName = "I_" + generateUniqueName();
- conn.createStatement().execute("CREATE INDEX " + viewIndexName + " on
" + fullViewName + "(k2)");
-
- String query = "SELECT k2 FROM " + fullViewName + " WHERE k2 IN
(100,109) AND k3 IN (1,2) AND s2='bas'";
- rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals(100, rs.getInt(1));
- assertFalse(rs.next());
- rs = conn.createStatement().executeQuery("EXPLAIN " + query);
- String queryPlan = QueryUtil.getExplainPlan(rs);
- // Assert that in either case (local & global) that index from
physical table used for query on view.
- if (localIndex) {
- assertEquals("CLIENT PARALLEL 1-WAY SKIP SCAN ON 4 KEYS OVER " +
fullTableName + " [1,1,100] - [1,2,109]\n" +
- " SERVER FILTER BY (\"S2\" = 'bas' AND \"S1\" =
'foo')\n" +
- "CLIENT MERGE SORT", queryPlan);
- } else {
- assertEquals(
- "CLIENT PARALLEL 1-WAY SKIP SCAN ON 4 KEYS OVER " +
fullIndexName1 + " [1,100] - [2,109]\n" +
- " SERVER FILTER BY (\"S2\" = 'bas' AND \"S1\" =
'foo')", queryPlan);
+ rs = stmt.executeQuery("SELECT count(*) FROM " + fullViewName);
+ assertTrue(rs.next());
+ assertEquals(5, rs.getLong(1));
+ assertFalse(rs.next());
+
+ String viewIndexName = "I_" + generateUniqueName();
+ stmt.execute("CREATE INDEX " + viewIndexName + " on " +
fullViewName + "(k2)");
+
+ String query = "SELECT k2 FROM " + fullViewName + " WHERE k2 IN
(100,109) AND k3 IN"
+ + " (1,2) AND s2='bas'";
+ rs = stmt.executeQuery(query);
+ assertTrue(rs.next());
+ assertEquals(100, rs.getInt(1));
+ assertFalse(rs.next());
+ rs = stmt.executeQuery("EXPLAIN " + query);
+ String queryPlan = QueryUtil.getExplainPlan(rs);
+ // Assert that in either case (local & global) that index from
physical table used
+ // for query on view.
+ if (localIndex) {
+ assertEquals("CLIENT PARALLEL 1-WAY SKIP SCAN ON 4 KEYS OVER "
+ fullTableName
+ + " [1,1,100] - [1,2,109]\n"
+ + " SERVER FILTER BY (\"S2\" = 'bas' AND \"S1\" =
'foo')\n"
+ + "CLIENT MERGE SORT", queryPlan);
+ } else {
+ assertEquals("CLIENT PARALLEL 1-WAY SKIP SCAN ON 4 KEYS OVER "
+ fullIndexName1
+ + " [1,100] - [2,109]\n"
+ + " SERVER FILTER BY (\"S2\" = 'bas' AND \"S1\" =
'foo')", queryPlan);
+ }
}
}
@@ -429,38 +463,32 @@ public class ViewIT extends SplitSystemCatalogIT {
String fullViewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
String indexName = "I_" + generateUniqueName();
String fullChildViewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
- try (Connection conn = DriverManager.getConnection(getUrl())) {
- String sql =
- "CREATE TABLE " + fullTableName
- + " (ID INTEGER NOT NULL PRIMARY KEY, HOST
VARCHAR(10), FLAG BOOLEAN)";
- conn.createStatement().execute(sql);
- sql =
- "CREATE VIEW " + fullViewName
- + " (COL1 INTEGER, COL2 INTEGER, COL3 INTEGER,
COL4 INTEGER) AS SELECT * FROM "
- + fullTableName + " WHERE ID > 5";
- conn.createStatement().execute(sql);
- sql =
- "CREATE " + (localIndex ? "LOCAL " : "") + " INDEX " +
indexName + " ON "
- + fullTableName + "(HOST)";
- conn.createStatement().execute(sql);
- sql =
- "CREATE VIEW " + fullChildViewName + " AS SELECT * FROM "
+ fullViewName
- + " WHERE COL1 > 2";
- conn.createStatement().execute(sql);
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ String sql = "CREATE TABLE " + fullTableName
+ + " (ID INTEGER NOT NULL PRIMARY KEY, HOST VARCHAR(10),
FLAG BOOLEAN)";
+ stmt.execute(sql);
+ sql = "CREATE VIEW " + fullViewName
+ + " (COL1 INTEGER, COL2 INTEGER, COL3 INTEGER, COL4
INTEGER) AS SELECT * FROM "
+ + fullTableName + " WHERE ID > 5";
+ stmt.execute(sql);
+ sql = "CREATE " + (localIndex ? "LOCAL " : "") + " INDEX " +
indexName + " ON "
+ + fullTableName + "(HOST)";
+ stmt.execute(sql);
+ sql = "CREATE VIEW " + fullChildViewName + " AS SELECT * FROM " +
fullViewName
+ + " WHERE COL1 > 2";
+ stmt.execute(sql);
// Sanity upserts in baseTable, view, child view
- conn.createStatement()
- .executeUpdate("upsert into " + fullTableName + " values
(1, 'host1', TRUE)");
- conn.createStatement()
- .executeUpdate("upsert into " + fullTableName + " values
(5, 'host5', FALSE)");
- conn.createStatement()
- .executeUpdate("upsert into " + fullTableName + " values
(7, 'host7', TRUE)");
+ stmt.executeUpdate("upsert into " + fullTableName + " values (1,
'host1', TRUE)");
+ stmt.executeUpdate("upsert into " + fullTableName + " values (5,
'host5', FALSE)");
+ stmt.executeUpdate("upsert into " + fullTableName + " values (7,
'host7', TRUE)");
conn.commit();
// View is not updateable
try {
- conn.createStatement().executeUpdate("upsert into " +
fullViewName
+ stmt.executeUpdate("upsert into " + fullViewName
+ " (ID, HOST, FLAG, COL1) values (7, 'host7', TRUE,
1)");
fail();
- } catch (Exception e) {
+ } catch (Exception ignore) {
}
// Check view inherits index, but child view doesn't
PTable table = PhoenixRuntime.getTable(conn, fullViewName);
@@ -468,12 +496,11 @@ public class ViewIT extends SplitSystemCatalogIT {
table = PhoenixRuntime.getTable(conn, fullChildViewName);
assertEquals(0, table.getIndexes().size());
- ResultSet rs =
- conn.createStatement().executeQuery("select count(*) from
" + fullTableName);
+ ResultSet rs = stmt.executeQuery("select count(*) from " +
fullTableName);
assertTrue(rs.next());
assertEquals(3, rs.getInt(1));
- rs = conn.createStatement().executeQuery("select count(*) from " +
fullViewName);
+ rs = stmt.executeQuery("select count(*) from " + fullViewName);
assertTrue(rs.next());
assertEquals(1, rs.getInt(1));
}
@@ -481,61 +508,72 @@ public class ViewIT extends SplitSystemCatalogIT {
@Test
public void testCreateViewDefinesPKColumn() throws Exception {
- Connection conn = DriverManager.getConnection(getUrl());
- String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
- String fullViewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
-
- String ddl = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL,
k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" +
tableDDLOptions;
- conn.createStatement().execute(ddl);
- ddl = "CREATE VIEW " + fullViewName + "(v2 VARCHAR, k3 VARCHAR PRIMARY
KEY) AS SELECT * FROM " + fullTableName + " WHERE K1 = 1";
- conn.createStatement().execute(ddl);
-
- // assert PK metadata
- ResultSet rs =
- conn.getMetaData().getPrimaryKeys(null,
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
+ String fullViewName = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
+
+ String ddl = "CREATE TABLE " + fullTableName
+ + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL,
"
+ + "CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
+ stmt.execute(ddl);
+ ddl = "CREATE VIEW " + fullViewName + "(v2 VARCHAR, k3 VARCHAR
PRIMARY KEY) "
+ + "AS SELECT * FROM " + fullTableName + " WHERE K1 = 1";
+ stmt.execute(ddl);
+
+ // assert PK metadata
+ ResultSet rs = conn.getMetaData().getPrimaryKeys(null,
SchemaUtil.getSchemaNameFromFullName(fullViewName),
SchemaUtil.getTableNameFromFullName(fullViewName));
- assertPKs(rs, new String[] {"K1", "K2", "K3"});
-
- // sanity check upserts into base table and view
- conn.createStatement().executeUpdate("upsert into " + fullTableName +
" (k1, k2, v1) values (1, 1, 1)");
- conn.createStatement().executeUpdate("upsert into " + fullViewName + "
(k1, k2, k3, v2) values (1, 1, 'abc', 'def')");
- conn.commit();
-
- // expect 2 rows in the base table
- rs = conn.createStatement().executeQuery("select count(*) from " +
fullTableName);
- assertTrue(rs.next());
- assertEquals(2, rs.getInt(1));
-
- // expect 2 row in the view
- rs = conn.createStatement().executeQuery("select count(*) from " +
fullViewName);
- assertTrue(rs.next());
- assertEquals(2, rs.getInt(1));
+ assertPKs(rs, new String[] { "K1", "K2", "K3" });
+
+ // sanity check upserts into base table and view
+ stmt.executeUpdate("upsert into " + fullTableName + " (k1, k2, v1)
values (1, 1, 1)");
+ stmt.executeUpdate("upsert into " + fullViewName
+ + " (k1, k2, k3, v2) values (1, 1, 'abc', 'def')");
+ conn.commit();
+
+ // expect 2 rows in the base table
+ rs = stmt.executeQuery("select count(*) from " + fullTableName);
+ assertTrue(rs.next());
+ assertEquals(2, rs.getInt(1));
+
+ // expect 2 row in the view
+ rs = stmt.executeQuery("select count(*) from " + fullViewName);
+ assertTrue(rs.next());
+ assertEquals(2, rs.getInt(1));
+ }
}
@Test
public void testQueryViewStatementOptimization() throws Exception {
- Connection conn = DriverManager.getConnection(getUrl());
- String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
- String fullViewName1 = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
- String fullViewName2 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
- String sql = "CREATE TABLE " + fullTableName + " (k1 INTEGER NOT NULL,
k2 INTEGER NOT NULL, v1 DECIMAL, CONSTRAINT pk PRIMARY KEY (k1, k2))" +
tableDDLOptions;
- conn.createStatement().execute(sql);
- sql = "CREATE VIEW " + fullViewName1 + " AS SELECT * FROM " +
fullTableName;
- conn.createStatement().execute(sql);
- sql = "CREATE VIEW " + fullViewName2 + " AS SELECT * FROM " +
fullTableName + " WHERE k1 = 1.0";
- conn.createStatement().execute(sql);
-
-
- sql = "SELECT * FROM " + fullViewName1 + " order by k1, k2";
- PreparedStatement stmt = conn.prepareStatement(sql);
- QueryPlan plan = PhoenixRuntime.getOptimizedQueryPlan(stmt);
- assertEquals(0, plan.getOrderBy().getOrderByExpressions().size());
-
- sql = "SELECT * FROM " + fullViewName2 + " order by k1, k2";
- stmt = conn.prepareStatement(sql);
- plan = PhoenixRuntime.getOptimizedQueryPlan(stmt);
- assertEquals(0, plan.getOrderBy().getOrderByExpressions().size());
+ try (Connection conn = DriverManager.getConnection(getUrl())) {
+ String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
+ String fullViewName1 = SchemaUtil.getTableName(SCHEMA2,
generateUniqueName());
+ String fullViewName2 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
+ String sql = "CREATE TABLE " + fullTableName
+ + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, v1 DECIMAL,
"
+ + "CONSTRAINT pk PRIMARY KEY (k1, k2))" + tableDDLOptions;
+ try (Statement stmt = conn.createStatement()) {
+ stmt.execute(sql);
+ sql = "CREATE VIEW " + fullViewName1 + " AS SELECT * FROM " +
fullTableName;
+ stmt.execute(sql);
+ sql = "CREATE VIEW " + fullViewName2 + " AS SELECT * FROM " +
fullTableName
+ + " WHERE k1 = 1.0";
+ stmt.execute(sql);
+ }
+ sql = "SELECT * FROM " + fullViewName1 + " order by k1, k2";
+ QueryPlan plan;
+ try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+ plan = PhoenixRuntime.getOptimizedQueryPlan(stmt);
+ assertEquals(0,
plan.getOrderBy().getOrderByExpressions().size());
+ }
+ sql = "SELECT * FROM " + fullViewName2 + " order by k1, k2";
+ try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+ plan = PhoenixRuntime.getOptimizedQueryPlan(stmt);
+ assertEquals(0,
plan.getOrderBy().getOrderByExpressions().size());
+ }
+ }
}
private void assertPKs(ResultSet rs, String[] expectedPKs) throws
SQLException {
@@ -559,97 +597,117 @@ public class ViewIT extends SplitSystemCatalogIT {
String myTableDDLOptions = tableDDLOptions;
if (myTableDDLOptions.length() != 0) myTableDDLOptions += ",";
- myTableDDLOptions += "VERSIONS=1, MULTI_TENANT=true,
IMMUTABLE_ROWS=TRUE, REPLICATION_SCOPE=1";
+ myTableDDLOptions += "VERSIONS=1, MULTI_TENANT=true,
IMMUTABLE_ROWS=TRUE, "
+ + "REPLICATION_SCOPE=1";
// create global base table
- globalConn.createStatement().execute("CREATE TABLE " + tableName
- + " (TENANT_ID CHAR(15) NOT NULL, KEY_PREFIX CHAR(3) NOT
NULL, CREATED_DATE DATE, CREATED_BY CHAR(15), SYSTEM_MODSTAMP DATE CONSTRAINT
PK PRIMARY KEY (TENANT_ID, KEY_PREFIX)) " + myTableDDLOptions);
+ try (Statement stmt = globalConn.createStatement()) {
+ stmt.execute("CREATE TABLE " + tableName
+ + " (TENANT_ID CHAR(15) NOT NULL, KEY_PREFIX CHAR(3)
NOT NULL, "
+ + "CREATED_DATE DATE, CREATED_BY CHAR(15),
SYSTEM_MODSTAMP DATE CONSTRAINT "
+ + "PK PRIMARY KEY (TENANT_ID, KEY_PREFIX)) " +
myTableDDLOptions);
+ }
String tenantId = "tenantId";
Properties tenantProps = new Properties();
tenantProps.setProperty(PhoenixRuntime.TENANT_ID_ATTRIB, tenantId);
// create a tenant specific view
- try (Connection tenantConn = DriverManager.getConnection(getUrl(),
tenantProps)) {
+ try (Connection tenantConn = DriverManager.getConnection(getUrl(),
tenantProps);
+ Statement tenantStmt = tenantConn.createStatement()) {
// create various tenant specific views
// view with composite PK with multiple PK values of VARCHAR
values DESC
- tenantConn.createStatement()
- .execute("CREATE VIEW " + viewName1
- + " (pk1 VARCHAR(10) NOT NULL, pk2 VARCHAR(10)
NOT NULL, col1 DATE, col3 DECIMAL CONSTRAINT PK PRIMARY KEY (pk1 DESC, pk2
DESC)) AS SELECT * FROM "
- + tableName + " WHERE KEY_PREFIX = 'abc' ");
+ tenantStmt.execute("CREATE VIEW " + viewName1
+ + " (pk1 VARCHAR(10) NOT NULL, pk2 VARCHAR(10) NOT
NULL, col1 DATE,"
+ + " col3 DECIMAL CONSTRAINT PK PRIMARY KEY (pk1 DESC,
pk2 DESC)) "
+ + "AS SELECT * FROM " + tableName + " WHERE KEY_PREFIX
= 'abc' ");
// view with composite PK with single pk value DESC
- tenantConn.createStatement()
- .execute("CREATE VIEW " + viewName2
- + " (pk1 VARCHAR(10) NOT NULL, pk2 VARCHAR(10)
NOT NULL, col1 DATE, col3 DECIMAL CONSTRAINT PK PRIMARY KEY (pk1 DESC, pk2
DESC)) AS SELECT * FROM "
- + tableName + " WHERE KEY_PREFIX = 'abc' ");
+ tenantStmt.execute("CREATE VIEW " + viewName2
+ + " (pk1 VARCHAR(10) NOT NULL, pk2 VARCHAR(10) NOT
NULL, col1 DATE,"
+ + " col3 DECIMAL CONSTRAINT PK PRIMARY KEY (pk1 DESC,
pk2 DESC)) "
+ + "AS SELECT * FROM " + tableName + " WHERE KEY_PREFIX
= 'abc' ");
// view with composite PK with multiple Date PK values DESC
- tenantConn.createStatement()
- .execute("CREATE VIEW " + viewName3
- + " (pk1 DATE(10) NOT NULL, pk2 DATE(10) NOT
NULL, col1 VARCHAR(10), col3 DECIMAL CONSTRAINT PK PRIMARY KEY (pk1 DESC, pk2
DESC)) AS SELECT * FROM "
- + tableName + " WHERE KEY_PREFIX = 'ab3' ");
+ tenantStmt.execute("CREATE VIEW " + viewName3
+ + " (pk1 DATE(10) NOT NULL, pk2 DATE(10) NOT NULL, "
+ + "col1 VARCHAR(10), col3 DECIMAL CONSTRAINT PK
PRIMARY KEY "
+ + "(pk1 DESC, pk2 DESC)) AS SELECT * FROM "
+ + tableName + " WHERE KEY_PREFIX = 'ab3' ");
- tenantConn.createStatement()
- .execute("CREATE VIEW " + viewName4
- + " (pk1 DATE(10) NOT NULL, pk2 DECIMAL NOT NULL, pk3
VARCHAR(10) NOT NULL, col3 DECIMAL CONSTRAINT PK PRIMARY KEY (pk1 DESC, pk2
DESC, pk3 DESC)) AS SELECT * FROM "
+ tenantStmt.execute("CREATE VIEW " + viewName4
+ + " (pk1 DATE(10) NOT NULL, pk2 DECIMAL NOT NULL, pk3
VARCHAR(10) NOT NULL,"
+ + " col3 DECIMAL CONSTRAINT PK PRIMARY KEY (pk1 DESC,
pk2 DESC, pk3 DESC)) "
+ + "AS SELECT * FROM "
+ tableName + " WHERE KEY_PREFIX = 'ab4' ");
// upsert rows
- upsertRows(tableName, viewName1, tenantConn);
- upsertRows(tableName, viewName2, tenantConn);
+ upsertRows(viewName1, tenantConn);
+ upsertRows(viewName2, tenantConn);
// run queries
- String[] whereClauses =
- new String[] { "pk1 = 'testa'", "", "pk1 >= 'testa'",
"pk1 <= 'testa'",
- "pk1 > 'testa'", "pk1 < 'testa'" };
+ String[] whereClauses = new String[] {
+ "pk1 = 'testa'", "", "pk1 >= 'testa'", "pk1 <=
'testa'",
+ "pk1 > 'testa'", "pk1 < 'testa'" };
long[] expectedArray = new long[] { 4, 5, 5, 4, 1, 0 };
validate(viewName1, tenantConn, whereClauses, expectedArray);
validate(viewName2, tenantConn, whereClauses, expectedArray);
- tenantConn.createStatement().execute("UPSERT INTO " + viewName3
- + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
22:00:00', 'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16 21:00:00', 'yyyy-MM-dd
HH:mm:ss'), 'txt1', 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName3
- + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
22:00:00', 'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16 21:01:00', 'yyyy-MM-dd
HH:mm:ss'), 'txt1', 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName3
- + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
22:00:00', 'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16 21:02:00', 'yyyy-MM-dd
HH:mm:ss'), 'txt1', 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName3
- + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
22:00:00', 'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16 21:03:00', 'yyyy-MM-dd
HH:mm:ss'), 'txt1', 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName3
- + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
23:00:00', 'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16 21:04:00', 'yyyy-MM-dd
HH:mm:ss'), 'txt1', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName3
+ + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16
21:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 'txt1', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName3
+ + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16
21:01:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 'txt1', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName3
+ + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16
21:02:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 'txt1', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName3
+ + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16
21:03:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 'txt1', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName3
+ + " (pk1, pk2, col1, col3) VALUES (TO_DATE('2017-10-16
23:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), TO_DATE('2017-10-16
21:04:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 'txt1', 10)");
tenantConn.commit();
- String[] view3WhereClauses =
- new String[] {
- "pk1 = TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')", "",
- "pk1 >= TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')",
- "pk1 <= TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')",
- "pk1 > TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')",
- "pk1 < TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')" };
+ String[] view3WhereClauses = new String[] {
+ "pk1 = TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')", "",
+ "pk1 >= TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')",
+ "pk1 <= TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')",
+ "pk1 > TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')",
+ "pk1 < TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')" };
validate(viewName3, tenantConn, view3WhereClauses,
expectedArray);
- tenantConn.createStatement().execute("UPSERT INTO " + viewName4
- + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
22:00:00', 'yyyy-MM-dd HH:mm:ss'), 1, 'txt1', 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName4
- + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
22:00:00', 'yyyy-MM-dd HH:mm:ss'), 2, 'txt2', 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName4
- + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
22:00:00', 'yyyy-MM-dd HH:mm:ss'), 3, 'txt3', 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName4
- + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
22:00:00', 'yyyy-MM-dd HH:mm:ss'), 4, 'txt4', 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName4
- + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
23:00:00', 'yyyy-MM-dd HH:mm:ss'), 1, 'txt1', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName4
+ + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 1, 'txt1', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName4
+ + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 2, 'txt2', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName4
+ + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 3, 'txt3', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName4
+ + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 4, 'txt4', 10)");
+ tenantStmt.execute("UPSERT INTO " + viewName4
+ + " (pk1, pk2, pk3, col3) VALUES (TO_DATE('2017-10-16
23:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 1, 'txt1', 10)");
tenantConn.commit();
- String[] view4WhereClauses =
- new String[] {
- "pk1 = TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')",
- "pk1 = TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss') AND pk2 = 2",
- "pk1 = TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss') AND pk2 > 2",
- "", "pk1 >= TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')",
- "pk1 <= TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')",
- "pk1 > TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')",
- "pk1 < TO_DATE('2017-10-16 22:00:00',
'yyyy-MM-dd HH:mm:ss')" };
+ String[] view4WhereClauses = new String[] {
+ "pk1 = TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')",
+ "pk1 = TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss') AND pk2 = 2",
+ "pk1 = TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss') AND pk2 > 2",
+ "", "pk1 >= TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')",
+ "pk1 <= TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')",
+ "pk1 > TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')",
+ "pk1 < TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd
HH:mm:ss')" };
long[] view4ExpectedArray = new long[] { 4, 1, 2, 5, 5, 4, 1,
0 };
validate(viewName4, tenantConn, view4WhereClauses,
view4ExpectedArray);
-
}
}
}
@@ -658,218 +716,238 @@ public class ViewIT extends SplitSystemCatalogIT {
long[] expectedArray) throws SQLException {
for (int i = 0; i < whereClauseArray.length; ++i) {
String where = !whereClauseArray[i].isEmpty() ? (" WHERE " +
whereClauseArray[i]) : "";
- ResultSet rs =
- tenantConn.createStatement()
- .executeQuery("SELECT count(*) FROM " + viewName +
where);
- assertTrue(rs.next());
- assertEquals(expectedArray[i], rs.getLong(1));
- assertFalse(rs.next());
+ try (Statement stmt = tenantConn.createStatement()) {
+ ResultSet rs = stmt.executeQuery("SELECT count(*) FROM " +
viewName + where);
+ assertTrue(rs.next());
+ assertEquals(expectedArray[i], rs.getLong(1));
+ assertFalse(rs.next());
+ }
}
}
- private void upsertRows(String tableName, String viewName1, Connection
tenantConn) throws SQLException, IOException {
- tenantConn.createStatement().execute("UPSERT INTO " + viewName1
- + " (pk1, pk2, col1, col3) VALUES ('testa', 'testb',
TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd HH:mm:ss'), 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName1
- + " (pk1, pk2, col1, col3) VALUES ('testa', 'testc',
TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd HH:mm:ss'), 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName1
- + " (pk1, pk2, col1, col3) VALUES ('testa', 'testd',
TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd HH:mm:ss'), 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName1
- + " (pk1, pk2, col1, col3) VALUES ('testa', 'teste',
TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd HH:mm:ss'), 10)");
- tenantConn.createStatement().execute("UPSERT INTO " + viewName1
- + " (pk1, pk2, col1, col3) VALUES ('testb', 'testa',
TO_DATE('2017-10-16 22:00:00', 'yyyy-MM-dd HH:mm:ss'), 10)");
- tenantConn.commit();
+ private void upsertRows(String viewName, Connection tenantConn) throws
SQLException {
+ try (Statement stmt = tenantConn.createStatement()) {
+ stmt.execute("UPSERT INTO " + viewName + " (pk1, pk2, col1, col3)
VALUES "
+ + "('testa', 'testb', TO_DATE('2017-10-16 22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 10)");
+ stmt.execute("UPSERT INTO " + viewName + " (pk1, pk2, col1, col3)
VALUES "
+ + "('testa', 'testc', TO_DATE('2017-10-16 22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 10)");
+ stmt.execute("UPSERT INTO " + viewName + " (pk1, pk2, col1, col3) "
+ + "VALUES ('testa', 'testd', TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 10)");
+ stmt.execute("UPSERT INTO " + viewName + " (pk1, pk2, col1, col3) "
+ + "VALUES ('testa', 'teste', TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 10)");
+ stmt.execute("UPSERT INTO " + viewName + " (pk1, pk2, col1, col3) "
+ + "VALUES ('testb', 'testa', TO_DATE('2017-10-16
22:00:00', "
+ + "'yyyy-MM-dd HH:mm:ss'), 10)");
+ tenantConn.commit();
+ }
}
- public static String testUpdatableView(String fullTableName, String
fullViewName, String fullChildViewName,
- String childViewDDL, Integer saltBuckets, String tableDDLOptions)
throws Exception {
- Connection conn = DriverManager.getConnection(getUrl());
- if (saltBuckets != null) {
- if (tableDDLOptions.length() != 0)
- tableDDLOptions += ",";
- tableDDLOptions += (" SALT_BUCKETS=" + saltBuckets);
- }
- String ddl = "CREATE TABLE " + fullTableName
- + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, k3 DECIMAL, s
VARCHAR CONSTRAINT pk PRIMARY KEY (k1, k2, k3))"
- + tableDDLOptions;
- conn.createStatement().execute(ddl);
- ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " +
fullTableName + " WHERE k1 = 1";
- conn.createStatement().execute(ddl);
- ArrayList<String> splitPoints = Lists.newArrayList(fullTableName,
fullViewName);
- if (fullChildViewName != null) {
- conn.createStatement().execute(childViewDDL);
- splitPoints.add(fullChildViewName);
- }
+ public static void testUpdatableView(String fullTableName, String
fullViewName,
+ String fullChildViewName, String childViewDDL, Integer saltBuckets,
+ String tableDDLOptions) throws Exception {
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ if (saltBuckets != null) {
+ if (tableDDLOptions.length() != 0) tableDDLOptions += ",";
+ tableDDLOptions += (" SALT_BUCKETS=" + saltBuckets);
+ }
+ String ddl = "CREATE TABLE " + fullTableName
+ + " (k1 INTEGER NOT NULL, k2 INTEGER NOT NULL, k3 DECIMAL,
s VARCHAR "
+ + "CONSTRAINT pk PRIMARY KEY (k1, k2, k3))" +
tableDDLOptions;
+ stmt.execute(ddl);
+ ddl = "CREATE VIEW " + fullViewName + " AS SELECT * FROM " +
fullTableName
+ + " WHERE k1 = 1";
+ stmt.execute(ddl);
+ ArrayList<String> splitPoints = Lists.newArrayList(fullTableName,
fullViewName);
+ if (fullChildViewName != null) {
+ stmt.execute(childViewDDL);
+ splitPoints.add(fullChildViewName);
+ }
- for (int i = 0; i < 10; i++) {
- conn.createStatement().execute("UPSERT INTO " + fullTableName + "
VALUES(" + (i % 4) + "," + (i + 100) + ","
- + (i > 5 ? 2 : 1) + ")");
- }
- conn.commit();
- ResultSet rs;
+ for (int i = 0; i < 10; i++) {
+ stmt.execute("UPSERT INTO " + fullTableName + " VALUES(" + (i
% 4) + ","
+ + (i + 100) + "," + (i > 5 ? 2 : 1) + ")");
+ }
+ conn.commit();
- rs = conn.createStatement().executeQuery("SELECT count(*) FROM " +
fullTableName);
- assertTrue(rs.next());
- assertEquals(10, rs.getInt(1));
- rs = conn.createStatement().executeQuery("SELECT count(*) FROM " +
fullViewName);
- assertTrue(rs.next());
- assertEquals(3, rs.getInt(1));
- rs = conn.createStatement().executeQuery("SELECT k1, k2, k3 FROM " +
fullViewName);
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(101, rs.getInt(2));
- assertEquals(1, rs.getInt(3));
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(105, rs.getInt(2));
- assertEquals(1, rs.getInt(3));
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(109, rs.getInt(2));
- assertEquals(2, rs.getInt(3));
- assertFalse(rs.next());
-
- conn.createStatement().execute("UPSERT INTO " + fullViewName +
"(k2,S,k3) VALUES(120,'foo',50.0)");
- conn.createStatement().execute("UPSERT INTO " + fullViewName +
"(k2,S,k3) VALUES(121,'bar',51.0)");
- conn.commit();
- rs = conn.createStatement().executeQuery("SELECT k1, k2 FROM " +
fullViewName + " WHERE k2 >= 120");
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(120, rs.getInt(2));
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(121, rs.getInt(2));
- assertFalse(rs.next());
- conn.close();
- return fullViewName;
+ ResultSet rs;
+ rs = stmt.executeQuery("SELECT count(*) FROM " + fullTableName);
+ assertTrue(rs.next());
+ assertEquals(10, rs.getInt(1));
+ rs = stmt.executeQuery("SELECT count(*) FROM " + fullViewName);
+ assertTrue(rs.next());
+ assertEquals(3, rs.getInt(1));
+ rs = stmt.executeQuery("SELECT k1, k2, k3 FROM " + fullViewName);
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(101, rs.getInt(2));
+ assertEquals(1, rs.getInt(3));
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(105, rs.getInt(2));
+ assertEquals(1, rs.getInt(3));
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(109, rs.getInt(2));
+ assertEquals(2, rs.getInt(3));
+ assertFalse(rs.next());
+
+ stmt.execute("UPSERT INTO " + fullViewName + "(k2,S,k3)
VALUES(120,'foo',50.0)");
+ stmt.execute("UPSERT INTO " + fullViewName + "(k2,S,k3)
VALUES(121,'bar',51.0)");
+ conn.commit();
+
+ rs = stmt.executeQuery("SELECT k1, k2 FROM " + fullViewName + "
WHERE k2 >= 120");
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(120, rs.getInt(2));
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(121, rs.getInt(2));
+ assertFalse(rs.next());
+ }
}
public static Pair<String, Scan> testUpdatableViewIndex(String
fullTableName, Integer saltBuckets,
boolean localIndex, String viewName) throws Exception {
ResultSet rs;
- Connection conn = DriverManager.getConnection(getUrl());
- String viewIndexName1 = "I_" + generateUniqueName();
- String viewIndexPhysicalName =
MetaDataUtil.getViewIndexPhysicalName(fullTableName);
- if (localIndex) {
- conn.createStatement().execute("CREATE LOCAL INDEX " +
viewIndexName1 + " on " + viewName + "(k3)");
- } else {
- conn.createStatement().execute("CREATE INDEX " + viewIndexName1 +
" on " + viewName + "(k3) include (s)");
- }
- conn.createStatement().execute("UPSERT INTO " + viewName + "(k2,S,k3)
VALUES(120,'foo',50.0)");
- conn.commit();
-
- analyzeTable(conn, viewName);
- List<KeyRange> splits = getAllSplits(conn, viewIndexName1);
- // More guideposts with salted, since it's already pre-split at salt
- // buckets
- assertEquals(saltBuckets == null ? 6 : 8, splits.size());
-
- String query = "SELECT k1, k2, k3, s FROM " + viewName + " WHERE k3 =
51.0";
- rs = conn.createStatement().executeQuery(query);
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(121, rs.getInt(2));
- assertTrue(BigDecimal.valueOf(51.0).compareTo(rs.getBigDecimal(3)) ==
0);
- assertEquals("bar", rs.getString(4));
- assertFalse(rs.next());
- rs = conn.createStatement().executeQuery("EXPLAIN " + query);
- String queryPlan = QueryUtil.getExplainPlan(rs);
- if (localIndex) {
- assertEquals("CLIENT PARALLEL " + (saltBuckets == null ? 1 :
saltBuckets) + "-WAY RANGE SCAN OVER "
- + fullTableName + " [1,51]\n" + " SERVER FILTER BY
FIRST KEY ONLY\n" + "CLIENT MERGE SORT",
- queryPlan);
- } else {
- assertEquals(saltBuckets == null
- ? "CLIENT PARALLEL 1-WAY RANGE SCAN OVER " +
viewIndexPhysicalName + " [" + Short.MIN_VALUE + ",51]"
- : "CLIENT PARALLEL " + saltBuckets + "-WAY RANGE SCAN OVER
" + viewIndexPhysicalName + " [0,"
- + Short.MIN_VALUE + ",51] - [" +
(saltBuckets.intValue() - 1) + "," + Short.MIN_VALUE
- + ",51]\nCLIENT MERGE SORT",
- queryPlan);
- }
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ String viewIndexName1 = "I_" + generateUniqueName();
+ String viewIndexPhysicalName =
MetaDataUtil.getViewIndexPhysicalName(fullTableName);
+ if (localIndex) {
+ stmt.execute("CREATE LOCAL INDEX " + viewIndexName1 + " on " +
viewName + "(k3)");
+ } else {
+ stmt.execute(
+ "CREATE INDEX " + viewIndexName1 + " on " + viewName +
"(k3) include (s)");
+ }
+ stmt.execute("UPSERT INTO " + viewName + "(k2,S,k3) " +
"VALUES(120,'foo',50.0)");
+ conn.commit();
- String viewIndexName2 = "I_" + generateUniqueName();
- if (localIndex) {
- conn.createStatement().execute("CREATE LOCAL INDEX " +
viewIndexName2 + " on " + viewName + "(s)");
- } else {
- conn.createStatement().execute("CREATE INDEX " + viewIndexName2 +
" on " + viewName + "(s)");
- }
+ analyzeTable(conn, viewName);
+ List<KeyRange> splits = getAllSplits(conn, viewIndexName1);
+ // More guideposts with salted, since it's already pre-split at
salt
+ // buckets
+ assertEquals(saltBuckets == null ? 6 : 8, splits.size());
+
+ String query = "SELECT k1, k2, k3, s FROM " + viewName + " WHERE
k3 = 51.0";
+ rs = stmt.executeQuery(query);
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(121, rs.getInt(2));
+ assertEquals(0,
BigDecimal.valueOf(51.0).compareTo(rs.getBigDecimal(3)));
+ assertEquals("bar", rs.getString(4));
+ assertFalse(rs.next());
+ rs = stmt.executeQuery("EXPLAIN " + query);
+ String queryPlan = QueryUtil.getExplainPlan(rs);
+ if (localIndex) {
+ assertEquals("CLIENT PARALLEL " + (saltBuckets == null ? 1 :
saltBuckets)
+ + "-WAY RANGE SCAN OVER " + fullTableName + " [1,51]\n"
+ + " SERVER FILTER BY FIRST KEY ONLY\n" + "CLIENT
MERGE SORT", queryPlan);
+ } else {
+ assertEquals(saltBuckets == null ?
+ "CLIENT PARALLEL 1-WAY RANGE SCAN OVER " +
viewIndexPhysicalName
+ + " [" + Short.MIN_VALUE + ",51]" :
+ "CLIENT PARALLEL " + saltBuckets + "-WAY RANGE SCAN
OVER "
+ + viewIndexPhysicalName + " [0,"
+ + Short.MIN_VALUE + ",51] - [" + (saltBuckets
- 1) + ","
+ + Short.MIN_VALUE + ",51]\nCLIENT MERGE SORT",
queryPlan);
+ }
- // new index hasn't been analyzed yet
- splits = getAllSplits(conn, viewIndexName2);
- assertEquals(saltBuckets == null ? 1 : 3, splits.size());
-
- // analyze table should analyze all view data
- analyzeTable(conn, fullTableName);
- splits = getAllSplits(conn, viewIndexName2);
- assertEquals(saltBuckets == null ? 6 : 8, splits.size());
-
- query = "SELECT k1, k2, s FROM " + viewName + " WHERE s = 'foo'";
- Statement statement = conn.createStatement();
- rs = statement.executeQuery(query);
- Scan scan =
statement.unwrap(PhoenixStatement.class).getQueryPlan().getContext().getScan();
- assertTrue(rs.next());
- assertEquals(1, rs.getInt(1));
- assertEquals(120, rs.getInt(2));
- assertEquals("foo", rs.getString(3));
- assertFalse(rs.next());
- rs = conn.createStatement().executeQuery("EXPLAIN " + query);
- String physicalTableName;
- if (localIndex) {
- physicalTableName = fullTableName;
- assertEquals("CLIENT PARALLEL " + (saltBuckets == null ? 1 :
saltBuckets) + "-WAY RANGE SCAN OVER "
- + fullTableName + " [" + (2) + ",'foo']\n" + " SERVER
FILTER BY FIRST KEY ONLY\n"
- + "CLIENT MERGE SORT", QueryUtil.getExplainPlan(rs));
- } else {
- physicalTableName = viewIndexPhysicalName;
- assertEquals(
- saltBuckets == null
- ? "CLIENT PARALLEL 1-WAY RANGE SCAN OVER " +
viewIndexPhysicalName + " ["
- + (Short.MIN_VALUE + 1) + ",'foo']\n" + "
SERVER FILTER BY FIRST KEY ONLY"
- : "CLIENT PARALLEL " + saltBuckets + "-WAY RANGE
SCAN OVER " + viewIndexPhysicalName
- + " [0," + (Short.MIN_VALUE + 1) +
",'foo'] - [" + (saltBuckets.intValue() - 1)
- + "," + (Short.MIN_VALUE + 1) + ",'foo']\n"
- + " SERVER FILTER BY FIRST KEY ONLY\n"
+ "CLIENT MERGE SORT",
- QueryUtil.getExplainPlan(rs));
+ String viewIndexName2 = "I_" + generateUniqueName();
+ if (localIndex) {
+ stmt.execute("CREATE LOCAL INDEX " + viewIndexName2 + " on " +
viewName + "(s)");
+ } else {
+ stmt.execute("CREATE INDEX " + viewIndexName2 + " on " +
viewName + "(s)");
+ }
+
+ // new index hasn't been analyzed yet
+ splits = getAllSplits(conn, viewIndexName2);
+ assertEquals(saltBuckets == null ? 1 : 3, splits.size());
+
+ // analyze table should analyze all view data
+ analyzeTable(conn, fullTableName);
+ splits = getAllSplits(conn, viewIndexName2);
+ assertEquals(saltBuckets == null ? 6 : 8, splits.size());
+
+ query = "SELECT k1, k2, s FROM " + viewName + " WHERE s = 'foo'";
+ rs = stmt.executeQuery(query);
+ Scan scan =
stmt.unwrap(PhoenixStatement.class).getQueryPlan().getContext().getScan();
+ assertTrue(rs.next());
+ assertEquals(1, rs.getInt(1));
+ assertEquals(120, rs.getInt(2));
+ assertEquals("foo", rs.getString(3));
+ assertFalse(rs.next());
+ rs = stmt.executeQuery("EXPLAIN " + query);
+ String physicalTableName;
+ if (localIndex) {
+ physicalTableName = fullTableName;
+ assertEquals("CLIENT PARALLEL " + (saltBuckets == null ? 1 :
saltBuckets)
+ + "-WAY RANGE SCAN OVER " + fullTableName + " [" + (2)
+ ",'foo']\n"
+ + " SERVER FILTER BY FIRST KEY ONLY\n" + "CLIENT
MERGE SORT",
+ QueryUtil.getExplainPlan(rs));
+ } else {
+ physicalTableName = viewIndexPhysicalName;
+ assertEquals(saltBuckets == null ?
+ "CLIENT PARALLEL 1-WAY RANGE SCAN OVER " +
viewIndexPhysicalName
+ + " [" + (Short.MIN_VALUE + 1) +
",'foo']\n"
+ + " SERVER FILTER BY FIRST KEY
ONLY" :
+ "CLIENT PARALLEL " + saltBuckets + "-WAY RANGE
SCAN OVER "
+ + viewIndexPhysicalName + " [0," +
(Short.MIN_VALUE + 1)
+ + ",'foo'] - [" + (saltBuckets - 1) +
","
+ + (Short.MIN_VALUE + 1) + ",'foo']\n"
+ + " SERVER FILTER BY FIRST KEY
ONLY\n"
+ + "CLIENT MERGE SORT",
+ QueryUtil.getExplainPlan(rs));
+ }
+ return new Pair<>(physicalTableName, scan);
}
- conn.close();
- return new Pair<>(physicalTableName, scan);
}
@Test
public void testChildViewCreationFails() throws Exception {
- Connection conn = DriverManager.getConnection(getUrl());
- String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
- String fullViewName1 = FAILED_VIEWNAME;
- String fullViewName2 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
-
- String tableDdl = "CREATE TABLE " + fullTableName + " (k INTEGER NOT
NULL PRIMARY KEY, v1 DATE)" + tableDDLOptions;
- conn.createStatement().execute(tableDdl);
- String ddl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS SELECT
* FROM " + fullTableName + " WHERE k > 5";
- try {
- conn.createStatement().execute(ddl);
- fail();
- }
- catch (PhoenixIOException e){
- }
- ddl = "CREATE VIEW " + fullViewName2 + "(v2 VARCHAR) AS SELECT * FROM
" + fullTableName + " WHERE k > 10";
- conn.createStatement().execute(ddl);
-
- // the first child view should not exist
- try {
- PhoenixRuntime.getTableNoCache(conn, fullViewName1);
- fail();
- } catch (SQLException e) {
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+
+ String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
+ String fullViewName1 = FAILED_VIEWNAME;
+ String fullViewName2 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
+
+ String tableDdl = "CREATE TABLE " + fullTableName
+ + " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE)" +
tableDDLOptions;
+ stmt.execute(tableDdl);
+ String ddl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS
SELECT * FROM "
+ + fullTableName + " WHERE k > 5";
+ try {
+ stmt.execute(ddl);
+ fail();
+ } catch (PhoenixIOException ignored) {
+ }
+ ddl = "CREATE VIEW " + fullViewName2 + "(v2 VARCHAR) AS SELECT *
FROM " + fullTableName
+ + " WHERE k > 10";
+ stmt.execute(ddl);
+
+ // the first child view should not exist
+ try {
+ PhoenixRuntime.getTableNoCache(conn, fullViewName1);
+ fail();
+ } catch (SQLException ignored) {
+ }
+
+ // we should be able to load the table
+ PhoenixRuntime.getTableNoCache(conn, fullTableName);
+ // we should be able to load the second view
+ PhoenixRuntime.getTableNoCache(conn, fullViewName2);
}
-
- // we should be able to load the table
- PhoenixRuntime.getTableNoCache(conn, fullTableName);
- // we should be able to load the second view
- PhoenixRuntime.getTableNoCache(conn, fullViewName2);
}
@Test
public void testConcurrentViewCreationAndTableDrop() throws Exception {
- try (Connection conn = DriverManager.getConnection(getUrl())) {
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
String fullViewName1 = SLOW_VIEWNAME_PREFIX + "_" +
generateUniqueName();
latch1 = new CountDownLatch(1);
@@ -877,7 +955,7 @@ public class ViewIT extends SplitSystemCatalogIT {
String tableDdl =
"CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL
PRIMARY KEY, v1 DATE)"
+ tableDDLOptions;
- conn.createStatement().execute(tableDdl);
+ stmt.execute(tableDdl);
ExecutorService executorService = Executors.newFixedThreadPool(1,
new ThreadFactory() {
@Override
@@ -906,7 +984,7 @@ public class ViewIT extends SplitSystemCatalogIT {
// Revert this flag since we don't want to wait in preDropTable
slowDownAddingChildLink = false;
// drop table goes through first and so the view creation should
fail
- conn.createStatement().execute(tableDdl);
+ stmt.execute(tableDdl);
latch2.countDown();
Exception e = future.get();
@@ -919,13 +997,14 @@ public class ViewIT extends SplitSystemCatalogIT {
@Test
public void testChildLinkCreationFailThrowsException() throws Exception {
- try (Connection conn = DriverManager.getConnection(getUrl())) {
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
String fullViewName1 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
// create base table
String tableDdl = "CREATE TABLE " + fullTableName
+ " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE)" +
tableDDLOptions;
- conn.createStatement().execute(tableDdl);
+ stmt.execute(tableDdl);
// Throw an exception in ChildLinkMetaDataEndpoint while adding
parent->child links
// to simulate a failure
@@ -934,7 +1013,7 @@ public class ViewIT extends SplitSystemCatalogIT {
String ddl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS
SELECT * FROM "
+ fullTableName + " WHERE k = 6";
try {
- conn.createStatement().execute(ddl);
+ stmt.execute(ddl);
fail("Should have thrown an exception");
} catch(SQLException sqlE) {
assertEquals("Expected a different Error code",
@@ -946,20 +1025,19 @@ public class ViewIT extends SplitSystemCatalogIT {
@Test
public void testConcurrentAddSameColumnDifferentType() throws Exception {
- try (Connection conn = DriverManager.getConnection(getUrl())) {
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
String fullViewName1 = SLOW_VIEWNAME_PREFIX + "_" +
generateUniqueName();
String fullViewName2 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
// create base table
- String tableDdl =
- "CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL
PRIMARY KEY, v1 DATE)"
- + tableDDLOptions;
- conn.createStatement().execute(tableDdl);
+ String tableDdl = "CREATE TABLE " + fullTableName
+ + " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE)" +
tableDDLOptions;
+ stmt.execute(tableDdl);
// create a view
- String ddl =
- "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS SELECT
* FROM "
- + fullTableName + " WHERE k = 6";
- conn.createStatement().execute(ddl);
+ String ddl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS
SELECT * FROM "
+ + fullTableName + " WHERE k = 6";
+ stmt.execute(ddl);
latch1 = new CountDownLatch(1);
latch2 = new CountDownLatch(1);
@@ -975,7 +1053,8 @@ public class ViewIT extends SplitSystemCatalogIT {
// add a column with the same name and different type to the view
in a separate thread
// (which will take some time to complete)
- Future<Exception> future = executorService.submit(new
AddColumnRunnable(fullViewName1));
+ Future<Exception> future = executorService.submit(
+ new AddColumnRunnable(fullViewName1, null));
// wait till the thread makes the rpc to add the column
boolean result = latch1.await(2, TimeUnit.MINUTES);
if (!result) {
@@ -984,46 +1063,116 @@ public class ViewIT extends SplitSystemCatalogIT {
tableDdl = "ALTER TABLE " + fullTableName + " ADD v3 INTEGER";
try {
// add the same column to the base table with a different type
- conn.createStatement().execute(tableDdl);
- fail("Creating a view while concurrently dropping the base
table should fail");
- } catch (ConcurrentTableMutationException e) {
+ stmt.execute(tableDdl);
+ fail("Adding a column of a to a base table should fail when
the same column of a "
+ + "different type is being added to a child view");
+ } catch (ConcurrentTableMutationException ignored) {
}
latch2.countDown();
Exception e = future.get();
assertNull(e);
- // add a the same column to the another view to ensure that the
cell used
+ // add the same column to the another view to ensure that the
cell used
// to prevent concurrent modifications was removed
ddl = "CREATE VIEW " + fullViewName2 + " (v2 VARCHAR) AS SELECT *
FROM "
+ fullTableName + " WHERE k = 6";
- conn.createStatement().execute(ddl);
+ stmt.execute(ddl);
tableDdl = "ALTER VIEW " + fullViewName2 + " ADD v3 INTEGER";
- conn.createStatement().execute(tableDdl);
+ stmt.execute(tableDdl);
+ }
+ }
+
+ // Test that we do a checkAndPut even in case of tenant-specific
connections (see PHOENIX-6075)
+ @Test
+ public void testConcurrentAddSameColumnDifferentTypeTenantView() throws
Exception {
+ String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
+ String fullViewName1 = SLOW_VIEWNAME_PREFIX + "_" +
generateUniqueName();
+ String fullViewName2 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
+ String tenantId = "t001";
+ String tableDdl = "CREATE TABLE " + fullTableName
+ + " (TENANT_ID VARCHAR NOT NULL, k INTEGER NOT NULL, v1 DATE
CONSTRAINT PK"
+ + " PRIMARY KEY (TENANT_ID, k)) MULTI_TENANT=true"
+ + (!tableDDLOptions.isEmpty() ? ", " : "") + tableDDLOptions;
+ String viewDdl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS
SELECT * FROM "
+ + fullTableName + " WHERE k = 6";
+
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
+ // create a multi-tenant base table
+ stmt.execute(tableDdl);
+
+ Properties props = new Properties();
+ props.setProperty(PhoenixRuntime.TENANT_ID_ATTRIB, tenantId);
+ try (Connection tenantConn = DriverManager.getConnection(getUrl(),
props);
+ Statement tenantStmt = tenantConn.createStatement()) {
+ // create a tenant-specific view
+ tenantStmt.execute(viewDdl);
+ }
+
+ latch1 = new CountDownLatch(1);
+ latch2 = new CountDownLatch(1);
+ ExecutorService executorService = Executors.newFixedThreadPool(1,
new ThreadFactory() {
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread t = Executors.defaultThreadFactory().newThread(r);
+ t.setDaemon(true);
+ t.setPriority(Thread.MIN_PRIORITY);
+ return t;
+ }
+ });
+
+ // add a column with the same name and different type to the
tenant-specific view in a
+ // separate thread (which will take some time to complete)
+ Future<Exception> future = executorService.submit(
+ new AddColumnRunnable(fullViewName1, tenantId));
+ // wait till the thread makes the rpc to add the column
+ boolean result = latch1.await(2, TimeUnit.MINUTES);
+ if (!result) {
+ fail("The tenant-specific view creation rpc look too long");
+ }
+ tableDdl = "ALTER TABLE " + fullTableName + " ADD v3 INTEGER";
+ try {
+ // add the same column to the base table with a different type
+ stmt.execute(tableDdl);
+ fail("Adding a column of a to a base table should fail when
the same column of a "
+ + "different type is being added to a child view");
+ } catch (ConcurrentTableMutationException ignored) {
+ }
+ latch2.countDown();
+
+ Exception e = future.get();
+ assertNull(e);
+
+ // add the same column to the another view to ensure that the
cell used
+ // to prevent concurrent modifications was removed
+ viewDdl = "CREATE VIEW " + fullViewName2 + " (v2 VARCHAR) AS
SELECT * FROM "
+ + fullTableName + " WHERE k = 6";
+ stmt.execute(viewDdl);
+ tableDdl = "ALTER VIEW " + fullViewName2 + " ADD v3 INTEGER";
+ stmt.execute(tableDdl);
}
}
@Test
public void testConcurrentAddDifferentColumn() throws Exception {
- try (Connection conn = DriverManager.getConnection(getUrl())) {
+ try (Connection conn = DriverManager.getConnection(getUrl());
+ Statement stmt = conn.createStatement()) {
String fullTableName = SchemaUtil.getTableName(SCHEMA1,
generateUniqueName());
String fullViewName1 = SLOW_VIEWNAME_PREFIX + "_" +
generateUniqueName();
String fullViewName2 = SchemaUtil.getTableName(SCHEMA3,
generateUniqueName());
String fullViewName3 = SchemaUtil.getTableName(SCHEMA4,
generateUniqueName());
// create base table
- String tableDdl =
- "CREATE TABLE " + fullTableName + " (k INTEGER NOT NULL
PRIMARY KEY, v1 DATE)"
- + tableDDLOptions;
- conn.createStatement().execute(tableDdl);
+ String tableDdl = "CREATE TABLE " + fullTableName
+ + " (k INTEGER NOT NULL PRIMARY KEY, v1 DATE)" +
tableDDLOptions;
+ stmt.execute(tableDdl);
// create two views
- String ddl =
- "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS SELECT
* FROM "
- + fullTableName + " WHERE k = 6";
- conn.createStatement().execute(ddl);
- ddl =
- "CREATE VIEW " + fullViewName3 + " (v2 VARCHAR) AS SELECT
* FROM "
- + fullTableName + " WHERE k = 7";
- conn.createStatement().execute(ddl);
+ String ddl = "CREATE VIEW " + fullViewName1 + " (v2 VARCHAR) AS
SELECT * FROM "
+ + fullTableName + " WHERE k = 6";
+ stmt.execute(ddl);
+ ddl = "CREATE VIEW " + fullViewName3 + " (v2 VARCHAR) AS SELECT *
FROM "
+ + fullTableName + " WHERE k = 7";
+ stmt.execute(ddl);
latch1 = new CountDownLatch(1);
latch2 = new CountDownLatch(1);
@@ -1038,7 +1187,8 @@ public class ViewIT extends SplitSystemCatalogIT {
});
// add a column to a view in a separate thread (we slow this
operation down)
- Future<Exception> future = executorService.submit(new
AddColumnRunnable(fullViewName1));
+ Future<Exception> future = executorService.submit(
+ new AddColumnRunnable(fullViewName1, null));
// wait till the thread makes the rpc to add the column
boolean result = latch1.await(2, TimeUnit.MINUTES);
if (!result) {
@@ -1047,33 +1197,34 @@ public class ViewIT extends SplitSystemCatalogIT {
tableDdl = "ALTER VIEW " + fullViewName3 + " ADD v4 INTEGER";
try {
// add a column to another view
- conn.createStatement().execute(tableDdl);
+ stmt.execute(tableDdl);
if (columnEncoded) {
// this should fail as the previous add column is still
not complete
- fail(
- "Adding columns to two different views concurrently
where the base table uses encoded column should fail");
+ fail("Adding columns to two different views concurrently
where the base table"
+ + " uses encoded column should fail");
}
} catch (ConcurrentTableMutationException e) {
if (!columnEncoded) {
// this should not fail as we don't need to update the
parent table for non
// column encoded tables
- fail(
- "Adding columns to two different views concurrently
where the base table does not use encoded columns should succeed");
+ fail("Adding columns to two different views concurrently
where the base table"
+ + " does not use encoded columns should succeed");
}
}
latch2.countDown();
Exception e = future.get();
- // if the base table uses column encoding then the add column
operation for fullViewName1 fails
+ // if the base table uses column encoding then the add column
operation for
+ // fullViewName1 fails
assertNull(e);
- // add a the same column to the another view to ensure that the
cell used
+ // add the same column to the another view to ensure that the
cell used
// to prevent concurrent modifications was removed
- ddl = "CREATE VIEW " + fullViewName2 + " (v2 VARCHAR) AS SELECT *
FROM "
+ ddl = "CREATE VIEW " + fullViewName2 + " (v2 VARCHAR) AS SELECT *
FROM "
+ fullTableName + " WHERE k = 6";
- conn.createStatement().execute(ddl);
+ stmt.execute(ddl);
tableDdl = "ALTER VIEW " + fullViewName2 + " ADD v3 INTEGER";
- conn.createStatement().execute(tableDdl);
+ stmt.execute(tableDdl);
}
}
@@ -1082,8 +1233,8 @@ public class ViewIT extends SplitSystemCatalogIT {
try (Connection conn = DriverManager.getConnection(getUrl())) {
String viewDDL = "CREATE VIEW " + generateUniqueName() + " AS
SELECT * FROM " +
"SYSTEM.CATALOG";
- try {
- conn.createStatement().execute(viewDDL);
+ try (Statement stmt = conn.createStatement()){
+ stmt.execute(viewDDL);
fail("Should have thrown an exception");
} catch (SQLException sqlE) {
assertEquals("Expected a different Error code",
@@ -1093,7 +1244,7 @@ public class ViewIT extends SplitSystemCatalogIT {
}
}
- private class CreateViewRunnable implements Callable<Exception> {
+ private static class CreateViewRunnable implements Callable<Exception> {
private final String fullTableName;
private final String fullViewName;
@@ -1105,11 +1256,11 @@ public class ViewIT extends SplitSystemCatalogIT {
@Override
public Exception call() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- try (Connection conn = DriverManager.getConnection(getUrl(),
props)) {
- String ddl =
- "CREATE VIEW " + fullViewName + " (v2 VARCHAR) AS
SELECT * FROM "
- + fullTableName + " WHERE k = 5";
- conn.createStatement().execute(ddl);
+ try (Connection conn = DriverManager.getConnection(getUrl(),
props);
+ Statement stmt = conn.createStatement()) {
+ String ddl = "CREATE VIEW " + fullViewName + " (v2 VARCHAR) AS
SELECT * FROM "
+ + fullTableName + " WHERE k = 5";
+ stmt.execute(ddl);
} catch (SQLException e) {
return e;
}
@@ -1117,19 +1268,25 @@ public class ViewIT extends SplitSystemCatalogIT {
}
}
- private class AddColumnRunnable implements Callable<Exception> {
+ private static class AddColumnRunnable implements Callable<Exception> {
private final String fullViewName;
+ private final String tenantId;
- public AddColumnRunnable(String fullViewName) {
+ public AddColumnRunnable(String fullViewName, String tenantId) {
this.fullViewName = fullViewName;
+ this.tenantId = tenantId;
}
@Override
public Exception call() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
- try (Connection conn = DriverManager.getConnection(getUrl(),
props)) {
+ if (this.tenantId != null) {
+ props.setProperty(PhoenixRuntime.TENANT_ID_ATTRIB,
this.tenantId);
+ }
+ try (Connection conn = DriverManager.getConnection(getUrl(),
props);
+ Statement stmt = conn.createStatement()) {
String ddl = "ALTER VIEW " + fullViewName + " ADD v3 CHAR(15)";
- conn.createStatement().execute(ddl);
+ stmt.execute(ddl);
} catch (SQLException e) {
return e;
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java
index 0e0554e..8f3273e 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java
@@ -389,11 +389,13 @@ public class DelegateConnectionQueryServices extends
DelegateQueryServices imple
@Override
public boolean writeMutexCell(String tenantId, String schemaName, String
tableName,
String columnName, String familyName) throws SQLException {
- return true;
+ return getDelegate()
+ .writeMutexCell(tenantId, schemaName, tableName, columnName,
familyName);
}
@Override
public void deleteMutexCell(String tenantId, String schemaName, String
tableName,
String columnName, String familyName) throws SQLException {
+ getDelegate().deleteMutexCell(tenantId, schemaName, tableName,
columnName, familyName);
}
}
\ No newline at end of file
