You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2016/10/07 01:34:05 UTC
phoenix git commit: Serialize storeColsInSingleCell in IndexMaintainer
Repository: phoenix
Updated Branches:
refs/heads/encodecolumns2 33ba1ee8e -> ada45e91a
Serialize storeColsInSingleCell in IndexMaintainer
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ada45e91
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ada45e91
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ada45e91
Branch: refs/heads/encodecolumns2
Commit: ada45e91a01a09d0d038368b6d3f9367c522e439
Parents: 33ba1ee
Author: Samarth <sa...@salesforce.com>
Authored: Thu Oct 6 18:33:50 2016 -0700
Committer: Samarth <sa...@salesforce.com>
Committed: Thu Oct 6 18:33:50 2016 -0700
----------------------------------------------------------------------
.../src/it/java/org/apache/phoenix/end2end/AlterTableIT.java | 1 -
.../src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java | 4 ++--
.../src/main/java/org/apache/phoenix/index/IndexMaintainer.java | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ada45e91/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index 0acbe1e..507108d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -244,7 +244,6 @@ public class AlterTableIT extends ParallelStatsDisabledIT {
@Test
- @Ignore //FIXME: See PHOENIX-3340
public void testDropIndexedColumnImmutableIndex() throws Exception {
helpTestDropIndexedColumn(true);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ada45e91/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 687c26a..9ac7be3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -433,7 +433,7 @@ public class StatsCollectorIT extends ParallelStatsEnabledIT {
List<KeyRange> keyRanges = getAllSplits(conn, fullTableName);
assertEquals(26, keyRanges.size());
rs = conn.createStatement().executeQuery("EXPLAIN SELECT * FROM " + fullTableName);
- assertEquals("CLIENT 26-CHUNK 25 ROWS 12420 BYTES PARALLEL 1-WAY FULL SCAN OVER " + fullTableName,
+ assertEquals("CLIENT 26-CHUNK 25 ROWS 12530 BYTES PARALLEL 1-WAY FULL SCAN OVER " + fullTableName,
QueryUtil.getExplainPlan(rs));
ConnectionQueryServices services = conn.unwrap(PhoenixConnection.class).getQueryServices();
@@ -505,7 +505,7 @@ public class StatsCollectorIT extends ParallelStatsEnabledIT {
int startIndex = r.nextInt(strings.length);
int endIndex = r.nextInt(strings.length - startIndex) + startIndex;
long rows = endIndex - startIndex;
- long c2Bytes = rows * 35;
+ long c2Bytes = rows * 37;
System.out.println(rows + ":" + startIndex + ":" + endIndex);
rs = conn.createStatement().executeQuery(
"SELECT COLUMN_FAMILY,SUM(GUIDE_POSTS_ROW_COUNT),SUM(GUIDE_POSTS_WIDTH) from SYSTEM.STATS where PHYSICAL_NAME = '"
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ada45e91/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
index dc5e3e7..b1dd5f4 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
@@ -1290,6 +1290,7 @@ public class IndexMaintainer implements Writable, Iterable<ColumnReference> {
byte[] dataTableCq = Bytes.readByteArray(input);
coveredColumnsInfo.add(new Pair<>(Bytes.toString(dataTableCf), Bytes.toString(dataTableCq)));
}
+ storeColsInSingleCell = WritableUtils.readVInt(input) > 0;
initCachedState();
}
@@ -1353,6 +1354,7 @@ public class IndexMaintainer implements Writable, Iterable<ColumnReference> {
Bytes.writeByteArray(output, colInfo.getFirst() == null ? null : colInfo.getFirst().getBytes());
Bytes.writeByteArray(output, colInfo.getSecond().getBytes());
}
+ WritableUtils.writeVInt(output, storeColsInSingleCell ? 1 : -1);
}
public int getEstimatedByteSize() {