Repository: phoenix Updated Branches: refs/heads/master 7e811f4b1 -> 4094bd2d0
Removing too large of a test Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4094bd2d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4094bd2d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4094bd2d Branch: refs/heads/master Commit: 4094bd2d02aa568885b371491a0f308cf064c242 Parents: 7e811f4 Author: James Taylor <jtay...@salesforce.com> Authored: Sun Jul 20 13:00:16 2014 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Sun Jul 20 13:00:16 2014 -0700 ---------------------------------------------------------------------- .../apache/phoenix/end2end/UpsertSelectIT.java | 52 -------------------- 1 file changed, 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4094bd2d/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java index d3a9ef6..71e4152 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java @@ -746,58 +746,6 @@ public class UpsertSelectIT extends BaseClientManagedTimeIT { } @Test - public void testUpsertSelectWithSequenceAndSaltingAndLargeDataSet() throws Exception { - - int numOfRecords = 10000; - long ts = nextTimestamp(); - Properties props = new Properties(); - props.setProperty(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(64)); - props.setProperty(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(500)); - props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts)); - Connection conn = DriverManager.getConnection(getUrl(), props); - String ddl = "CREATE TABLE IF NOT EXISTS DUMMY_CURSOR_STORAGE (" - + "ORGANIZATION_ID CHAR(15) NOT NULL, QUERY_ID CHAR(15) NOT NULL, CURSOR_ORDER BIGINT NOT NULL " - + "CONSTRAINT MAIN_PK PRIMARY KEY (ORGANIZATION_ID, QUERY_ID, CURSOR_ORDER) " - + ") SALT_BUCKETS = 64"; - conn.createStatement().execute(ddl); - conn.createStatement().execute("CREATE TABLE DUMMY_SEQ_TEST_DATA " + - "(ORGANIZATION_ID CHAR(15) NOT NULL, k1 integer not null, v1 integer not null " + - "CONSTRAINT PK PRIMARY KEY (ORGANIZATION_ID, k1, v1) ) VERSIONS=1, SALT_BUCKETS = 64"); - conn.createStatement().execute("create sequence s cache " + Integer.MAX_VALUE); - conn.close(); - - props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10)); - conn = DriverManager.getConnection(getUrl(), props); - for (int i = 0; i < numOfRecords; i++) { - conn.createStatement().execute("upsert into DUMMY_SEQ_TEST_DATA values ('00Dxx0000001gEH'," + i + "," + i + ")"); - } - conn.commit(); - - props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 15)); - conn = DriverManager.getConnection(getUrl(), props); - conn.setAutoCommit(true); - conn.createStatement().execute("upsert into DUMMY_CURSOR_STORAGE select '00Dxx0000001gEH', 'MyQueryId', next value for s FROM DUMMY_SEQ_TEST_DATA"); - - props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 20)); - conn = DriverManager.getConnection(getUrl(), props); - ResultSet rs = conn.createStatement().executeQuery("select count(*) from DUMMY_CURSOR_STORAGE"); - - assertTrue(rs.next()); - assertEquals(numOfRecords, rs.getLong(1)); - conn.close(); - - props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 25)); - ResultSet rs2 = conn.createStatement().executeQuery("select cursor_order from DUMMY_CURSOR_STORAGE"); - long seq = 1; - while (rs2.next()) { - assertEquals(seq, rs2.getLong(1)); - seq++; - } - conn.close(); - - } - - @Test public void testUpsertSelectWithSequenceAndOrderByWithSalting() throws Exception { int numOfRecords = 200;
