Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 fe06cacc1 -> 48787d06a
PHOENIX-4882 The client re-resolves the table for every projected non-indexed column when there's a local index. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/48787d06 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/48787d06 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/48787d06 Branch: refs/heads/4.x-HBase-0.98 Commit: 48787d06aa5d8586f4bdf17b99bff4443e2e7196 Parents: fe06cac Author: Lars Hofhansl <[email protected]> Authored: Thu Sep 6 11:29:29 2018 -0700 Committer: Lars Hofhansl <[email protected]> Committed: Thu Sep 6 11:29:29 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/compile/FromCompiler.java | 5 +++++ .../java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/48787d06/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java index 3faada7..707cc77 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java @@ -246,6 +246,11 @@ public class FromCompiler { return visitor; } + public static ColumnResolver getResolver(NamedTableNode tableNode, PhoenixConnection connection, boolean updateCacheImmediately) throws SQLException { + SingleTableColumnResolver visitor = new SingleTableColumnResolver(connection, tableNode, updateCacheImmediately); + return visitor; + } + public static ColumnResolver getResolver(NamedTableNode tableNode, PhoenixConnection connection, Map<String, UDFParseNode> udfParseNodes) throws SQLException { SingleTableColumnResolver visitor = new SingleTableColumnResolver(connection, tableNode, true, 0, udfParseNodes); http://git-wip-us.apache.org/repos/asf/phoenix/blob/48787d06/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java index 270c66d..0061331 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java @@ -37,7 +37,7 @@ public class LocalIndexDataColumnRef extends ColumnRef { super(FromCompiler.getResolver( FACTORY.namedTable(null, TableName.create(context.getCurrentTable().getTable() .getSchemaName().getString(), context.getCurrentTable().getTable() - .getParentTableName().getString())), context.getConnection()).resolveTable( + .getParentTableName().getString())), context.getConnection(), false).resolveTable( context.getCurrentTable().getTable().getSchemaName().getString(), context.getCurrentTable().getTable().getParentTableName().getString()), IndexUtil .getDataColumnFamilyName(indexColumnName), IndexUtil
