PHOENIX-4257 Breakup GroupByIT,MutableQueryIT, and QueryIT into sever…

…al integration tests so as not to create too many tables in one test
zzzppi · Sep 30, 2017 · 2a81efe · 2a81efe
1 parent ccf98c2
commit 2a81efe
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 24 deletions.
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
@@ -51,7 +51,7 @@ public static Collection<Object> data() {
         return BaseQueryIT.allIndexes();
     }
 
-    public AggregateQueryIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    public AggregateQueryIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

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
@@ -53,7 +53,7 @@
 @RunWith(Parameterized.class)
 public class CaseStatementIT extends BaseQueryIT {
 
-    public CaseStatementIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    public CaseStatementIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

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
@@ -42,7 +42,7 @@
 @RunWith(Parameterized.class)
 public class CastAndCoerceIT extends BaseQueryIT {
 
-    public CastAndCoerceIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    public CastAndCoerceIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

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
@@ -52,7 +52,7 @@
 @RunWith(Parameterized.class)
 public class GroupByIT extends BaseQueryIT {
 
-    public GroupByIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    public GroupByIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

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
@@ -51,7 +51,7 @@
 
 public class InQueryIT extends BaseQueryIT {
 
-    public InQueryIT(String idxDdl, boolean mutable, boolean columnEncoded, boolean keepDeletedCells) throws Exception {
+    public InQueryIT(String idxDdl, boolean columnEncoded) throws Exception {
         super(idxDdl, columnEncoded, false);
     }
 

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
@@ -47,7 +47,7 @@
 @RunWith(Parameterized.class)
 public class IntArithmeticIT extends BaseQueryIT {
 
-    public IntArithmeticIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    public IntArithmeticIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
@@ -49,7 +49,7 @@
 @RunWith(Parameterized.class)
 public abstract class NotQueryIT extends BaseQueryIT {
 
-    protected NotQueryIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    protected NotQueryIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

diff --git a/...nix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java b/...nix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java
@@ -26,16 +26,15 @@
 
 public class NotQueryWithGlobalImmutableIndexesIT extends NotQueryIT {
 
-    public NotQueryWithGlobalImmutableIndexesIT(String indexDDL, boolean mutable,
-            boolean columnEncoded) throws Exception {
-        super(indexDDL, mutable, columnEncoded);
+    public NotQueryWithGlobalImmutableIndexesIT(String indexDDL, boolean columnEncoded) throws Exception {
+        super(indexDDL, columnEncoded);
     }
 
     @Parameters(name = "globalIndexDDL={0}")
     public static Collection<Object> globalIndexes() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : GLOBAL_INDEX_DDLS) {
-            testCases.add(new Object[] { indexDDL, true, false });
+            testCases.add(new Object[] { indexDDL, false });
         }
         return testCases;
     }

diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java
@@ -26,16 +26,15 @@
 
 public class NotQueryWithLocalImmutableIndexesIT extends NotQueryIT {
 
-    public NotQueryWithLocalImmutableIndexesIT(String indexDDL, boolean mutable,
-            boolean columnEncoded) throws Exception {
-        super(indexDDL, mutable, columnEncoded);
+    public NotQueryWithLocalImmutableIndexesIT(String indexDDL, boolean columnEncoded) throws Exception {
+        super(indexDDL, columnEncoded);
     }
 
     @Parameters(name = "localIndexDDL={0}")
     public static Collection<Object> localIndexes() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : LOCAL_INDEX_DDLS) {
-            testCases.add(new Object[] { indexDDL, true, false });
+            testCases.add(new Object[] { indexDDL, false });
         }
         return testCases;
     }

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
@@ -49,18 +49,18 @@
 
 public class NullIT extends BaseQueryIT {
 
-    @Parameters(name="indexDDL={index},mutable={1},columnEncoded={2}")
+    @Parameters(name="NullIT_{index},columnEncoded={1}")
     public static Collection<Object> data() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : INDEX_DDLS) {
             for (boolean columnEncoded : new boolean[]{false,true}) {
-                testCases.add(new Object[] { indexDDL, true, columnEncoded });
+                testCases.add(new Object[] { indexDDL, columnEncoded });
             }
         }
         return testCases;
     }
 
-    public NullIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    public NullIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

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
@@ -49,18 +49,18 @@
 
 public class PointInTimeQueryIT extends BaseQueryIT {
 
-    @Parameters(name="PointInTimeQueryIT_{index},mutable={1},columnEncoded={2}")
+    @Parameters(name="PointInTimeQueryIT_{index},columnEncoded={1}")
     public static Collection<Object> data() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : INDEX_DDLS) {
             for (boolean columnEncoded : new boolean[]{false,true}) {
-                testCases.add(new Object[] { indexDDL, true, columnEncoded });
+                testCases.add(new Object[] { indexDDL, columnEncoded });
             }
         }
         return testCases;
     }
 
-    public PointInTimeQueryIT(String idxDdl, boolean mutable, boolean columnEncoded)
+    public PointInTimeQueryIT(String idxDdl, boolean columnEncoded)
             throws Exception {
         // These queries fail without KEEP_DELETED_CELLS=true
         super(idxDdl, columnEncoded, true);

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
@@ -53,7 +53,7 @@ public static Collection<Object> data() {
         return BaseQueryIT.allIndexes();
     }    
 
-    public QueryIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    public QueryIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

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
@@ -56,7 +56,7 @@ public static Collection<Object> data() {
         return BaseQueryIT.allIndexes();
     }
 
-    public RangeScanIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception {
+    public RangeScanIT(String indexDDL, boolean columnEncoded) throws Exception {
         super(indexDDL, columnEncoded, false);
     }
 

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
@@ -44,7 +44,7 @@
 
 public class UngroupedIT extends BaseQueryIT {
 
-    public UngroupedIT(String idxDdl, boolean mutable, boolean columnEncoded)
+    public UngroupedIT(String idxDdl, boolean columnEncoded)
             throws Exception {
         super(idxDdl, columnEncoded, false);
     }