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/03/14 03:30:41 UTC
phoenix git commit: Add another join case - same as
HashJoinIT.testDefaultJoin()
Repository: phoenix
Updated Branches:
refs/heads/calcite 9434d5e6e -> 44800825b
Add another join case - same as HashJoinIT.testDefaultJoin()
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/44800825
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/44800825
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/44800825
Branch: refs/heads/calcite
Commit: 44800825b64bb3c7573cc6acf86f296b2c4db9f7
Parents: 9434d5e
Author: maryannxue <we...@intel.com>
Authored: Fri Mar 13 22:30:28 2015 -0400
Committer: maryannxue <we...@intel.com>
Committed: Fri Mar 13 22:30:28 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/phoenix/calcite/CalciteTest.java | 14 +++++++-------
.../org/apache/phoenix/calcite/PhoenixSchema.java | 2 +-
.../test/java/org/apache/phoenix/query/BaseTest.java | 2 +-
.../test/java/org/apache/phoenix/util/TestUtil.java | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/44800825/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
index cf2a3a0..b125ac9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteTest.java
@@ -226,13 +226,13 @@ public class CalciteTest extends BaseClientManagedTimeIT {
{"00A223122312312", "a", "00D300000000XHP"},
{"00A323122312312", "a", "00D300000000XHP"},
{"00A423122312312", "a", "00D300000000XHP"}});
-// testConnect("SELECT item.\"item_id\", item.name, supp.\"supplier_id\", supp.name FROM " + JOIN_ITEM_TABLE_FULL_NAME + " item JOIN " + JOIN_SUPPLIER_TABLE_FULL_NAME + " supp ON item.\"supplier_id\" = supp.\"supplier_id\"",
-// new Object[][] {{"0000000001", "T1", "0000000001", "S1"},
-// {"0000000002", "T2", "0000000001", "S1"},
-// {"0000000003", "T3", "0000000002", "S2"},
-// {"0000000004", "T4", "0000000002", "S2"},
-// {"0000000005", "T5", "0000000005", "S5"},
-// {"0000000006", "T6", "0000000006", "S6"}});
+ testConnect("SELECT item.\"item_id\", item.name, supp.\"supplier_id\", supp.name FROM " + JOIN_ITEM_TABLE_FULL_NAME + " item JOIN " + JOIN_SUPPLIER_TABLE_FULL_NAME + " supp ON item.\"supplier_id\" = supp.\"supplier_id\"",
+ new Object[][] {{"0000000001", "T1", "0000000001", "S1"},
+ {"0000000002", "T2", "0000000001", "S1"},
+ {"0000000003", "T3", "0000000002", "S2"},
+ {"0000000004", "T4", "0000000002", "S2"},
+ {"0000000005", "T5", "0000000005", "S5"},
+ {"0000000006", "T6", "0000000006", "S6"}});
}
@Test public void testExplainPlanForSelectWhereQuery() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/44800825/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java
index d48ffca..9c4f47e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java
@@ -66,7 +66,7 @@ public class PhoenixSchema implements Schema {
@Override
public Set<String> getTableNames() {
- return ImmutableSet.of("ATABLE");
+ return ImmutableSet.of("ATABLE", "ITEMTABLE", "SUPPLIERTABLE");
}
@Override
http://git-wip-us.apache.org/repos/asf/phoenix/blob/44800825/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index 9947440..9bbcba9 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -1366,7 +1366,7 @@ public abstract class BaseTest {
}
Connection conn = DriverManager.getConnection(getUrl(), props);
try {
- conn.createStatement().execute("CREATE SEQUENCE my.seq");
+ conn.createStatement().execute("CREATE SEQUENCE IF NOT EXISTS my.seq");
// Insert into customer table
PreparedStatement stmt = conn.prepareStatement(
"upsert into " + JOIN_CUSTOMER_TABLE_FULL_NAME +
http://git-wip-us.apache.org/repos/asf/phoenix/blob/44800825/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
index 872c318..541db14 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
@@ -196,8 +196,8 @@ public class TestUtil {
public static final String JOIN_COITEM_TABLE = "CoitemTable";
public static final String JOIN_ORDER_TABLE_FULL_NAME = '"' + JOIN_SCHEMA + "\".\"" + JOIN_ORDER_TABLE + '"';
public static final String JOIN_CUSTOMER_TABLE_FULL_NAME = '"' + JOIN_SCHEMA + "\".\"" + JOIN_CUSTOMER_TABLE + '"';
- public static final String JOIN_ITEM_TABLE_FULL_NAME = '"' + JOIN_SCHEMA + "\".\"" + JOIN_ITEM_TABLE + '"';
- public static final String JOIN_SUPPLIER_TABLE_FULL_NAME = '"' + JOIN_SCHEMA + "\".\"" + JOIN_SUPPLIER_TABLE + '"';
+ public static final String JOIN_ITEM_TABLE_FULL_NAME = JOIN_ITEM_TABLE; //'"' + JOIN_SCHEMA + "\".\"" + JOIN_ITEM_TABLE + '"';
+ public static final String JOIN_SUPPLIER_TABLE_FULL_NAME = JOIN_SUPPLIER_TABLE; //'"' + JOIN_SCHEMA + "\".\"" + JOIN_SUPPLIER_TABLE + '"';
public static final String JOIN_COITEM_TABLE_FULL_NAME = '"' + JOIN_SCHEMA + "\".\"" + JOIN_COITEM_TABLE + '"';
public static final String JOIN_ORDER_TABLE_DISPLAY_NAME = JOIN_SCHEMA + "." + JOIN_ORDER_TABLE;
public static final String JOIN_CUSTOMER_TABLE_DISPLAY_NAME = JOIN_SCHEMA + "." + JOIN_CUSTOMER_TABLE;