You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2017/10/03 22:08:23 UTC
[1/2] phoenix git commit: PHOENIX-4275 Use unique table names for
ViewIT
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.2 af5716c1b -> d79dd50ff
PHOENIX-4275 Use unique table names for ViewIT
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4bf1b224
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4bf1b224
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4bf1b224
Branch: refs/heads/4.x-HBase-1.2
Commit: 4bf1b2242e78be31e751a12455a1d98eb7fcbc8a
Parents: af5716c
Author: James Taylor <jt...@salesforce.com>
Authored: Tue Oct 3 15:03:03 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Tue Oct 3 15:06:40 2017 -0700
----------------------------------------------------------------------
.../src/it/java/org/apache/phoenix/end2end/ViewIT.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4bf1b224/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 267dbc9..1953f79 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
@@ -701,15 +701,15 @@ public class ViewIT extends BaseViewIT {
Properties props = new Properties();
Connection conn1 = DriverManager.getConnection(getUrl(), props);
conn1.setAutoCommit(true);
- String TABLE_NAME="UpdateCacheViewTest"+System.currentTimeMillis();
- String VIEW_NAME="VIEW_"+System.currentTimeMillis();
+ String tableName=generateUniqueName();
+ String viewName=generateUniqueName();
conn1.createStatement().execute(
- "CREATE TABLE "+TABLE_NAME+" (k VARCHAR PRIMARY KEY, v1 VARCHAR, v2 VARCHAR) UPDATE_CACHE_FREQUENCY=1000000");
- conn1.createStatement().execute("upsert into "+TABLE_NAME+" values ('row1', 'value1', 'key1')");
+ "CREATE TABLE "+tableName+" (k VARCHAR PRIMARY KEY, v1 VARCHAR, v2 VARCHAR) UPDATE_CACHE_FREQUENCY=1000000");
+ conn1.createStatement().execute("upsert into "+tableName+" values ('row1', 'value1', 'key1')");
conn1.createStatement().execute(
- "CREATE VIEW "+VIEW_NAME+" (v43 VARCHAR) AS SELECT * FROM "+TABLE_NAME+" WHERE v1 = 'value1'");
+ "CREATE VIEW "+viewName+" (v43 VARCHAR) AS SELECT * FROM "+tableName+" WHERE v1 = 'value1'");
ResultSet rs = conn1.createStatement()
- .executeQuery("SELECT * FROM "+TABLE_NAME+" WHERE v1 = 'value1'");
+ .executeQuery("SELECT * FROM "+tableName+" WHERE v1 = 'value1'");
assertTrue(rs.next());
}
[2/2] phoenix git commit: PHOENIX-4274 Test case for Hint query for
index on view does not use include
Posted by ja...@apache.org.
PHOENIX-4274 Test case for Hint query for index on view does not use include
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d79dd50f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d79dd50f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d79dd50f
Branch: refs/heads/4.x-HBase-1.2
Commit: d79dd50ff732f2673e1414d970cd4742e2c135de
Parents: 4bf1b22
Author: James Taylor <jt...@salesforce.com>
Authored: Tue Oct 3 15:04:30 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Tue Oct 3 15:06:56 2017 -0700
----------------------------------------------------------------------
.../phoenix/end2end/index/ViewIndexIT.java | 33 +++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d79dd50f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
index 8ea6c27..53bb550 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ViewIndexIT.java
@@ -44,7 +44,6 @@ import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.schema.PNameFactory;
-import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.TableNotFoundException;
import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.PhoenixRuntime;
@@ -52,6 +51,7 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -413,4 +413,35 @@ public class ViewIndexIT extends ParallelStatsDisabledIT {
conn.close();
}
}
+
+ @Test
+ public void testHintForIndexOnViewWithInclude() throws Exception {
+ testHintForIndexOnView(true);
+ }
+
+ @Ignore("PHOENIX-4274 Hint query for index on view does not use include")
+ @Test
+ public void testHintForIndexOnViewWithoutInclude() throws Exception {
+ testHintForIndexOnView(false);
+ }
+
+ private void testHintForIndexOnView(boolean includeColumns) throws Exception {
+ Properties props = new Properties();
+ Connection conn1 = DriverManager.getConnection(getUrl(), props);
+ conn1.setAutoCommit(true);
+ String tableName=generateUniqueName();
+ String viewName=generateUniqueName();
+ String indexName=generateUniqueName();
+ conn1.createStatement().execute(
+ "CREATE TABLE "+tableName+" (k VARCHAR PRIMARY KEY, v1 VARCHAR, v2 VARCHAR) UPDATE_CACHE_FREQUENCY=1000000");
+ conn1.createStatement().execute("upsert into "+tableName+" values ('row1', 'value1', 'key1')");
+ conn1.createStatement().execute(
+ "CREATE VIEW "+viewName+" (v3 VARCHAR, v4 VARCHAR) AS SELECT * FROM "+tableName+" WHERE v1 = 'value1'");
+ conn1.createStatement().execute("CREATE INDEX " + indexName + " ON " + viewName + "(v3)" + (includeColumns ? " INCLUDE(v4)" : ""));
+ PhoenixStatement stmt = conn1.createStatement().unwrap(PhoenixStatement.class);
+ ResultSet rs = stmt.executeQuery("SELECT /*+ INDEX(" + viewName + " " + indexName + ") */ v1 FROM " + viewName + " WHERE v3 = 'foo' ORDER BY v4");
+ assertFalse(rs.next());
+ assertEquals(indexName, stmt.getQueryPlan().getContext().getCurrentTable().getTable().getName().getString());
+ }
+
}