You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by la...@apache.org on 2019/09/20 19:55:33 UTC
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5486 Projections
from local indexes return garbage.
This is an automated email from the ASF dual-hosted git repository.
larsh pushed a commit to branch 4.x-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push:
new 4b9fee2 PHOENIX-5486 Projections from local indexes return garbage.
4b9fee2 is described below
commit 4b9fee2dcf3d99e056c272d3590117fcb9cbb3c4
Author: Lars Hofhansl <la...@apache.org>
AuthorDate: Fri Sep 20 12:54:52 2019 -0700
PHOENIX-5486 Projections from local indexes return garbage.
---
.../src/main/java/org/apache/phoenix/iterate/ExplainTable.java | 2 +-
.../src/main/java/org/apache/phoenix/schema/MetaDataClient.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
index 2671044..e53b084 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
@@ -215,7 +215,7 @@ public abstract class ExplainTable {
private Long getViewIndexValue(PDataType type, byte[] range) {
boolean useLongViewIndex = MetaDataUtil.getViewIndexIdDataType().equals(type);
Object s = type.toObject(range);
- return (useLongViewIndex ? (Long) s : (Short) s) - (useLongViewIndex ? Long.MAX_VALUE : Short.MAX_VALUE);
+ return (useLongViewIndex ? (Long) s : (Short) s) + (useLongViewIndex ? Long.MAX_VALUE : Short.MAX_VALUE) + 2;
}
private static class RowKeyValueIterator implements Iterator<byte[]> {
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 70e68e3..04fdfec 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -1662,7 +1662,7 @@ public class MetaDataClient {
PrimaryKeyConstraint pk = FACTORY.primaryKey(null, allPkColumns);
tableProps.put(MetaDataUtil.DATA_TABLE_NAME_PROP_NAME, dataTable.getName().getString());
CreateTableStatement tableStatement = FACTORY.createTable(indexTableName, statement.getProps(), columnDefs, pk, statement.getSplitNodes(), PTableType.INDEX, statement.ifNotExists(), null, null, statement.getBindCount(), null);
- table = createTableInternal(tableStatement, splits, dataTable, null, null, MetaDataUtil.getViewIndexIdDataType(),null, null, allocateIndexId, statement.getIndexType(), asyncCreatedDate, tableProps, commonFamilyProps);
+ table = createTableInternal(tableStatement, splits, dataTable, null, null, getViewIndexDataType() ,null, null, allocateIndexId, statement.getIndexType(), asyncCreatedDate, tableProps, commonFamilyProps);
}
finally {
deleteMutexCells(physicalSchemaName, physicalTableName, acquiredColumnMutexSet);
@@ -2838,7 +2838,7 @@ public class MetaDataClient {
} else {
tableUpsert.setBoolean(28, useStatsForParallelizationProp);
}
- tableUpsert.setInt(29, Types.BIGINT);
+ tableUpsert.setInt(29, viewIndexIdType.getSqlType());
tableUpsert.execute();
if (asyncCreatedDate != null) {