You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2016/03/09 20:49:54 UTC
phoenix git commit: Change Calcite version to 1.6.0; small fix
Repository: phoenix
Updated Branches:
refs/heads/calcite a78fdf5b6 -> 86b9deddf
Change Calcite version to 1.6.0; small fix
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/86b9dedd
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/86b9dedd
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/86b9dedd
Branch: refs/heads/calcite
Commit: 86b9deddf021a7b85f1afd8b44884c6fd41b7722
Parents: a78fdf5
Author: maryannxue <ma...@gmail.com>
Authored: Wed Mar 9 14:49:46 2016 -0500
Committer: maryannxue <ma...@gmail.com>
Committed: Wed Mar 9 14:49:46 2016 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/phoenix/calcite/PhoenixTable.java | 6 +-----
pom.xml | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/86b9dedd/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java
index 47ac80a..0b45322 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixTable.java
@@ -94,15 +94,13 @@ public class PhoenixTable extends AbstractTable implements TranslatableTable {
}
this.pkBitSet = ImmutableBitSet.of(pkPositions);
this.collation = RelCollationTraitDef.INSTANCE.canonize(RelCollations.of(fieldCollations));
- long rowCount = 0;
- long byteCount = 0;
try {
PhoenixStatement stmt = new PhoenixStatement(pc);
TableRef tableRef = new TableRef(CalciteUtils.createTempAlias(), pTable, HConstants.LATEST_TIMESTAMP, false);
ColumnResolver resolver = FromCompiler.getResolver(tableRef);
StatementContext context = new StatementContext(stmt, resolver, new Scan(), new SequenceManager(stmt));
Pair<Long, Long> estimatedCount = BaseResultIterators.getEstimatedCount(context, pTable);
- if (estimatedCount != null) {
+ if (estimatedCount.getFirst() != null) {
rowCount = estimatedCount.getFirst();
byteCount = estimatedCount.getSecond();
} else {
@@ -126,8 +124,6 @@ public class PhoenixTable extends AbstractTable implements TranslatableTable {
} catch (SQLException | IOException e) {
throw new RuntimeException(e);
}
- this.byteCount = byteCount;
- this.rowCount = rowCount;
}
public PTable getTable() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/86b9dedd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84e0dbf..e702b69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<!-- Do not change jodatime.version until HBASE-15199 is fixed -->
<jodatime.version>1.6</jodatime.version>
<joni.version>2.1.2</joni.version>
- <calcite.version>1.7.0-SNAPSHOT</calcite.version>
+ <calcite.version>1.6.0</calcite.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
<tephra.version>0.7.0</tephra.version>
<spark.version>1.5.2</spark.version>