Repository: phoenix Updated Branches: refs/heads/calcite 48332b223 -> 20462f03a
PHOENIX-3973 Immutable tables using encoding are failing in phoenix-calcite(Ankit Singhal) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/20462f03 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/20462f03 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/20462f03 Branch: refs/heads/calcite Commit: 20462f03a201629e0921864f7ae440b901714eb8 Parents: 48332b2 Author: Ankit Singhal <[email protected]> Authored: Thu Jun 22 18:00:29 2017 +0530 Committer: Ankit Singhal <[email protected]> Committed: Thu Jun 22 18:00:29 2017 +0530 ---------------------------------------------------------------------- .../java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java | 3 ++- pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/20462f03/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java index e50538b..c7b4f27 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/rel/PhoenixTableScan.java @@ -51,6 +51,7 @@ import org.apache.phoenix.schema.PName; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.schema.TableRef; import org.apache.phoenix.schema.types.PDataType; + import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; @@ -339,7 +340,7 @@ public class PhoenixTableScan extends TableScan implements PhoenixQueryRel { PColumn column = mappedColumns.get(index); PName familyName = column.getFamilyName(); if (familyName != null) { - scan.addColumn(familyName.getBytes(), column.getColumnQualifierBytes()); + scan.addFamily(familyName.getBytes()); } } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/20462f03/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index aab14dc..6b061e2 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ <!-- Do not change jodatime.version until HBASE-15199 is fixed --> <jodatime.version>1.6</jodatime.version> <joni.version>2.1.2</joni.version> - <avatica.version>1.10.0-SNAPSHOT</avatica.version> + <avatica.version>1.10.0</avatica.version> <calcite.version>1.13.0-SNAPSHOT</calcite.version> <jettyVersion>8.1.7.v20120910</jettyVersion> <tephra.version>0.11.0-incubating</tephra.version>
