You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ra...@apache.org on 2015/04/30 12:58:59 UTC
[2/2] phoenix git commit: PHOENIX-1856 Include min row key for each
region in stats row-addendum_1(Ram)
PHOENIX-1856 Include min row key for each region in stats row-addendum_1(Ram)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/51d1eb56
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/51d1eb56
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/51d1eb56
Branch: refs/heads/4.x-HBase-1.0
Commit: 51d1eb56cc38986cb01db46a0f30e6cf8a9ab1f7
Parents: 66615d5 6948e48
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
Authored: Thu Apr 30 16:28:55 2015 +0530
Committer: Rajeshbabu Chintaguntla <ra...@apache.org>
Committed: Thu Apr 30 16:28:55 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/phoenix/expression/ExpressionType.java | 8 ++++----
.../src/main/java/org/apache/phoenix/schema/PTableImpl.java | 4 ++++
.../org/apache/phoenix/schema/stats/StatisticsCollector.java | 2 ++
3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/51d1eb56/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
index bf4420c,edbefd5..57183a6
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
@@@ -720,7 -720,7 +720,11 @@@ public class PTableImpl implements PTab
newMutations();
Delete delete = new Delete(key);
for (PColumnFamily colFamily : families) {
++<<<<<<< HEAD
+ delete.addFamily(colFamily.getName().getBytes(), ts);
++=======
+ delete.deleteFamily(colFamily.getName().getBytes(), ts);
++>>>>>>> 6948e48f61401945501b36dc8194a980fbaf0564
}
deleteRow = delete;
// No need to write to the WAL for indexes
http://git-wip-us.apache.org/repos/asf/phoenix/blob/51d1eb56/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
index 8e41d4e,8e41d4e..272cac6
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
@@@ -284,6 -284,6 +284,8 @@@ public class StatisticsCollector
public void getMinKey(ImmutableBytesWritable ptr) {
if (minKey != null) {
ptr.set(minKey, minKeyOffset, minKeyLength);
++ } else {
++ ptr.set(HConstants.EMPTY_BYTE_ARRAY);
}
}
}