You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2017/11/15 18:47:58 UTC
[03/37] phoenix git commit: PHOENIX-4295 Fix argument order for
StatsCollectorIT derived classes
PHOENIX-4295 Fix argument order for StatsCollectorIT derived classes
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1c3116fc
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1c3116fc
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1c3116fc
Branch: refs/heads/4.x-HBase-1.1
Commit: 1c3116fce8f05cf1240ac2746594c2735c7b2af5
Parents: e2351ef
Author: James Taylor <jt...@salesforce.com>
Authored: Wed Oct 18 09:29:44 2017 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Wed Nov 15 10:39:55 2017 -0800
----------------------------------------------------------------------
.../end2end/ColumnEncodedImmutableNonTxStatsCollectorIT.java | 4 ++--
.../end2end/ColumnEncodedImmutableTxStatsCollectorIT.java | 5 ++---
.../end2end/ColumnEncodedMutableNonTxStatsCollectorIT.java | 5 ++---
.../phoenix/end2end/ColumnEncodedMutableTxStatsCollectorIT.java | 5 ++---
.../end2end/NonColumnEncodedImmutableNonTxStatsCollectorIT.java | 5 ++---
.../end2end/NonColumnEncodedImmutableTxStatsCollectorIT.java | 5 ++---
.../end2end/SysTableNamespaceMappedStatsCollectorIT.java | 3 +--
7 files changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c3116fc/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableNonTxStatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableNonTxStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableNonTxStatsCollectorIT.java
index 7ef825e..d5d8442 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableNonTxStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableNonTxStatsCollectorIT.java
@@ -29,10 +29,10 @@ public class ColumnEncodedImmutableNonTxStatsCollectorIT extends StatsCollectorI
super(mutable, transactional, userTableNamespaceMapped, columnEncoded);
}
- @Parameters(name="columnEncoded = {0}, mutable = {1}, transactional = {2}, isUserTableNamespaceMapped = {3}")
+ @Parameters(name = "mutable = {0}, transactional = {1}, isUserTableNamespaceMapped = {2}, columnEncoded = {3}")
public static Collection<Boolean[]> data() {
return Arrays.asList(new Boolean[][] {
- { true, false, false, false }, { true, false, false, true }
+ { false, false, false, true }, { false, false, true, true }
});
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c3116fc/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableTxStatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableTxStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableTxStatsCollectorIT.java
index 0c6934b..23b1654 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableTxStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedImmutableTxStatsCollectorIT.java
@@ -29,10 +29,9 @@ public class ColumnEncodedImmutableTxStatsCollectorIT extends StatsCollectorIT {
super(mutable, transactional, userTableNamespaceMapped, columnEncoded);
}
- @Parameters(
- name = "columnEncoded = {0}, mutable = {1}, transactional = {2}, isUserTableNamespaceMapped = {3}")
+ @Parameters(name = "mutable = {0}, transactional = {1}, isUserTableNamespaceMapped = {2}, columnEncoded = {3}")
public static Collection<Boolean[]> data() {
return Arrays.asList(
- new Boolean[][] { { true, false, true, false }, { true, false, true, true }, });
+ new Boolean[][] { { false, true, false, true }, { false, true, true, true }, });
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c3116fc/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableNonTxStatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableNonTxStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableNonTxStatsCollectorIT.java
index 3cd81c7..24869a2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableNonTxStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableNonTxStatsCollectorIT.java
@@ -29,10 +29,9 @@ public class ColumnEncodedMutableNonTxStatsCollectorIT extends StatsCollectorIT
super(mutable, transactional, userTableNamespaceMapped, columnEncoded);
}
- @Parameters(
- name = "columnEncoded = {0}, mutable = {1}, transactional = {2}, isUserTableNamespaceMapped = {3}")
+ @Parameters(name = "mutable = {0}, transactional = {1}, isUserTableNamespaceMapped = {2}, columnEncoded = {3}")
public static Collection<Boolean[]> data() {
return Arrays.asList(
- new Boolean[][] { { true, true, false, false }, { true, true, false, true } });
+ new Boolean[][] { { true, false, false, true }, { true, false, true, true } });
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c3116fc/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableTxStatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableTxStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableTxStatsCollectorIT.java
index e4a2734..eea591d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableTxStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ColumnEncodedMutableTxStatsCollectorIT.java
@@ -29,10 +29,9 @@ public class ColumnEncodedMutableTxStatsCollectorIT extends StatsCollectorIT {
super(mutable, transactional, userTableNamespaceMapped, columnEncoded);
}
- @Parameters(
- name = "columnEncoded = {0}, mutable = {1}, transactional = {2}, isUserTableNamespaceMapped = {3}")
+ @Parameters(name = "mutable = {0}, transactional = {1}, isUserTableNamespaceMapped = {2}, columnEncoded = {3}")
public static Collection<Boolean[]> data() {
return Arrays.asList(
- new Boolean[][] { { true, true, true, false }, { true, true, true, true } });
+ new Boolean[][] { { true, true, false, true }, { true, true, true, true } });
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c3116fc/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableNonTxStatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableNonTxStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableNonTxStatsCollectorIT.java
index 792752f..fe70030 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableNonTxStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableNonTxStatsCollectorIT.java
@@ -29,10 +29,9 @@ public class NonColumnEncodedImmutableNonTxStatsCollectorIT extends StatsCollect
super(mutable, transactional, userTableNamespaceMapped, columnEncoded);
}
- @Parameters(
- name = "columnEncoded = {0}, mutable = {1}, transactional = {2}, isUserTableNamespaceMapped = {3}")
+ @Parameters(name = "mutable = {0}, transactional = {1}, isUserTableNamespaceMapped = {2}, columnEncoded = {3}")
public static Collection<Boolean[]> data() {
return Arrays.asList(
- new Boolean[][] { { false, false, false, false }, { false, false, false, true } });
+ new Boolean[][] { { false, false, false, false }, { false, false, true, false } });
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c3116fc/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableTxStatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableTxStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableTxStatsCollectorIT.java
index 8df50cb..10a846a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableTxStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NonColumnEncodedImmutableTxStatsCollectorIT.java
@@ -29,10 +29,9 @@ public class NonColumnEncodedImmutableTxStatsCollectorIT extends StatsCollectorI
super(mutable, transactional, userTableNamespaceMapped, columnEncoded);
}
- @Parameters(
- name = "columnEncoded = {0}, mutable = {1}, transactional = {2}, isUserTableNamespaceMapped = {3}")
+ @Parameters(name = "mutable = {0}, transactional = {1}, isUserTableNamespaceMapped = {2}, columnEncoded = {3}")
public static Collection<Boolean[]> data() {
return Arrays.asList(
- new Boolean[][] { { false, false, true, false }, { false, false, true, true } });
+ new Boolean[][] { { false, true, false, false }, { false, true, true, false } });
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c3116fc/phoenix-core/src/it/java/org/apache/phoenix/end2end/SysTableNamespaceMappedStatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SysTableNamespaceMappedStatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SysTableNamespaceMappedStatsCollectorIT.java
index 36779c2..ea5f32f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SysTableNamespaceMappedStatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SysTableNamespaceMappedStatsCollectorIT.java
@@ -35,8 +35,7 @@ public class SysTableNamespaceMappedStatsCollectorIT extends StatsCollectorIT {
super(mutable, transactional, userTableNamespaceMapped, columnEncoded);
}
- @Parameters(
- name = "columnEncoded = {0}, mutable = {1}, transactional = {2}, isUserTableNamespaceMapped = {3}")
+ @Parameters(name = "mutable = {0}, transactional = {1}, isUserTableNamespaceMapped = {2}, columnEncoded = {3}")
public static Collection<Boolean[]> data() {
return Arrays.asList(
new Boolean[][] { { true, true, false, false }, { true, true, false, true }, });