Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 c08d8e6b7 -> 5c5153557
PHOENIX-4719 Avoid static initialization deadlock while loading regions (Pedro Boado) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/25e47ea3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/25e47ea3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/25e47ea3 Branch: refs/heads/4.x-HBase-1.3 Commit: 25e47ea3e48b6faf1da4043865d6eca35a7c8926 Parents: c08d8e6 Author: James Taylor <jtay...@salesforce.com> Authored: Mon Apr 30 19:49:39 2018 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Mon Apr 30 19:49:39 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java | 2 ++ .../src/main/java/org/apache/phoenix/query/QueryConstants.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/25e47ea3/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 320c6e7..55de772 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 @@ -290,6 +290,8 @@ public class PhoenixDatabaseMetaData implements DatabaseMetaData { public static final String ASYNC_REBUILD_TIMESTAMP = "ASYNC_REBUILD_TIMESTAMP"; public static final byte[] ASYNC_REBUILD_TIMESTAMP_BYTES = Bytes.toBytes(ASYNC_REBUILD_TIMESTAMP); + public static final String COLUMN_ENCODED_BYTES = "COLUMN_ENCODED_BYTES"; + public static final String PARENT_TENANT_ID = "PARENT_TENANT_ID"; public static final byte[] PARENT_TENANT_ID_BYTES = Bytes.toBytes(PARENT_TENANT_ID); http://git-wip-us.apache.org/repos/asf/phoenix/blob/25e47ea3/phoenix-core/src/main/java/org/apache/phoenix/query/QueryConstants.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryConstants.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryConstants.java index 2fe7b14..65806ae 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryConstants.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryConstants.java @@ -433,7 +433,7 @@ public interface QueryConstants { " CONSTRAINT " + SYSTEM_TABLE_PK_NAME + " PRIMARY KEY (QUERY_ID))\n" + PhoenixDatabaseMetaData.TRANSACTIONAL + "=" + Boolean.FALSE+ ",\n" + HColumnDescriptor.TTL + "=" + MetaDataProtocol.DEFAULT_LOG_TTL+",\n"+ - TableProperty.COLUMN_ENCODED_BYTES.toString()+" = 0"; + PhoenixDatabaseMetaData.COLUMN_ENCODED_BYTES +" = 0"; public static final byte[] OFFSET_FAMILY = "f_offset".getBytes(); public static final byte[] OFFSET_COLUMN = "c_offset".getBytes();
