You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2018/10/06 20:48:58 UTC
phoenix git commit: PHOENIX-4855 Continue to write base table column
metadata when creating a view in order to support rollback (addendum)
Repository: phoenix
Updated Branches:
refs/heads/master 14b578012 -> ad29c1cea
PHOENIX-4855 Continue to write base table column metadata when creating a view in order to support rollback (addendum)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ad29c1ce
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ad29c1ce
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ad29c1ce
Branch: refs/heads/master
Commit: ad29c1cea8d70ef24caf12e07b5b5aa3ccf833f6
Parents: 14b5780
Author: Thomas D'Silva <td...@apache.org>
Authored: Sat Oct 6 12:40:54 2018 -0700
Committer: Thomas D'Silva <td...@apache.org>
Committed: Sat Oct 6 13:14:15 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad29c1ce/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 44ecae3..74ce645 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
@@ -755,9 +755,10 @@ public class PhoenixDatabaseMetaData implements DatabaseMetaData {
boolean isSalted = table.getBucketNum()!=null;
boolean tenantColSkipped = false;
List<PColumn> columns = table.getColumns();
- columns = Lists.newArrayList(columns.subList(isSalted ? 1 : 0, columns.size()));
+ int startOffset = isSalted ? 1 : 0;
+ columns = Lists.newArrayList(columns.subList(startOffset, columns.size()));
for (PColumn column : columns) {
- if (isTenantSpecificConnection && column.equals(table.getPKColumns().get(0))) {
+ if (isTenantSpecificConnection && column.equals(table.getPKColumns().get(startOffset))) {
// skip the tenant column
tenantColSkipped = true;
continue;
@@ -892,7 +893,7 @@ public class PhoenixDatabaseMetaData implements DatabaseMetaData {
byte[] keySeqBytes = ByteUtil.EMPTY_BYTE_ARRAY;
int pkPos = table.getPKColumns().indexOf(column);
if (pkPos!=-1) {
- short keySeq = (short) (pkPos + 1 - (isSalted ? 1 : 0) - (tenantColSkipped ? 1 : 0));
+ short keySeq = (short) (pkPos + 1 - startOffset - (tenantColSkipped ? 1 : 0));
keySeqBytes = PSmallint.INSTANCE.toBytes(keySeq);
}
cells.add(new KeyValue(rowKey, TABLE_FAMILY_BYTES, KEY_SEQ_BYTES,