phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdsi...@apache.org
Subject phoenix git commit: PHOENIX-4218 Remove usage of current scn from UserDefinedFunctionsIT.testUDFsWithLatestTimestamp
Date Mon, 18 Sep 2017 18:57:03 GMT
Repository: phoenix
Updated Branches:
  refs/heads/master e455df310 -> 3fb104ee5


PHOENIX-4218 Remove usage of current scn from UserDefinedFunctionsIT.testUDFsWithLatestTimestamp


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3fb104ee
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3fb104ee
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3fb104ee

Branch: refs/heads/master
Commit: 3fb104ee56518ca066672e199bff1ed4f4bd9a7e
Parents: e455df3
Author: Thomas D'Silva <tdsilva@apache.org>
Authored: Mon Sep 18 11:22:44 2017 -0700
Committer: Thomas D'Silva <tdsilva@apache.org>
Committed: Mon Sep 18 11:56:50 2017 -0700

----------------------------------------------------------------------
 .../apache/phoenix/end2end/UserDefinedFunctionsIT.java   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3fb104ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java
index 0b54e73..f58f750 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UserDefinedFunctionsIT.java
@@ -665,10 +665,8 @@ public class UserDefinedFunctionsIT extends BaseOwnClusterIT {
     }
 
     @Test
-    public void testUDFsWhenTimestampManagedAtClient() throws Exception {
-        long ts = 100;
+    public void testUDFsWithLatestTimestamp() throws Exception {
         Properties props = new Properties();
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts));
         Connection conn = DriverManager.getConnection(url, props);
         Statement stmt = conn.createStatement();
         String query = "select count(*) from "+ SYSTEM_CATALOG_SCHEMA + ".\"" + SYSTEM_FUNCTION_TABLE
+ "\"";
@@ -677,7 +675,6 @@ public class UserDefinedFunctionsIT extends BaseOwnClusterIT {
         int numRowsBefore = rs.getInt(1);
         stmt.execute("create function mysum61(INTEGER, INTEGER CONSTANT defaultValue=10 minvalue=1
maxvalue=15 ) returns INTEGER as 'org.apache.phoenix.end2end."+MY_SUM_CLASS_NAME+"' using
jar "
                 + "'"+util.getConfiguration().get(DYNAMIC_JARS_DIR_KEY) + "/myjar2.jar"+"'");
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10));
         conn = DriverManager.getConnection(url, props);
         stmt = conn.createStatement();
         rs = stmt.executeQuery(query);
@@ -685,7 +682,6 @@ public class UserDefinedFunctionsIT extends BaseOwnClusterIT {
         int numRowsAfter= rs.getInt(1);
         assertEquals(3, numRowsAfter - numRowsBefore);
         stmt.execute("drop function mysum61");
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 20));
         conn = DriverManager.getConnection(url, props);
         stmt = conn.createStatement();
         rs = stmt.executeQuery(query);
@@ -711,7 +707,6 @@ public class UserDefinedFunctionsIT extends BaseOwnClusterIT {
         }
         stmt.execute("create function mysum61(INTEGER, INTEGER CONSTANT defaultValue=10 minvalue=1
maxvalue=15 ) returns INTEGER as 'org.apache.phoenix.end2end."+MY_SUM_CLASS_NAME+"' using
jar "
                 + "'"+util.getConfiguration().get(DYNAMIC_JARS_DIR_KEY) + "/myjar2.jar"+"'");
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 30));
         conn = DriverManager.getConnection(url, props);
         stmt = conn.createStatement();
         try {
@@ -720,7 +715,6 @@ public class UserDefinedFunctionsIT extends BaseOwnClusterIT {
             fail("FunctionNotFoundException should not be thrown");
         }
         conn.createStatement().execute("create table t61(k integer primary key, k1 integer,
lastname varchar)");
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 40));
         conn = DriverManager.getConnection(url, props);
         stmt = conn.createStatement();
         stmt.execute("upsert into t61 values(1,1,'jock')");
@@ -729,7 +723,6 @@ public class UserDefinedFunctionsIT extends BaseOwnClusterIT {
                 + "'"+util.getConfiguration().get(DYNAMIC_JARS_DIR_KEY) + "/myjar1.jar"+"'");
         stmt.execute("create or replace function myfunction6(INTEGER, INTEGER CONSTANT defaultValue=10
minvalue=1 maxvalue=15 ) returns INTEGER as 'org.apache.phoenix.end2end."+MY_SUM_CLASS_NAME+"'
using jar "
                 + "'"+util.getConfiguration().get(DYNAMIC_JARS_DIR_KEY) + "/myjar2.jar"+"'");
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 50));
         conn = DriverManager.getConnection(url, props);
         stmt = conn.createStatement();
         rs = stmt.executeQuery("select myfunction6(k,12) from t61");
@@ -743,13 +736,11 @@ public class UserDefinedFunctionsIT extends BaseOwnClusterIT {
         assertEquals(1, rs.getInt(1));
         stmt.execute("create or replace function myfunction6(VARCHAR) returns VARCHAR as
'org.apache.phoenix.end2end."+MY_REVERSE_CLASS_NAME+"' using jar "
                 + "'"+util.getConfiguration().get(DYNAMIC_JARS_DIR_KEY) + "/myjar1.jar"+"'");
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 60));
         conn = DriverManager.getConnection(url, props);
         stmt = conn.createStatement();
         rs = stmt.executeQuery("select k from t61 where myfunction6(lastname)='kcoj'");
         assertTrue(rs.next());
         assertEquals(1, rs.getInt(1));
-        props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 60));
         props.setProperty(QueryServices.ALLOW_USER_DEFINED_FUNCTIONS_ATTRIB, "false");
         conn = DriverManager.getConnection(url, props);
         stmt = conn.createStatement();


Mime
View raw message