Repository: phoenix Updated Branches: refs/heads/master d2be5028f -> 2c58b1fc9
PHOENIX-1571 Replace hard-coded date Replace a "far away future" hard-coded date in an integration test with something that is no longer in the past. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2c58b1fc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2c58b1fc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2c58b1fc Branch: refs/heads/master Commit: 2c58b1fc9b25c5cd5da872782b37bbdccf259c79 Parents: d2be502 Author: Gabriel Reid <gabri...@ngdata.com> Authored: Fri Jan 2 08:14:15 2015 +0100 Committer: Gabriel Reid <gabri...@ngdata.com> Committed: Fri Jan 2 08:14:15 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/phoenix/end2end/VariableLengthPKIT.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2c58b1fc/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java index 07d6b32..e836fec 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VariableLengthPKIT.java @@ -266,7 +266,7 @@ public class VariableLengthPKIT extends BaseClientManagedTimeIT { @Test public void testSkipScan() throws Exception { long ts = nextTimestamp(); - String query = "SELECT HOST FROM PTSDB WHERE INST='abc' AND DATE>=TO_DATE('1970-01-01 00:00:00') AND DATE <TO_DATE('2015-01-01 00:00:00')"; + String query = "SELECT HOST FROM PTSDB WHERE INST='abc' AND DATE>=TO_DATE('1970-01-01 00:00:00') AND DATE <TO_DATE('2171-01-01 00:00:00')"; String url = getUrl() + ";" + PhoenixRuntime.CURRENT_SCN_ATTRIB + "=" + (ts + 5); // Run query at timestamp 5 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); Connection conn = DriverManager.getConnection(url, props); @@ -776,7 +776,7 @@ public class VariableLengthPKIT extends BaseClientManagedTimeIT { } conn.commit(); conn.close(); - + // Query at a time after the upsert to confirm they took place props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+1)); conn = DriverManager.getConnection(getUrl(), props); @@ -1378,7 +1378,7 @@ public class VariableLengthPKIT extends BaseClientManagedTimeIT { String ddl = "create table t (k INTEGER NOT NULL PRIMARY KEY, name VARCHAR)"; conn.createStatement().execute(ddl); conn.close(); - + String dml = "upsert into t values(?,?)"; props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+2)); conn = DriverManager.getConnection(url, props); @@ -1391,7 +1391,7 @@ public class VariableLengthPKIT extends BaseClientManagedTimeIT { } conn.commit(); conn.close(); - + // This matches what Oracle returns for regexp_substr, even through // it seems oke for "satax", it should return null. String query = "select regexp_substr(name,'[^s]+',1) from t limit 5";