phoenix git commit: PHOENIX-4825 Replace usage of HBase Base64 implementation with java.util.Base64
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.2 85b479b0e -> 8e2e99d96
PHOENIX-4825 Replace usage of HBase Base64 implementation with java.util.Base64
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8e2e99d9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8e2e99d9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8e2e99d9
Branch: refs/heads/4.x-HBase-1.2
Commit: 8e2e99d965e532a007e021a6dd67b26fb2097d17
Parents: 85b479b0e
Author: Ankit Singhal
Authored: Mon Jul 30 13:57:18 2018 -0700
Committer: Ankit Singhal
Committed: Mon Jul 30 13:57:18 2018 -0700
--
.../org/apache/phoenix/end2end/QueryMoreIT.java | 7 +++--
.../phoenix/mapreduce/CsvBulkImportUtil.java| 8 --
.../util/PhoenixConfigurationUtil.java | 7 +++--
.../apache/phoenix/schema/types/PVarbinary.java | 4 +--
.../phoenix/util/csv/CsvUpsertExecutor.java | 4 +--
.../phoenix/util/json/JsonUpsertExecutor.java | 4 +--
.../util/AbstractUpsertExecutorTest.java| 12
.../util/TenantIdByteConversionTest.java| 30
8 files changed, 50 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/8e2e99d9/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index 04272fa..528fe7f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -31,12 +31,13 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.hadoop.hbase.util.Base64;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -278,7 +279,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
values[i] = rs.getObject(i + 1);
}
conn = getTenantSpecificConnection(tenantId);
-
pkIds.add(Base64.encodeBytes(PhoenixRuntime.encodeColumnValues(conn,
tableOrViewName.toUpperCase(), values, columns)));
+
pkIds.add(Bytes.toString(Base64.getEncoder().encode(PhoenixRuntime.encodeColumnValues(conn,
tableOrViewName.toUpperCase(), values, columns;
}
return pkIds.toArray(new String[pkIds.size()]);
}
@@ -296,7 +297,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
PreparedStatement stmt = conn.prepareStatement(query);
int bindCounter = 1;
for (int i = 0; i < cursorIds.length; i++) {
-Object[] pkParts = PhoenixRuntime.decodeColumnValues(conn,
tableName.toUpperCase(), Base64.decode(cursorIds[i]), columns);
+Object[] pkParts = PhoenixRuntime.decodeColumnValues(conn,
tableName.toUpperCase(), Base64.getDecoder().decode(cursorIds[i]), columns);
for (int j = 0; j < pkParts.length; j++) {
stmt.setObject(bindCounter++, pkParts[j]);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/8e2e99d9/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
index ff9ff72..bf5a538 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
@@ -17,9 +17,11 @@
*/
package org.apache.phoenix.mapreduce;
+import java.util.Base64;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.util.Base64;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
@@ -68,7 +70,7 @@ public class CsvBulkImportUtil {
@VisibleForTesting
static void setChar(Configuration conf, String confKey, char charValue) {
-conf.set(confKey,
Base64.encodeBytes(Character.toString(charValue).getBytes()));
+conf.set(confKey,
Bytes.toString(Base64.getEncoder().encode(Character.toString(charValue).getBytes(;
phoenix git commit: PHOENIX-4825 Replace usage of HBase Base64 implementation with java.util.Base64
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.4 3eecbe985 -> 22934e5af
PHOENIX-4825 Replace usage of HBase Base64 implementation with java.util.Base64
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/22934e5a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/22934e5a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/22934e5a
Branch: refs/heads/4.x-HBase-1.4
Commit: 22934e5af7af79580bf54feeb7667eccafaafc71
Parents: 3eecbe9
Author: Ankit Singhal
Authored: Mon Jul 30 13:57:40 2018 -0700
Committer: Ankit Singhal
Committed: Mon Jul 30 13:57:40 2018 -0700
--
.../org/apache/phoenix/end2end/QueryMoreIT.java | 7 +++--
.../phoenix/mapreduce/CsvBulkImportUtil.java| 8 --
.../util/PhoenixConfigurationUtil.java | 7 +++--
.../apache/phoenix/schema/types/PVarbinary.java | 4 +--
.../phoenix/util/csv/CsvUpsertExecutor.java | 4 +--
.../phoenix/util/json/JsonUpsertExecutor.java | 4 +--
.../util/AbstractUpsertExecutorTest.java| 12
.../util/TenantIdByteConversionTest.java| 30
8 files changed, 50 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/22934e5a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index 04272fa..528fe7f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -31,12 +31,13 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.hadoop.hbase.util.Base64;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -278,7 +279,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
values[i] = rs.getObject(i + 1);
}
conn = getTenantSpecificConnection(tenantId);
-
pkIds.add(Base64.encodeBytes(PhoenixRuntime.encodeColumnValues(conn,
tableOrViewName.toUpperCase(), values, columns)));
+
pkIds.add(Bytes.toString(Base64.getEncoder().encode(PhoenixRuntime.encodeColumnValues(conn,
tableOrViewName.toUpperCase(), values, columns;
}
return pkIds.toArray(new String[pkIds.size()]);
}
@@ -296,7 +297,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
PreparedStatement stmt = conn.prepareStatement(query);
int bindCounter = 1;
for (int i = 0; i < cursorIds.length; i++) {
-Object[] pkParts = PhoenixRuntime.decodeColumnValues(conn,
tableName.toUpperCase(), Base64.decode(cursorIds[i]), columns);
+Object[] pkParts = PhoenixRuntime.decodeColumnValues(conn,
tableName.toUpperCase(), Base64.getDecoder().decode(cursorIds[i]), columns);
for (int j = 0; j < pkParts.length; j++) {
stmt.setObject(bindCounter++, pkParts[j]);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/22934e5a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
index ff9ff72..bf5a538 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
@@ -17,9 +17,11 @@
*/
package org.apache.phoenix.mapreduce;
+import java.util.Base64;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.util.Base64;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
@@ -68,7 +70,7 @@ public class CsvBulkImportUtil {
@VisibleForTesting
static void setChar(Configuration conf, String confKey, char charValue) {
-conf.set(confKey,
Base64.encodeBytes(Character.toString(charValue).getBytes()));
+conf.set(confKey,
Bytes.toString(Base64.getEncoder().encode(Character.toString(charValue).getBytes(;
}
phoenix git commit: PHOENIX-4825 Replace usage of HBase Base64 implementation with java.util.Base64
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.3 bf6db8f4d -> 6f5926b6b
PHOENIX-4825 Replace usage of HBase Base64 implementation with java.util.Base64
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6f5926b6
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6f5926b6
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6f5926b6
Branch: refs/heads/4.x-HBase-1.3
Commit: 6f5926b6b1f3d89b7283a5d030d6f46533dc0d39
Parents: bf6db8f
Author: Ankit Singhal
Authored: Mon Jul 30 13:56:47 2018 -0700
Committer: Ankit Singhal
Committed: Mon Jul 30 13:56:47 2018 -0700
--
.../org/apache/phoenix/end2end/QueryMoreIT.java | 7 +++--
.../phoenix/mapreduce/CsvBulkImportUtil.java| 8 --
.../util/PhoenixConfigurationUtil.java | 7 +++--
.../apache/phoenix/schema/types/PVarbinary.java | 4 +--
.../phoenix/util/csv/CsvUpsertExecutor.java | 4 +--
.../phoenix/util/json/JsonUpsertExecutor.java | 4 +--
.../util/AbstractUpsertExecutorTest.java| 12
.../util/TenantIdByteConversionTest.java| 30
8 files changed, 50 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6f5926b6/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index 04272fa..528fe7f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -31,12 +31,13 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.hadoop.hbase.util.Base64;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -278,7 +279,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
values[i] = rs.getObject(i + 1);
}
conn = getTenantSpecificConnection(tenantId);
-
pkIds.add(Base64.encodeBytes(PhoenixRuntime.encodeColumnValues(conn,
tableOrViewName.toUpperCase(), values, columns)));
+
pkIds.add(Bytes.toString(Base64.getEncoder().encode(PhoenixRuntime.encodeColumnValues(conn,
tableOrViewName.toUpperCase(), values, columns;
}
return pkIds.toArray(new String[pkIds.size()]);
}
@@ -296,7 +297,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
PreparedStatement stmt = conn.prepareStatement(query);
int bindCounter = 1;
for (int i = 0; i < cursorIds.length; i++) {
-Object[] pkParts = PhoenixRuntime.decodeColumnValues(conn,
tableName.toUpperCase(), Base64.decode(cursorIds[i]), columns);
+Object[] pkParts = PhoenixRuntime.decodeColumnValues(conn,
tableName.toUpperCase(), Base64.getDecoder().decode(cursorIds[i]), columns);
for (int j = 0; j < pkParts.length; j++) {
stmt.setObject(bindCounter++, pkParts[j]);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6f5926b6/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
index ff9ff72..bf5a538 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
@@ -17,9 +17,11 @@
*/
package org.apache.phoenix.mapreduce;
+import java.util.Base64;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.util.Base64;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
@@ -68,7 +70,7 @@ public class CsvBulkImportUtil {
@VisibleForTesting
static void setChar(Configuration conf, String confKey, char charValue) {
-conf.set(confKey,
Base64.encodeBytes(Character.toString(charValue).getBytes()));
+conf.set(confKey,
Bytes.toString(Base64.getEncoder().encode(Character.toString(charValue).getBytes(;
}
phoenix git commit: PHOENIX-4825 Replace usage of HBase Base64 implementation with java.util.Base64
Repository: phoenix
Updated Branches:
refs/heads/master e65917eb2 -> e26e0f29b
PHOENIX-4825 Replace usage of HBase Base64 implementation with java.util.Base64
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e26e0f29
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e26e0f29
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e26e0f29
Branch: refs/heads/master
Commit: e26e0f29b91dceaf3ca0a9fb76944803e707fbbc
Parents: e65917e
Author: Ankit Singhal
Authored: Mon Jul 30 13:51:43 2018 -0700
Committer: Ankit Singhal
Committed: Mon Jul 30 13:51:43 2018 -0700
--
.../org/apache/phoenix/end2end/QueryMoreIT.java | 7 +++--
.../phoenix/mapreduce/CsvBulkImportUtil.java| 8 --
.../util/PhoenixConfigurationUtil.java | 7 +++--
.../apache/phoenix/schema/types/PVarbinary.java | 4 +--
.../phoenix/util/csv/CsvUpsertExecutor.java | 4 +--
.../phoenix/util/json/JsonUpsertExecutor.java | 4 +--
.../util/AbstractUpsertExecutorTest.java| 12
.../util/TenantIdByteConversionTest.java| 30
8 files changed, 50 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e26e0f29/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
index 04272fa..528fe7f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryMoreIT.java
@@ -31,12 +31,13 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.hadoop.hbase.util.Base64;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryServices;
@@ -278,7 +279,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
values[i] = rs.getObject(i + 1);
}
conn = getTenantSpecificConnection(tenantId);
-
pkIds.add(Base64.encodeBytes(PhoenixRuntime.encodeColumnValues(conn,
tableOrViewName.toUpperCase(), values, columns)));
+
pkIds.add(Bytes.toString(Base64.getEncoder().encode(PhoenixRuntime.encodeColumnValues(conn,
tableOrViewName.toUpperCase(), values, columns;
}
return pkIds.toArray(new String[pkIds.size()]);
}
@@ -296,7 +297,7 @@ public class QueryMoreIT extends ParallelStatsDisabledIT {
PreparedStatement stmt = conn.prepareStatement(query);
int bindCounter = 1;
for (int i = 0; i < cursorIds.length; i++) {
-Object[] pkParts = PhoenixRuntime.decodeColumnValues(conn,
tableName.toUpperCase(), Base64.decode(cursorIds[i]), columns);
+Object[] pkParts = PhoenixRuntime.decodeColumnValues(conn,
tableName.toUpperCase(), Base64.getDecoder().decode(cursorIds[i]), columns);
for (int j = 0; j < pkParts.length; j++) {
stmt.setObject(bindCounter++, pkParts[j]);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e26e0f29/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
index ff9ff72..bf5a538 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
@@ -17,9 +17,11 @@
*/
package org.apache.phoenix.mapreduce;
+import java.util.Base64;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.util.Base64;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
@@ -68,7 +70,7 @@ public class CsvBulkImportUtil {
@VisibleForTesting
static void setChar(Configuration conf, String confKey, char charValue) {
-conf.set(confKey,
Base64.encodeBytes(Character.toString(charValue).getBytes()));
+conf.set(confKey,
Bytes.toString(Base64.getEncoder().encode(Character.toString(charValue).getBytes(;
}
