Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 74308c67f -> 53f3e1873
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/53f3e187 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/53f3e187 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/53f3e187 Branch: refs/heads/4.x-HBase-1.2 Commit: 53f3e187342309fcf1096da05105d0d3fef7811b Parents: 74308c6 Author: James Taylor <[email protected]> Authored: Fri Sep 29 18:04:20 2017 -0700 Committer: James Taylor <[email protected]> Committed: Fri Sep 29 18:07:37 2017 -0700 ---------------------------------------------------------------------- .../it/java/org/apache/phoenix/end2end/AggregateQueryIT.java | 2 +- .../it/java/org/apache/phoenix/end2end/CaseStatementIT.java | 2 +- .../it/java/org/apache/phoenix/end2end/CastAndCoerceIT.java | 2 +- .../src/it/java/org/apache/phoenix/end2end/GroupByIT.java | 2 +- .../src/it/java/org/apache/phoenix/end2end/InQueryIT.java | 2 +- .../it/java/org/apache/phoenix/end2end/IntArithmeticIT.java | 2 +- .../src/it/java/org/apache/phoenix/end2end/NotQueryIT.java | 2 +- .../phoenix/end2end/NotQueryWithGlobalImmutableIndexesIT.java | 7 +++---- .../phoenix/end2end/NotQueryWithLocalImmutableIndexesIT.java | 7 +++---- .../src/it/java/org/apache/phoenix/end2end/NullIT.java | 6 +++--- .../java/org/apache/phoenix/end2end/PointInTimeQueryIT.java | 6 +++--- .../src/it/java/org/apache/phoenix/end2end/QueryIT.java | 2 +- .../src/it/java/org/apache/phoenix/end2end/RangeScanIT.java | 2 +- .../src/it/java/org/apache/phoenix/end2end/UngroupedIT.java | 2 +- 14 files changed, 22 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 f907630..6c85774 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 @@ -51,7 +51,7 @@ public class AggregateQueryIT extends BaseQueryIT { 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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 e770a41..73dd0de 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 @@ -53,7 +53,7 @@ import com.google.common.collect.Lists; @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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 a0d9e8f..58699bf 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 @@ -42,7 +42,7 @@ import org.junit.runners.Parameterized.Parameters; @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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 a70435b..f4ff9dc 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 @@ -52,7 +52,7 @@ import com.google.common.collect.Lists; @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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 7cf0d40..537fe19 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 @@ -51,7 +51,7 @@ import org.junit.runners.Parameterized.Parameters; 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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 5e66686..008af64 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 @@ -47,7 +47,7 @@ import org.junit.runners.Parameterized.Parameters; @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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 c182cc4..65f3c17 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 @@ -49,7 +49,7 @@ import com.google.common.primitives.Floats; @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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 62d42bc..1c189eb 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 @@ -26,16 +26,15 @@ import com.google.common.collect.Lists; 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; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 ad3c8ec..30fa9ed 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 @@ -26,16 +26,15 @@ import com.google.common.collect.Lists; 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; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 cc4a064..540ff82 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,18 +49,18 @@ import com.google.common.collect.Lists; 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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 2a5e7b0..c53e523 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 @@ -49,18 +49,18 @@ import com.google.common.collect.Lists; 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); http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 58b59d1..718fe95 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 @@ -53,7 +53,7 @@ public class QueryIT extends BaseQueryIT { 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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 79d7d09..fac8647 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 @@ -56,7 +56,7 @@ public class RangeScanIT extends BaseQueryIT { 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); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/53f3e187/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 0e9c31a..1435d0b 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 @@ -44,7 +44,7 @@ import org.junit.runners.Parameterized.Parameters; 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); }
