[phoenix] branch master updated: PHOENIX-6023 Wrong result when issuing query for an immutable table with multiple column families (addendum)

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new 9f10fd0  PHOENIX-6023 Wrong result when issuing query for an immutable table with multiple column families (addendum)
9f10fd0 is described below

commit 9f10fd0ba156d5a33d9a0e97870328cc667d2627
Author: Toshihiro Suzuki <br...@gmail.com>
AuthorDate: Thu Jul 23 14:24:32 2020 +0900

    PHOENIX-6023 Wrong result when issuing query for an immutable table with multiple column families (addendum)
---
 .../src/main/java/org/apache/phoenix/compile/WhereCompiler.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
index 62b2ed5..a5fd6c3 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
@@ -204,7 +204,8 @@ public class WhereCompiler {
             // using column family. If the column qualifier is enough, we
             // just use that.
             if (!SchemaUtil.isPKColumn(ref.getColumn())) {
-                if (!EncodedColumnsUtil.usesEncodedColumnNames(table)) {
+                if (!EncodedColumnsUtil.usesEncodedColumnNames(table)
+                    || ref.getColumn().isDynamic()) {
                     try {
                         table.getColumnForColumnName(ref.getColumn().getName().getString());
                     } catch (AmbiguousColumnException e) {