You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2014/11/26 19:02:56 UTC
phoenix git commit: PHOENIX-1431 DELETE using Subqueries
Repository: phoenix
Updated Branches:
refs/heads/master 192ebafe6 -> ba0409f2b
PHOENIX-1431 DELETE using Subqueries
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ba0409f2
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ba0409f2
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ba0409f2
Branch: refs/heads/master
Commit: ba0409f2bed2098d12261998cfe1b70d9f3abb35
Parents: 192ebaf
Author: maryannxue <ma...@apache.org>
Authored: Wed Nov 26 13:02:40 2014 -0500
Committer: maryannxue <ma...@apache.org>
Committed: Wed Nov 26 13:02:40 2014 -0500
----------------------------------------------------------------------
.../org/apache/phoenix/end2end/SubqueryIT.java | 39 ++++++++++++++++++++
.../apache/phoenix/compile/DeleteCompiler.java | 8 +++-
2 files changed, 46 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba0409f2/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
index 0e5dcc0..8e7e6e9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java
@@ -994,5 +994,44 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
}
}
+ @Test
+ public void testSubqueryWithDelete() throws Exception {
+ String tempTable = "TEMP_SUBQUERY_TABLE";
+ Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+ Connection conn = DriverManager.getConnection(getUrl(), props);
+ conn.setAutoCommit(true);
+ try {
+ conn.createStatement().execute("CREATE TABLE " + tempTable
+ + " (item_id varchar not null primary key, "
+ + " name varchar)");
+ conn.createStatement().execute("UPSERT INTO " + tempTable + "(item_id, name)"
+ + " SELECT \"item_id\", name FROM " + JOIN_ITEM_TABLE_FULL_NAME);
+
+ String query = "SELECT count(*) FROM " + JOIN_ITEM_TABLE_FULL_NAME;
+ PreparedStatement statement = conn.prepareStatement(query);
+ ResultSet rs = statement.executeQuery();
+ assertTrue (rs.next());
+ assertEquals(rs.getInt(1), 7);
+ assertFalse(rs.next());
+
+ conn.createStatement().execute("DELETE FROM " + tempTable + " WHERE item_id IN ("
+ + " SELECT \"item_id\" FROM " + JOIN_ORDER_TABLE_FULL_NAME + ")");
+
+ query = "SELECT name FROM " + tempTable + " ORDER BY item_id";
+ statement = conn.prepareStatement(query);
+ rs = statement.executeQuery();
+ assertTrue (rs.next());
+ assertEquals(rs.getString(1), "T4");
+ assertTrue (rs.next());
+ assertEquals(rs.getString(1), "T5");
+ assertTrue (rs.next());
+ assertEquals(rs.getString(1), "INVALID-1");
+
+ assertFalse(rs.next());
+ } finally {
+ conn.close();
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba0409f2/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
index 92abd77..b04d6e3 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
@@ -37,6 +37,7 @@ import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.execute.AggregatePlan;
+import org.apache.phoenix.execute.BaseQueryPlan;
import org.apache.phoenix.execute.MutationState;
import org.apache.phoenix.filter.SkipScanFilter;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
@@ -323,6 +324,11 @@ public class DeleteCompiler {
delete.getOrderBy(), delete.getLimit(),
delete.getBindCount(), false, false);
select = StatementNormalizer.normalize(select, resolver);
+ SelectStatement transformedSelect = SubqueryRewriter.transform(select, resolver, connection);
+ if (transformedSelect != select) {
+ resolver = FromCompiler.getResolverForQuery(transformedSelect, connection);
+ select = StatementNormalizer.normalize(transformedSelect, resolver);
+ }
parallelIteratorFactory = hasLimit ? null : new DeletingParallelIteratorFactory(connection);
QueryOptimizer optimizer = new QueryOptimizer(services);
queryPlans = Lists.newArrayList(mayHaveImmutableIndexes
@@ -395,7 +401,7 @@ public class DeleteCompiler {
for (int i = 0; i < tableRefs.length; i++) {
final TableRef tableRef = tableRefs[i];
final QueryPlan plan = queryPlans.get(i);
- if (!plan.getTableRef().equals(tableRef)) {
+ if (!plan.getTableRef().equals(tableRef) || !(plan instanceof BaseQueryPlan)) {
runOnServer = false;
noQueryReqd = false; // FIXME: why set this to false in this case?
}