Repository: phoenix Updated Branches: refs/heads/encodecolumns2 a7a0d12c9 -> 6282ba889
PHOENIX-3519 Specify QualifierEncodingScheme in CREATE TABLE statement (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6282ba88 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6282ba88 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6282ba88 Branch: refs/heads/encodecolumns2 Commit: 6282ba889eae3c841fc1e6be0eff46a0435721dc Parents: a7a0d12 Author: Thomas D'Silva <[email protected]> Authored: Wed Jan 25 16:24:51 2017 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Wed Jan 25 16:24:51 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java | 3 --- .../src/main/java/org/apache/phoenix/schema/TableProperty.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6282ba88/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java index f7c76f5..487d176 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java @@ -306,9 +306,6 @@ public class PhoenixDatabaseMetaData implements DatabaseMetaData { public static final byte[] SYSTEM_MUTEX_NAME_BYTES = Bytes.toBytes(SYSTEM_MUTEX_NAME); public static final byte[] SYSTEM_MUTEX_FAMILY_NAME_BYTES = TABLE_FAMILY_BYTES; - public static final String COLUMN_ENCODED_BYTES = "COLUMN_ENCODED_BYTES"; - public static final byte[] COLUMN_ENCODED_BYTES_BYTES = Bytes.toBytes(COLUMN_ENCODED_BYTES); - private final PhoenixConnection connection; private final ResultSet emptyResultSet; public static final int MAX_LOCAL_SI_VERSION_DISALLOW = VersionUtil.encodeVersion("0", "98", "8"); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6282ba88/phoenix-core/src/main/java/org/apache/phoenix/schema/TableProperty.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/TableProperty.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/TableProperty.java index 67ff1a5..3282cc1 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/TableProperty.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/TableProperty.java @@ -147,7 +147,7 @@ public enum TableProperty { }, - COLUMN_ENCODED_BYTES(PhoenixDatabaseMetaData.COLUMN_ENCODED_BYTES, COLUMN_FAMILY_NOT_ALLOWED_TABLE_PROPERTY, false, false, false) { + COLUMN_ENCODED_BYTES(PhoenixDatabaseMetaData.ENCODING_SCHEME, COLUMN_FAMILY_NOT_ALLOWED_TABLE_PROPERTY, false, false, false) { @Override public Object getValue(Object value) { if (value instanceof String) {
