Repository: phoenix Updated Branches: refs/heads/txn 1baa1b6b0 -> 974329cd1
Replace check for null delete in PhoenixIndexCodec with check for isValid delete in PhoenixTransactionalIndexer Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/974329cd Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/974329cd Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/974329cd Branch: refs/heads/txn Commit: 974329cd13571d92a683bb00e87d56d6e8b0168d Parents: 1baa1b6 Author: Thomas <tdsi...@salesforce.com> Authored: Fri Apr 17 16:49:58 2015 -0700 Committer: Thomas <tdsi...@salesforce.com> Committed: Fri Apr 17 16:49:58 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/index/PhoenixIndexCodec.java | 4 ---- .../org/apache/phoenix/index/PhoenixTransactionalIndexer.java | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/974329cd/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java index 36b849d..956e5ea 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexCodec.java @@ -116,10 +116,6 @@ public class PhoenixIndexCodec extends BaseIndexCodec { indexUpdate.setTable(maintainer.getIndexTableName()); Delete delete = maintainer.buildDeleteMutation(KV_BUILDER, valueGetter, ptr, state.getPendingUpdate(), state.getCurrentTimestamp(), env.getRegion().getStartKey(), env.getRegion().getEndKey()); - if (delete == null) { - throw new IllegalStateException("Null put for " + env.getRegion().getRegionInfo().getTable().getNameAsString() - + ": " + Bytes.toStringBinary(ptr.get(), ptr.getOffset(), ptr.getLength())); - } indexUpdate.setUpdate(delete); indexUpdates.add(indexUpdate); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/974329cd/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java index adba507..d77f7e6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java @@ -191,7 +191,8 @@ public class PhoenixTransactionalIndexer extends BaseRegionObserver { TxTableState state = new TxTableState(env, mutableColumns, updateAttributes, tx.getWritePointer(), m, result); Iterable<IndexUpdate> deletes = codec.getIndexDeletes(state, indexMetaData); for (IndexUpdate delete : deletes) { - indexUpdates.add(new Pair<Mutation, byte[]>(delete.getUpdate(),delete.getTableName())); + if (delete.isValid()) + indexUpdates.add(new Pair<Mutation, byte[]>(delete.getUpdate(),delete.getTableName())); } state.applyMutation(); Iterable<IndexUpdate> updates = codec.getIndexUpserts(state, indexMetaData);
