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 13:23:31 UTC
phoenix git commit: By mistake pushed merge. Reverting unwanted.
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.0 51d1eb56c -> 2d286bc04
By mistake pushed merge. Reverting unwanted.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2d286bc0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2d286bc0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2d286bc0
Branch: refs/heads/4.x-HBase-1.0
Commit: 2d286bc0450f8d6c3be673bf3d2370ae6e14b9b4
Parents: 51d1eb5
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
Authored: Thu Apr 30 16:53:33 2015 +0530
Committer: Rajeshbabu Chintaguntla <ra...@apache.org>
Committed: Thu Apr 30 16:53:33 2015 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/phoenix/schema/PTableImpl.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/2d286bc0/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
index 57183a6..bf4420c 100644
--- 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,11 +720,7 @@ public class PTableImpl implements PTable {
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