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 2015/04/24 21:59:57 UTC
phoenix git commit: PHOENIX-1917 Correlated subquery fails if the
inner query contains JOIN
Repository: phoenix
Updated Branches:
refs/heads/master 96054823b -> 20e772caf
PHOENIX-1917 Correlated subquery fails if the inner query contains JOIN
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/20e772ca
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/20e772ca
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/20e772ca
Branch: refs/heads/master
Commit: 20e772caf23eb853a458a80a0c5b70affaa44944
Parents: 9605482
Author: maryannxue <we...@intel.com>
Authored: Fri Apr 24 15:59:39 2015 -0400
Committer: maryannxue <we...@intel.com>
Committed: Fri Apr 24 15:59:39 2015 -0400
----------------------------------------------------------------------
.../org/apache/phoenix/end2end/SubqueryIT.java | 18 ++++++++++++++++++
.../apache/phoenix/compile/SubqueryRewriter.java | 2 ++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/20e772ca/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 13354da..794c4f5 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
@@ -648,6 +648,24 @@ public class SubqueryIT extends BaseHBaseManagedTimeIT {
assertFalse(rs.next());
+ query = "SELECT \"order_id\", name FROM " + JOIN_ORDER_TABLE_FULL_NAME + " o JOIN " + JOIN_ITEM_TABLE_FULL_NAME + " i ON o.\"item_id\" = i.\"item_id\" WHERE quantity = (SELECT max(quantity) FROM " + JOIN_ITEM_TABLE_FULL_NAME + " i2 JOIN " + JOIN_ORDER_TABLE_FULL_NAME + " q ON i2.\"item_id\" = q.\"item_id\" WHERE o.\"item_id\" = i2.\"item_id\")";
+ statement = conn.prepareStatement(query);
+ rs = statement.executeQuery();
+ assertTrue (rs.next());
+ assertEquals(rs.getString(1), "000000000000001");
+ assertEquals(rs.getString(2), "T1");
+ assertTrue (rs.next());
+ assertEquals(rs.getString(1), "000000000000003");
+ assertEquals(rs.getString(2), "T2");
+ assertTrue (rs.next());
+ assertEquals(rs.getString(1), "000000000000004");
+ assertEquals(rs.getString(2), "T6");
+ assertTrue (rs.next());
+ assertEquals(rs.getString(1), "000000000000005");
+ assertEquals(rs.getString(2), "T3");
+
+ assertFalse(rs.next());
+
query = "SELECT name from " + JOIN_CUSTOMER_TABLE_FULL_NAME + " WHERE \"customer_id\" IN (SELECT \"customer_id\" FROM " + JOIN_ITEM_TABLE_FULL_NAME + " i JOIN " + JOIN_ORDER_TABLE_FULL_NAME + " o ON o.\"item_id\" = i.\"item_id\" WHERE i.name = 'T2' OR quantity > (SELECT avg(quantity) FROM " + JOIN_ORDER_TABLE_FULL_NAME + " q WHERE o.\"item_id\" = q.\"item_id\"))";
statement = conn.prepareStatement(query);
rs = statement.executeQuery();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/20e772ca/phoenix-core/src/main/java/org/apache/phoenix/compile/SubqueryRewriter.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/SubqueryRewriter.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/SubqueryRewriter.java
index 8e887a8..1746d8a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/SubqueryRewriter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/SubqueryRewriter.java
@@ -52,6 +52,7 @@ import org.apache.phoenix.parse.TableName;
import org.apache.phoenix.parse.TableNode;
import org.apache.phoenix.schema.ColumnFamilyNotFoundException;
import org.apache.phoenix.schema.ColumnNotFoundException;
+import org.apache.phoenix.schema.TableNotFoundException;
import com.google.common.collect.Lists;
@@ -557,6 +558,7 @@ public class SubqueryRewriter extends ParseNodeRewriter {
localResolver.resolveColumn(node.getSchemaName(), node.getTableName(), node.getName());
addType(true);
return null;
+ } catch (TableNotFoundException e) {
} catch (ColumnNotFoundException e) {
} catch (ColumnFamilyNotFoundException e) {
}