You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2015/08/13 03:35:17 UTC
phoenix git commit: Update tephra version to 0.6.2-SNAPSHOT in
pom.xml , fix bug related to issuing column deletes
Repository: phoenix
Updated Branches:
refs/heads/txn 6bcbbbd73 -> a11f48300
Update tephra version to 0.6.2-SNAPSHOT in pom.xml , fix bug related to issuing column deletes
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a11f4830
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a11f4830
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a11f4830
Branch: refs/heads/txn
Commit: a11f483003fc3620a1e3d335c5889b8356309e80
Parents: 6bcbbbd
Author: Thomas D'Silva <td...@salesforce.com>
Authored: Wed Aug 12 18:34:28 2015 -0700
Committer: Thomas D'Silva <td...@salesforce.com>
Committed: Wed Aug 12 18:34:28 2015 -0700
----------------------------------------------------------------------
phoenix-core/pom.xml | 8 ++++----
.../main/java/org/apache/phoenix/index/IndexMaintainer.java | 9 ++++++---
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a11f4830/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 7ca5d1e..775411c 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -224,24 +224,24 @@
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-api</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.6.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-core</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.6.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.6.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-hbase-compat-0.98</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.6.2-SNAPSHOT</version>
</dependency>
<!-- Make sure we have all the antlr dependencies -->
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a11f4830/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 aaaf685..b0f87cb 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
@@ -822,7 +822,10 @@ public class IndexMaintainer implements Writable, Iterable<ColumnReference> {
int nDeleteCF = 0;
int nDeleteVersionCF = 0;
for (Cell kv : pendingUpdates) {
- if (kv.getTypeByte() == KeyValue.Type.DeleteFamilyVersion.getCode()) {
+ if (kv.getTypeByte() == KeyValue.Type.DeleteFamily.getCode()) {
+ nDeleteCF++;
+ }
+ else if (kv.getTypeByte() == KeyValue.Type.DeleteFamilyVersion.getCode()) {
nDeleteVersionCF++;
}
}
@@ -884,12 +887,12 @@ public class IndexMaintainer implements Writable, Iterable<ColumnReference> {
Delete delete = new Delete(indexRowKey);
// If table delete was single version, then index delete should be as well
if (deleteType == DeleteType.SINGLE_VERSION) {
- for (ColumnReference ref : getAllColumns()) { // FIXME: Keep Set<byte[]> for index CFs?
+ for (ColumnReference ref : getCoverededColumns()) { // FIXME: Keep Set<byte[]> for index CFs?
delete.deleteFamilyVersion(ref.getFamily(), ts);
}
delete.deleteFamilyVersion(emptyCF, ts);
} else {
- for (ColumnReference ref : getAllColumns()) { // FIXME: Keep Set<byte[]> for index CFs?
+ for (ColumnReference ref : getCoverededColumns()) { // FIXME: Keep Set<byte[]> for index CFs?
delete.deleteFamily(ref.getFamily(), ts);
}
delete.deleteFamily(emptyCF, ts);