PHOENIX-2846 Fix CreateTableIT.testCreateTableWithoutSchema()
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3dafacb0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3dafacb0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3dafacb0 Branch: refs/heads/4.x-HBase-1.0 Commit: 3dafacb088f45e4d89fb79ffbb0f28596d854fdd Parents: 7a3a67b Author: James Taylor <[email protected]> Authored: Fri Apr 22 16:54:52 2016 -0700 Committer: James Taylor <[email protected]> Committed: Fri Apr 22 18:47:47 2016 -0700 ---------------------------------------------------------------------- .../org/apache/phoenix/end2end/CreateTableIT.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3dafacb0/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java index af25373..30bdb41 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java @@ -42,7 +42,9 @@ import org.apache.phoenix.schema.NewerTableAlreadyExistsException; import org.apache.phoenix.schema.SchemaNotFoundException; import org.apache.phoenix.schema.TableAlreadyExistsException; import org.apache.phoenix.util.PhoenixRuntime; +import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.TestUtil; import org.junit.Test; @@ -468,11 +470,13 @@ public class CreateTableIT extends BaseClientManagedTimeIT { @Test public void testCreateTableWithoutSchema() throws Exception { + long ts = nextTimestamp(); + Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES); + props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts)); + props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, Boolean.toString(true)); String createSchemaDDL = "CREATE SCHEMA T_SCHEMA"; String createTableDDL = "CREATE TABLE T_SCHEMA.TEST(pk INTEGER PRIMARY KEY)"; String dropTableDDL = "DROP TABLE T_SCHEMA.TEST"; - Properties props = new Properties(); - props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, Boolean.toString(true)); try (Connection conn = DriverManager.getConnection(getUrl(), props)) { try { conn.createStatement().execute(createTableDDL); @@ -481,9 +485,16 @@ public class CreateTableIT extends BaseClientManagedTimeIT { //expected } conn.createStatement().execute(createSchemaDDL); + } + props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+10)); + try (Connection conn = DriverManager.getConnection(getUrl(), props)) { conn.createStatement().execute(createTableDDL); + } + props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+20)); + try (Connection conn = DriverManager.getConnection(getUrl(), props)) { conn.createStatement().execute(dropTableDDL); } + props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+30)); props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, Boolean.toString(false)); try (Connection conn = DriverManager.getConnection(getUrl(), props);) { conn.createStatement().execute(createTableDDL);
