phoenix git commit: PHOENIX-1571 Replace hard-coded date

2015-01-05 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.2 77c89b084 - 225530326


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/22553032
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/22553032
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/22553032

Branch: refs/heads/4.2
Commit: 2255303267ff664d584aa3b80104f6e5755384a0
Parents: 77c89b0
Author: Gabriel Reid gabri...@ngdata.com
Authored: Fri Jan 2 08:14:15 2015 +0100
Committer: James Taylor jtay...@salesforce.com
Committed: Mon Jan 5 09:59:44 2015 -0800

--
 .../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/22553032/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;



phoenix git commit: PHOENIX-1571 Replace hard-coded date

2015-01-05 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/3.2 0b975affb - c8065c9d5


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/c8065c9d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c8065c9d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c8065c9d

Branch: refs/heads/3.2
Commit: c8065c9d5b6870c37fac933adc8741d3e6e54f0a
Parents: 0b975af
Author: Gabriel Reid gabri...@ngdata.com
Authored: Fri Jan 2 08:14:15 2015 +0100
Committer: James Taylor jtay...@salesforce.com
Committed: Mon Jan 5 10:05:07 2015 -0800

--
 .../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/c8065c9d/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;



phoenix git commit: PHOENIX-1571 Replace hard-coded date

2015-01-01 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/4.0 e1b99c9d8 - 61df613bc


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/61df613b
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/61df613b
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/61df613b

Branch: refs/heads/4.0
Commit: 61df613bcbfdfbe59fc624ec030751009a7b8a00
Parents: e1b99c9
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:15:37 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/61df613b/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;



phoenix git commit: PHOENIX-1571 Replace hard-coded date

2015-01-01 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/3.0 abb5c24f4 - 912e530ae


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/912e530a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/912e530a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/912e530a

Branch: refs/heads/3.0
Commit: 912e530aecc5918daba493b97b6da81758ba0d22
Parents: abb5c24
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:15:53 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/912e530a/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;



phoenix git commit: PHOENIX-1571 Replace hard-coded date

2015-01-01 Thread greid
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;