phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: Fix compilation errors
Date Thu, 14 Jun 2018 17:48:06 GMT
Repository: phoenix
Updated Branches:
  refs/heads/omid2 64bd216c3 -> 119d5b48f


Fix compilation errors


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

Branch: refs/heads/omid2
Commit: 119d5b48f5aef79e5edeade958481f8edbfdeec9
Parents: 64bd216
Author: James Taylor <jamestaylor@apache.org>
Authored: Thu Jun 14 19:47:55 2018 +0200
Committer: James Taylor <jamestaylor@apache.org>
Committed: Thu Jun 14 19:47:55 2018 +0200

----------------------------------------------------------------------
 .../ColumnEncodedImmutableNonTxStatsCollectorIT.java      |  8 ++++----
 .../end2end/ColumnEncodedImmutableTxStatsCollectorIT.java |  8 ++++----
 .../ColumnEncodedMutableNonTxStatsCollectorIT.java        |  8 ++++----
 .../end2end/ColumnEncodedMutableTxStatsCollectorIT.java   |  8 ++++----
 .../NonColumnEncodedImmutableNonTxStatsCollectorIT.java   |  8 ++++----
 .../NonColumnEncodedImmutableTxStatsCollectorIT.java      | 10 +++++-----
 .../end2end/SysTableNamespaceMappedStatsCollectorIT.java  | 10 +++++-----
 .../org/apache/phoenix/schema/stats/StatsCollectorIT.java |  4 ++--
 8 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/119d5b48/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 e019378..0481ba5 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
@@ -25,15 +25,15 @@ import org.junit.runners.Parameterized.Parameters;
 
 public class ColumnEncodedImmutableNonTxStatsCollectorIT extends StatsCollectorIT {
     
-    public ColumnEncodedImmutableNonTxStatsCollectorIT(boolean mutable, boolean transactional,
String transactionProvider,
+    public ColumnEncodedImmutableNonTxStatsCollectorIT(boolean mutable, String transactionProvider,
             boolean userTableNamespaceMapped, boolean columnEncoded) {
-        super(mutable, transactional, transactionProvider, userTableNamespaceMapped, columnEncoded);
+        super(mutable, transactionProvider, userTableNamespaceMapped, columnEncoded);
     }
 
-    @Parameters(name = "mutable={0},transactional={1},transactionProvider={2},isUserTableNamespaceMapped={3},columnEncoded={4}")
+    @Parameters(name = "mutable={0},transactionProvider={1},isUserTableNamespaceMapped={2},columnEncoded={3}")
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][] {     
-                { false, false, null, false, true }, { false, false, null, true, true }
+                { false, null, false, true }, { false, null, true, true }
         });
     }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/119d5b48/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 a34b806..7998288 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
@@ -25,14 +25,14 @@ import org.junit.runners.Parameterized.Parameters;
 
 public class ColumnEncodedImmutableTxStatsCollectorIT extends StatsCollectorIT {
 
-    public ColumnEncodedImmutableTxStatsCollectorIT(boolean mutable, boolean transactional,
String transactionProvider,
+    public ColumnEncodedImmutableTxStatsCollectorIT(boolean mutable, String transactionProvider,
             boolean userTableNamespaceMapped, boolean columnEncoded) {
-        super(mutable, transactional, transactionProvider, userTableNamespaceMapped, columnEncoded);
+        super(mutable, transactionProvider, userTableNamespaceMapped, columnEncoded);
     }
 
-    @Parameters(name = "mutable={0},transactional={1},transactionProvider={2},isUserTableNamespaceMapped={3},columnEncoded={4}")
+    @Parameters(name = "mutable={0},transactionProvider={1},isUserTableNamespaceMapped={2},columnEncoded={3}")
     public static Collection<Object[]> data() {
         return Arrays.asList(
-            new Object[][] { { false, true, "TEPHRA", false, true }, { false, true, "TEPHRA",
true, true }, });
+            new Object[][] { { false, "TEPHRA", false, true }, { false, "TEPHRA", true, true
}, });
     }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/119d5b48/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 3cc7568..248f6fb 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
@@ -25,14 +25,14 @@ import org.junit.runners.Parameterized.Parameters;
 
 public class ColumnEncodedMutableNonTxStatsCollectorIT extends StatsCollectorIT {
 
-    public ColumnEncodedMutableNonTxStatsCollectorIT(boolean mutable, boolean transactional,
String transactionProvider,
+    public ColumnEncodedMutableNonTxStatsCollectorIT(boolean mutable, String transactionProvider,
             boolean userTableNamespaceMapped, boolean columnEncoded) {
-        super(mutable, transactional, transactionProvider, userTableNamespaceMapped, columnEncoded);
+        super(mutable, transactionProvider, userTableNamespaceMapped, columnEncoded);
     }
 
-    @Parameters(name = "mutable={0},transactional={1},transactionProvider={2},isUserTableNamespaceMapped={3},columnEncoded={4}")
+    @Parameters(name = "mutable={0},transactionProvider={1},isUserTableNamespaceMapped={2},columnEncoded={3}")
     public static Collection<Object[]> data() {
         return Arrays.asList(
-            new Object[][] { { true, false, null, false, true }, { true, false, null, true,
true } });
+            new Object[][] { { true, null, false, true }, { true, null, true, true } });
     }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/119d5b48/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 e1675eb..9283018 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
@@ -25,14 +25,14 @@ import org.junit.runners.Parameterized.Parameters;
 
 public class ColumnEncodedMutableTxStatsCollectorIT extends StatsCollectorIT {
 
-    public ColumnEncodedMutableTxStatsCollectorIT(boolean mutable, boolean transactional,
String transactionProvider,
+    public ColumnEncodedMutableTxStatsCollectorIT(boolean mutable, String transactionProvider,
             boolean userTableNamespaceMapped, boolean columnEncoded) {
-        super(mutable, transactional, transactionProvider, userTableNamespaceMapped, columnEncoded);
+        super(mutable, transactionProvider, userTableNamespaceMapped, columnEncoded);
     }
 
-    @Parameters(name = "mutable={0},transactional={1},transactionProvider={2},isUserTableNamespaceMapped={3},columnEncoded={4}")
+    @Parameters(name = "mutable={0},transactionProvider={1},isUserTableNamespaceMapped={2},columnEncoded={3}")
     public static Collection<Object[]> data() {
         return Arrays.asList(
-            new Object[][] { { true, true, "TEPHRA", false, true }, { true, true, "TEPHRA",
true, true } });
+            new Object[][] { { true, "TEPHRA", false, true }, { true, "TEPHRA", true, true
} });
     }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/119d5b48/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 0edcbeb..fec890e 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
@@ -25,14 +25,14 @@ import org.junit.runners.Parameterized.Parameters;
 
 public class NonColumnEncodedImmutableNonTxStatsCollectorIT extends StatsCollectorIT {
 
-    public NonColumnEncodedImmutableNonTxStatsCollectorIT(boolean mutable, boolean transactional,
String transactionProvider,
+    public NonColumnEncodedImmutableNonTxStatsCollectorIT(boolean mutable, String transactionProvider,
             boolean userTableNamespaceMapped, boolean columnEncoded) {
-        super(mutable, transactional, transactionProvider, userTableNamespaceMapped, columnEncoded);
+        super(mutable, transactionProvider, userTableNamespaceMapped, columnEncoded);
     }
 
-    @Parameters(name = "mutable={0},transactional={1},transactionProvider={2},isUserTableNamespaceMapped={3},columnEncoded={4}")
+    @Parameters(name = "mutable={0},transactionProvider={1},isUserTableNamespaceMapped={2},columnEncoded={3}")
     public static Collection<Object[]> data() {
         return Arrays.asList(
-            new Object[][] { { false, false, null, false, false }, { false, false, null,
true, false } });
+            new Object[][] { { false, null, false, false }, { false, null, true, false }
});
     }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/119d5b48/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 6e65aff..a0f6991 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
@@ -25,17 +25,17 @@ import org.junit.runners.Parameterized.Parameters;
 
 public class NonColumnEncodedImmutableTxStatsCollectorIT extends StatsCollectorIT {
 
-    public NonColumnEncodedImmutableTxStatsCollectorIT(boolean mutable, boolean transactional,
String transactionProvider,
+    public NonColumnEncodedImmutableTxStatsCollectorIT(boolean mutable, String transactionProvider,
             boolean userTableNamespaceMapped, boolean columnEncoded) {
-        super(mutable, transactional, transactionProvider, userTableNamespaceMapped, columnEncoded);
+        super(mutable,transactionProvider, userTableNamespaceMapped, columnEncoded);
     }
 
-    @Parameters(name = "mutable={0},transactional={1},transactionProvider={2},isUserTableNamespaceMapped={3},columnEncoded={4}")
+    @Parameters(name = "mutable={0},transactionProvider={1},isUserTableNamespaceMapped={2},columnEncoded={3}")
     public static Collection<Object[]> data() {
         return Arrays.asList(
             new Object[][] { 
-                { false, true, "TEPHRA", false, false }, { false, true, "TEPHRA", true, false
},
-                { false, true, "OMID", false, false }, { false, true, "OMID", true, false
},
+                { false, "TEPHRA", false, false }, { false, "TEPHRA", true, false },
+                { false, "OMID", false, false }, { false, "OMID", true, false },
             });
     }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/119d5b48/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 2781b97..81d2bf6 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
@@ -31,17 +31,17 @@ import com.google.common.collect.Maps;
 
 public class SysTableNamespaceMappedStatsCollectorIT extends StatsCollectorIT {
 
-    public SysTableNamespaceMappedStatsCollectorIT(boolean mutable, boolean transactional,
String transactionProvider,
+    public SysTableNamespaceMappedStatsCollectorIT(boolean mutable, String transactionProvider,
             boolean userTableNamespaceMapped, boolean columnEncoded) {
-        super(mutable, transactional, transactionProvider, userTableNamespaceMapped, columnEncoded);
+        super(mutable, transactionProvider, userTableNamespaceMapped, columnEncoded);
     }
 
-    @Parameters(name = "mutable={0},transactional={1},transactionProvider={2},isUserTableNamespaceMapped={3},columnEncoded={4}")
+    @Parameters(name = "mutable={0},transactionProvider={1},isUserTableNamespaceMapped={2},columnEncoded={3}")
     public static Collection<Object[]> data() {
         return Arrays.asList(
             new Object[][] { 
-                { true, true, "TEPHRA", false, false }, { true, true, "TEPHRA", false, true
}, 
-                { true, true, "OMID", false, false },
+                { true, "TEPHRA", false, false }, { true, "TEPHRA", false, true }, 
+                { true, "OMID", false, false },
             });
     }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/119d5b48/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
index abb3e9f..1ef6989 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
@@ -87,9 +87,9 @@ public abstract class StatsCollectorIT extends BaseUniqueNamesOwnClusterIT
{
     private final boolean mutable;
     private static final int defaultGuidePostWidth = 20;
     
-    protected StatsCollectorIT(boolean mutable, boolean transactional, String transactionProvider,
boolean userTableNamespaceMapped, boolean columnEncoded) {
+    protected StatsCollectorIT(boolean mutable, String transactionProvider, boolean userTableNamespaceMapped,
boolean columnEncoded) {
         StringBuilder sb = new StringBuilder();
-        if (transactional) {
+        if (transactionProvider != null) {
             sb.append("TRANSACTIONAL=true, TRANSACTION_PROVIDER='" + transactionProvider
+ "'");
         }
         if (!columnEncoded) {


Mime
View raw message