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-4257 Breakup GroupByIT, MutableQueryIT, and QueryIT into several integration tests so as not to create too many tables in one test
Date Fri, 29 Sep 2017 23:18:16 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 9c1ba72e7 -> 74308c67f


PHOENIX-4257 Breakup GroupByIT,MutableQueryIT, and QueryIT 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/74308c67
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/74308c67
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/74308c67

Branch: refs/heads/4.x-HBase-1.2
Commit: 74308c67f57ad0c60e7d9302b5e2cb8ca3f4ff66
Parents: 9c1ba72
Author: James Taylor <jamestaylor@apache.org>
Authored: Fri Sep 29 16:13:40 2017 -0700
Committer: James Taylor <jamestaylor@apache.org>
Committed: Fri Sep 29 16:17:20 2017 -0700

----------------------------------------------------------------------
 .../apache/phoenix/end2end/AggregateQueryIT.java  |  2 +-
 .../org/apache/phoenix/end2end/BaseQueryIT.java   | 18 +++---------------
 .../apache/phoenix/end2end/CaseStatementIT.java   |  2 +-
 .../apache/phoenix/end2end/CastAndCoerceIT.java   |  2 +-
 .../org/apache/phoenix/end2end/GroupByIT.java     |  2 +-
 .../org/apache/phoenix/end2end/InQueryIT.java     |  2 +-
 .../apache/phoenix/end2end/IntArithmeticIT.java   |  2 +-
 .../org/apache/phoenix/end2end/NotQueryIT.java    |  2 +-
 .../NotQueryWithGlobalImmutableIndexesIT.java     |  2 +-
 .../NotQueryWithLocalImmutableIndexesIT.java      |  2 +-
 .../java/org/apache/phoenix/end2end/NullIT.java   |  2 +-
 .../phoenix/end2end/PointInTimeQueryIT.java       |  2 +-
 .../java/org/apache/phoenix/end2end/QueryIT.java  |  2 +-
 .../org/apache/phoenix/end2end/RangeScanIT.java   |  2 +-
 .../org/apache/phoenix/end2end/UngroupedIT.java   |  2 +-
 15 files changed, 17 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 0420f40..f907630 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
@@ -52,7 +52,7 @@ public class AggregateQueryIT extends BaseQueryIT {
     }
     
     public AggregateQueryIT(String indexDDL, boolean mutable, boolean columnEncoded) throws
Exception {
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 3b8cadc..ed3669c 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
@@ -26,7 +26,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.phoenix.schema.PTableImpl;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -87,20 +86,11 @@ public abstract class BaseQueryIT extends ParallelStatsDisabledIT {
 
     private static final Logger logger = LoggerFactory.getLogger(BaseQueryIT.class);
 
-    public BaseQueryIT(String idxDdl, boolean mutable, boolean columnEncoded,
-            boolean keepDeletedCells) throws Exception {
+    public BaseQueryIT(String idxDdl, boolean columnEncoded, boolean keepDeletedCells) throws
Exception {
         StringBuilder optionBuilder = new StringBuilder();
         if (!columnEncoded) {
             optionBuilder.append("COLUMN_ENCODED_BYTES=0");
         }
-        if (!mutable) {
-            if (optionBuilder.length() > 0) optionBuilder.append(",");
-            optionBuilder.append("IMMUTABLE_ROWS=true");
-            if (!columnEncoded) {
-                optionBuilder.append(",IMMUTABLE_STORAGE_SCHEME="
-                        + PTableImpl.ImmutableStorageScheme.ONE_CELL_PER_COLUMN);
-            }
-        }
         if (keepDeletedCells) {
             if (optionBuilder.length() > 0) optionBuilder.append(",");
             optionBuilder.append("KEEP_DELETED_CELLS=true");
@@ -133,10 +123,8 @@ public abstract class BaseQueryIT extends ParallelStatsDisabledIT {
     public static Collection<Object> allIndexes() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : INDEX_DDLS) {
-            for (boolean mutable : new boolean[]{true}) {
-                for (boolean columnEncoded : new boolean[]{false}) {
-                    testCases.add(new Object[] { indexDDL, mutable, columnEncoded });
-                }
+            for (boolean columnEncoded : new boolean[]{false}) {
+                testCases.add(new Object[] { indexDDL, columnEncoded });
             }
         }
         return testCases;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 b729009..e770a41 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
@@ -54,7 +54,7 @@ import com.google.common.collect.Lists;
 public class CaseStatementIT extends BaseQueryIT {
 
     public CaseStatementIT(String indexDDL, boolean mutable, boolean columnEncoded) throws
Exception {
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
     
     @Parameters(name="CaseStatementIT_{index}") // name is used by failsafe as file name
in reports

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 921d5b3..a0d9e8f 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
@@ -43,7 +43,7 @@ import org.junit.runners.Parameterized.Parameters;
 public class CastAndCoerceIT extends BaseQueryIT {
 
     public CastAndCoerceIT(String indexDDL, boolean mutable, boolean columnEncoded) throws
Exception {
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
     
     @Parameters(name="CastAndCoerceIT_{index}") // name is used by failsafe as file name
in reports

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 42220de..a70435b 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
@@ -53,7 +53,7 @@ import com.google.common.collect.Lists;
 public class GroupByIT extends BaseQueryIT {
 
     public GroupByIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception
{
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
     
     @Parameters(name="GroupByIT_{index}") // name is used by failsafe as file name in reports

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 ee38bec..7cf0d40 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
@@ -52,7 +52,7 @@ import org.junit.runners.Parameterized.Parameters;
 public class InQueryIT extends BaseQueryIT {
 
     public InQueryIT(String idxDdl, boolean mutable, boolean columnEncoded, boolean keepDeletedCells)
throws Exception {
-        super(idxDdl, mutable, columnEncoded, false);
+        super(idxDdl, columnEncoded, false);
     }
 
     @Parameters(name="InQueryIT_{index}") // name is used by failsafe as file name in reports

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 efad44e..5e66686 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
@@ -48,7 +48,7 @@ import org.junit.runners.Parameterized.Parameters;
 public class IntArithmeticIT extends BaseQueryIT {
 
     public IntArithmeticIT(String indexDDL, boolean mutable, boolean columnEncoded) throws
Exception {
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
     
     @Parameters(name="IntArithmeticIT_{index}") // name is used by failsafe as file name
in reports

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
----------------------------------------------------------------------
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
index 94e95d8..c182cc4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
@@ -50,7 +50,7 @@ import com.google.common.primitives.Floats;
 public abstract class NotQueryIT extends BaseQueryIT {
 
     protected NotQueryIT(String indexDDL, boolean mutable, boolean columnEncoded) throws
Exception {
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java
index bff741f..62d42bc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java
@@ -35,7 +35,7 @@ public class NotQueryWithGlobalImmutableIndexesIT extends NotQueryIT {
     public static Collection<Object> globalIndexes() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : GLOBAL_INDEX_DDLS) {
-            testCases.add(new Object[] { indexDDL, false, false });
+            testCases.add(new Object[] { indexDDL, true, false });
         }
         return testCases;
     }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java
----------------------------------------------------------------------
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
index 806b396..ad3c8ec 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java
@@ -35,7 +35,7 @@ public class NotQueryWithLocalImmutableIndexesIT extends NotQueryIT {
     public static Collection<Object> localIndexes() {
         List<Object> testCases = Lists.newArrayList();
         for (String indexDDL : LOCAL_INDEX_DDLS) {
-            testCases.add(new Object[] { indexDDL, false, false });
+            testCases.add(new Object[] { indexDDL, true, false });
         }
         return testCases;
     }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 c56ab0a..cc4a064 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
@@ -61,7 +61,7 @@ public class NullIT extends BaseQueryIT {
     }
     
     public NullIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception
{
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
     
     private void testNoStringValue(String value) throws Exception {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 63799b3..2a5e7b0 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
@@ -63,7 +63,7 @@ public class PointInTimeQueryIT extends BaseQueryIT {
     public PointInTimeQueryIT(String idxDdl, boolean mutable, boolean columnEncoded)
             throws Exception {
         // These queries fail without KEEP_DELETED_CELLS=true
-        super(idxDdl, mutable, columnEncoded, true);
+        super(idxDdl, columnEncoded, true);
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 da62e79..58b59d1 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
@@ -54,7 +54,7 @@ public class QueryIT extends BaseQueryIT {
     }    
     
     public QueryIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception
{
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 c2e489c..79d7d09 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
@@ -57,7 +57,7 @@ public class RangeScanIT extends BaseQueryIT {
     }
 
     public RangeScanIT(String indexDDL, boolean mutable, boolean columnEncoded) throws Exception
{
-        super(indexDDL, mutable, columnEncoded, false);
+        super(indexDDL, columnEncoded, false);
     }
     
     @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/74308c67/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 4f3303f..0e9c31a 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
@@ -46,7 +46,7 @@ public class UngroupedIT extends BaseQueryIT {
 
     public UngroupedIT(String idxDdl, boolean mutable, boolean columnEncoded)
             throws Exception {
-        super(idxDdl, mutable, columnEncoded, false);
+        super(idxDdl, columnEncoded, false);
     }
 
     @Parameters(name="UngroupedIT_{index}") // name is used by failsafe as file name in reports


Mime
View raw message