You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sk...@apache.org on 2020/12/01 18:02:55 UTC
[phoenix] branch 4.x-PHOENIX-5182 updated: PHOENIX-6199 Generate
different query plan depending upon if the source (#958)
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.x-PHOENIX-5182
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-PHOENIX-5182 by this push:
new 92c8579 PHOENIX-6199 Generate different query plan depending upon if the source (#958)
92c8579 is described below
commit 92c8579986319833e12a5506ec14de93d2d54f24
Author: tkhurana <kh...@gmail.com>
AuthorDate: Tue Dec 1 10:02:46 2020 -0800
PHOENIX-6199 Generate different query plan depending upon if the source (#958)
is index table or data table
---
.../PhoenixServerBuildIndexInputFormatIT.java | 88 ++++++++++++++++++++++
.../PhoenixServerBuildIndexInputFormat.java | 12 ++-
2 files changed, 97 insertions(+), 3 deletions(-)
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormatIT.java b/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormatIT.java
new file mode 100644
index 0000000..ffd737a
--- /dev/null
+++ b/phoenix-core/src/it/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormatIT.java
@@ -0,0 +1,88 @@
+package org.apache.phoenix.mapreduce;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.phoenix.compile.QueryPlan;
+import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.mapreduce.index.IndexScrutinyTool.SourceTable;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
+import org.apache.phoenix.schema.PTable;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.SchemaUtil;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.util.Properties;
+
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+
+public class PhoenixServerBuildIndexInputFormatIT extends ParallelStatsDisabledIT {
+
+ @Test
+ public void testQueryPlanWithSource() throws Exception {
+ PhoenixServerBuildIndexInputFormat inputFormat;
+ Configuration conf = new Configuration(getUtility().getConfiguration());
+ String schemaName = generateUniqueName();
+ String dataTableName = generateUniqueName();
+ String dataTableFullName = SchemaUtil.getTableName(schemaName, dataTableName);
+ String indexTableName = generateUniqueName();
+ String indexTableFullName = SchemaUtil.getTableName(schemaName, indexTableName);
+ String viewName = generateUniqueName();
+ String viewFullName = SchemaUtil.getTableName(schemaName, viewName);
+ String viewIndexName = generateUniqueName();
+ String viewIndexFullName = SchemaUtil.getTableName(schemaName, viewIndexName);
+ Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+ try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+ conn.createStatement().execute("CREATE TABLE " + dataTableFullName
+ + " (ID INTEGER NOT NULL PRIMARY KEY, VAL1 INTEGER, VAL2 INTEGER) ");
+ conn.createStatement().execute(String.format(
+ "CREATE INDEX %s ON %s (VAL1) INCLUDE (VAL2)", indexTableName, dataTableFullName));
+ conn.createStatement().execute("CREATE VIEW " + viewFullName +
+ " AS SELECT * FROM " + dataTableFullName);
+ conn.commit();
+
+ conn.createStatement().execute(String.format(
+ "CREATE INDEX %s ON %s (VAL1) INCLUDE (VAL2)", viewIndexName, viewFullName));
+
+ PhoenixConfigurationUtil.setIndexToolDataTableName(conf, dataTableFullName);
+ PhoenixConfigurationUtil.setIndexToolIndexTableName(conf, indexTableFullName);
+ // use data table as source (default)
+ assertTableSource(conf, conn);
+
+ // use index table as source
+ PhoenixConfigurationUtil.setIndexToolSourceTable(conf, SourceTable.INDEX_TABLE_SOURCE);
+ assertTableSource(conf, conn);
+
+ PhoenixConfigurationUtil.setIndexToolDataTableName(conf, viewFullName);
+ PhoenixConfigurationUtil.setIndexToolIndexTableName(conf, viewIndexFullName);
+ PhoenixConfigurationUtil.setIndexToolSourceTable(conf, SourceTable.DATA_TABLE_SOURCE);
+
+ assertTableSource(conf, conn);
+
+ PhoenixConfigurationUtil.setIndexToolSourceTable(conf, SourceTable.INDEX_TABLE_SOURCE);
+ assertTableSource(conf, conn);
+ }
+ }
+
+ private void assertTableSource(Configuration conf, Connection conn) throws Exception {
+ String dataTableFullName = PhoenixConfigurationUtil.getIndexToolDataTableName(conf);
+ String indexTableFullName = PhoenixConfigurationUtil.getIndexToolIndexTableName(conf);
+ SourceTable sourceTable = PhoenixConfigurationUtil.getIndexToolSourceTable(conf);
+ boolean fromIndex = sourceTable.equals(SourceTable.INDEX_TABLE_SOURCE);
+ PTable pDataTable = PhoenixRuntime.getTable(conn, dataTableFullName);
+ PTable pIndexTable = PhoenixRuntime.getTable(conn, indexTableFullName);
+
+ PhoenixServerBuildIndexInputFormat inputFormat = new PhoenixServerBuildIndexInputFormat();
+ QueryPlan queryPlan = inputFormat.getQueryPlan(Job.getInstance(), conf);
+ PTable actual = queryPlan.getTableRef().getTable();
+
+ if (!fromIndex) {
+ assertEquals(pDataTable, actual);
+ } else {
+ assertEquals(pIndexTable, actual);
+ }
+ }
+}
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormat.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormat.java
index 6f9c639..5ade9b5 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormat.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixServerBuildIndexInputFormat.java
@@ -30,7 +30,9 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.mapreduce.InputFormat;
import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.lib.db.DBWritable;
-import org.apache.phoenix.compile.*;
+import org.apache.phoenix.compile.MutationPlan;
+import org.apache.phoenix.compile.QueryPlan;
+import org.apache.phoenix.compile.ServerBuildIndexCompiler;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
import org.apache.phoenix.coprocessor.IndexRebuildRegionScanner;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
@@ -42,8 +44,12 @@ import org.apache.phoenix.mapreduce.index.IndexScrutinyTool.SourceTable;
import org.apache.phoenix.mapreduce.util.ConnectionUtil;
import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.schema.*;
-import org.apache.phoenix.util.*;
+import org.apache.phoenix.schema.PTable;
+import org.apache.phoenix.schema.TableRef;
+import org.apache.phoenix.util.ByteUtil;
+import org.apache.phoenix.util.EnvironmentEdgeManager;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.ScanUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;