PHOENIX-4855 Continue to write base table column metadata when creati…

…ng a view in order to support rollback (addendum)
zzzppi · Oct 6, 2018 · ad29c1c · ad29c1c
1 parent 14b5780
commit ad29c1c
Showing 1 changed file with 4 additions and 3 deletions.
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
@@ -755,9 +755,10 @@ public ResultSet getColumns(String catalog, String schemaPattern, String tableNa
             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 ResultSet getColumns(String catalog, String schemaPattern, String tableNa
                 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,