phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: PHOENIX-4258 Breakup ScanQueryIT into several integration tests so as not to create too many tables in one test
Date Fri, 29 Sep 2017 21:03:12 GMT
Repository: phoenix
Updated Branches:
  refs/heads/master cfe4c9356 -> c1ef11289


PHOENIX-4258 Breakup ScanQueryIT into several integration tests so as not to create too many
tables in one test


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

Branch: refs/heads/master
Commit: c1ef11289afa370d65088b28a80931844eab08b3
Parents: cfe4c93
Author: James Taylor <jtaylor@salesforce.com>
Authored: Fri Sep 29 13:45:09 2017 -0700
Committer: James Taylor <jtaylor@salesforce.com>
Committed: Fri Sep 29 14:01:32 2017 -0700

----------------------------------------------------------------------
 .../apache/phoenix/end2end/AggregateQueryIT.java |  7 +++++++
 .../org/apache/phoenix/end2end/BaseQueryIT.java  | 19 ++-----------------
 .../apache/phoenix/end2end/CaseStatementIT.java  |  2 +-
 .../apache/phoenix/end2end/CastAndCoerceIT.java  |  3 +--
 .../org/apache/phoenix/end2end/GroupByIT.java    |  2 +-
 .../org/apache/phoenix/end2end/InQueryIT.java    |  2 +-
 .../apache/phoenix/end2end/IntArithmeticIT.java  |  2 +-
 .../java/org/apache/phoenix/end2end/NullIT.java  |  5 ++---
 .../phoenix/end2end/PointInTimeQueryIT.java      |  1 -
 .../java/org/apache/phoenix/end2end/QueryIT.java |  7 +++++++
 .../org/apache/phoenix/end2end/RangeScanIT.java  |  2 +-
 .../org/apache/phoenix/end2end/UngroupedIT.java  |  2 +-
 12 files changed, 25 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
index f85e274..0420f40 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
@@ -32,6 +32,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.util.Collection;
 import java.util.Properties;
 
 import org.apache.hadoop.hbase.client.HBaseAdmin;
@@ -41,9 +42,15 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
+import org.junit.runners.Parameterized.Parameters;
 
 public class AggregateQueryIT extends BaseQueryIT {
 
+    @Parameters(name="AggregateQueryIT_{index}") // name is used by failsafe as file name
in reports
+    public static Collection<Object> data() {
+        return BaseQueryIT.allIndexes();
+    }
+    
     public AggregateQueryIT(String indexDDL, boolean mutable, boolean columnEncoded) throws
Exception {
         super(indexDDL, mutable, columnEncoded, false);
     }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
index 53391f1..3b8cadc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
@@ -30,7 +30,6 @@ import org.apache.phoenix.schema.PTableImpl;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -131,25 +130,11 @@ public abstract class BaseQueryIT extends ParallelStatsDisabledIT {
         }
     }
 
-    @Parameters(name = "indexDDL={0},mutable={1},columnEncoded={2}")
     public static Collection<Object> allIndexes() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : INDEX_DDLS) {
-            for (boolean mutable : new boolean[] { false }) {
-                for (boolean columnEncoded : new boolean[] { false }) {
-                    testCases.add(new Object[] { indexDDL, mutable, columnEncoded });
-                }
-            }
-        }
-        return testCases;
-    }
-
-    @Parameters(name = "localIndexDDL={0}")
-    public static Collection<Object> localIndexes() {
-        List<Object> testCases = Lists.newArrayList();
-        for (String indexDDL : LOCAL_INDEX_DDLS) {
-            for (boolean mutable : new boolean[] { false }) {
-                for (boolean columnEncoded : new boolean[] { false }) {
+            for (boolean mutable : new boolean[]{true}) {
+                for (boolean columnEncoded : new boolean[]{false}) {
                     testCases.add(new Object[] { indexDDL, mutable, columnEncoded });
                 }
             }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
index ef67de7..b729009 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CaseStatementIT.java
@@ -59,7 +59,7 @@ public class CaseStatementIT extends BaseQueryIT {
     
     @Parameters(name="CaseStatementIT_{index}") // name is used by failsafe as file name
in reports
     public static Collection<Object> data() {
-        return QueryIT.allIndexes();
+        return BaseQueryIT.allIndexes();
     }    
     
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
index 8c35992..921d5b3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java
@@ -33,7 +33,6 @@ import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.Properties;
 
-import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,7 +48,7 @@ public class CastAndCoerceIT extends BaseQueryIT {
     
     @Parameters(name="CastAndCoerceIT_{index}") // name is used by failsafe as file name
in reports
     public static Collection<Object> data() {
-        return QueryIT.allIndexes();
+        return BaseQueryIT.allIndexes();
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
index 46f9703..42220de 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/GroupByIT.java
@@ -58,7 +58,7 @@ public class GroupByIT extends BaseQueryIT {
     
     @Parameters(name="GroupByIT_{index}") // name is used by failsafe as file name in reports
     public static Collection<Object> data() {
-        return QueryIT.allIndexes();
+        return BaseQueryIT.allIndexes();
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java
index 9d1d8b6..ee38bec 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InQueryIT.java
@@ -57,7 +57,7 @@ public class InQueryIT extends BaseQueryIT {
 
     @Parameters(name="InQueryIT_{index}") // name is used by failsafe as file name in reports
     public static Collection<Object> data() {
-        return QueryIT.allIndexes();
+        return BaseQueryIT.allIndexes();
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java
index bbd9d7f..efad44e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IntArithmeticIT.java
@@ -53,7 +53,7 @@ public class IntArithmeticIT extends BaseQueryIT {
     
     @Parameters(name="IntArithmeticIT_{index}") // name is used by failsafe as file name
in reports
     public static Collection<Object> data() {
-        return QueryIT.allIndexes();
+        return BaseQueryIT.allIndexes();
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java
index ffe0b0d..c56ab0a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NullIT.java
@@ -49,8 +49,7 @@ import com.google.common.collect.Lists;
 
 public class NullIT extends BaseQueryIT {
     
-    @Parameters(name="indexDDL={0},mutable={1},columnEncoded={2}")
-    @Shadower(classBeingShadowed = BaseQueryIT.class)
+    @Parameters(name="indexDDL={index},mutable={1},columnEncoded={2}")
     public static Collection<Object> data() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : INDEX_DDLS) {
@@ -62,7 +61,7 @@ public class NullIT extends BaseQueryIT {
     }
     
     public NullIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception
{
-        super(indexDDL, mutable, columnEncoded, true);
+        super(indexDDL, mutable, columnEncoded, false);
     }
     
     private void testNoStringValue(String value) throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java
index 9f09bc7..63799b3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PointInTimeQueryIT.java
@@ -50,7 +50,6 @@ import com.google.common.collect.Lists;
 public class PointInTimeQueryIT extends BaseQueryIT {
 
     @Parameters(name="PointInTimeQueryIT_{index},mutable={1},columnEncoded={2}")
-    @Shadower(classBeingShadowed = BaseQueryIT.class)
     public static Collection<Object> data() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : INDEX_DDLS) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
index 8cd153c..da62e79 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
@@ -32,11 +32,13 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Collection;
 import java.util.Properties;
 
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
+import org.junit.runners.Parameterized.Parameters;
 
 
 /**
@@ -46,6 +48,11 @@ import org.junit.Test;
  */
 public class QueryIT extends BaseQueryIT {
     
+    @Parameters(name="QueryIT_{index}") // name is used by failsafe as file name in reports
+    public static Collection<Object> data() {
+        return BaseQueryIT.allIndexes();
+    }    
+    
     public QueryIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception
{
         super(indexDDL, mutable, columnEncoded, false);
     }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java
index a9cc2c4..c2e489c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RangeScanIT.java
@@ -53,7 +53,7 @@ public class RangeScanIT extends BaseQueryIT {
     
     @Parameters(name="RangeScanIT_{index}") // name is used by failsafe as file name in reports
     public static Collection<Object> data() {
-        return QueryIT.allIndexes();
+        return BaseQueryIT.allIndexes();
     }
 
     public RangeScanIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception
{

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c1ef1128/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java
index fa1e4dd..4f3303f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UngroupedIT.java
@@ -51,7 +51,7 @@ public class UngroupedIT extends BaseQueryIT {
 
     @Parameters(name="UngroupedIT_{index}") // name is used by failsafe as file name in reports
     public static Collection<Object> data() {
-        return QueryIT.allIndexes();
+        return BaseQueryIT.allIndexes();
     }
     
     @Test


Mime
View raw message