Fix naming convension to getFamilyDeleteMarker
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/476d13d5 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/476d13d5 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/476d13d5 Branch: refs/heads/omid Commit: 476d13d53733b1a9518db1babe25cd303f5aea58 Parents: ffac47e Author: Ohad Shacham <[email protected]> Authored: Wed May 10 14:46:47 2017 +0300 Committer: Ohad Shacham <[email protected]> Committed: Wed May 10 14:46:47 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/index/IndexMaintainer.java | 2 +- .../src/main/java/org/apache/phoenix/schema/PTableImpl.java | 4 ++-- .../org/apache/phoenix/transaction/OmidTransactionContext.java | 2 +- .../apache/phoenix/transaction/PhoenixTransactionContext.java | 2 +- .../org/apache/phoenix/transaction/TephraTransactionContext.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/476d13d5/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 ab5b946..43e2bde 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 @@ -1064,7 +1064,7 @@ public class IndexMaintainer implements Writable, Iterable<ColumnReference> { } else if (kv.getTypeByte() == KeyValue.Type.DeleteFamily.getCode() // Since we don't include the index rows in the change set for txn tables, we need to detect row deletes that have transformed by TransactionProcessor - || (CellUtil.matchingQualifier(kv, TransactionFactory.getTransactionFactory().getTransactionContext().get_famility_delete_marker()) && CellUtil.matchingValue(kv, HConstants.EMPTY_BYTE_ARRAY))) { + || (CellUtil.matchingQualifier(kv, TransactionFactory.getTransactionFactory().getTransactionContext().getFamilyDeleteMarker()) && CellUtil.matchingValue(kv, HConstants.EMPTY_BYTE_ARRAY))) { nDeleteCF++; } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/476d13d5/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 3c1a01b..9710356 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 @@ -1023,11 +1023,11 @@ public class PTableImpl implements PTable { if (PTableImpl.this.isTransactional()) { Put put = new Put(key); if (families.isEmpty()) { - put.add(SchemaUtil.getEmptyColumnFamily(PTableImpl.this), TransactionFactory.getTransactionFactory().getTransactionContext().get_famility_delete_marker(), ts, + put.add(SchemaUtil.getEmptyColumnFamily(PTableImpl.this), TransactionFactory.getTransactionFactory().getTransactionContext().getFamilyDeleteMarker(), ts, HConstants.EMPTY_BYTE_ARRAY); } else { for (PColumnFamily colFamily : families) { - put.add(colFamily.getName().getBytes(), TransactionFactory.getTransactionFactory().getTransactionContext().get_famility_delete_marker(), ts, + put.add(colFamily.getName().getBytes(), TransactionFactory.getTransactionFactory().getTransactionContext().getFamilyDeleteMarker(), ts, HConstants.EMPTY_BYTE_ARRAY); } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/476d13d5/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java index 2ae95bb..e217c28 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java @@ -132,7 +132,7 @@ public class OmidTransactionContext implements PhoenixTransactionContext { } @Override - public byte[] get_famility_delete_marker() { + public byte[] getFamilyDeleteMarker() { // TODO Auto-generated method stub return null; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/476d13d5/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java index a13b5a6..032b2d4 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionContext.java @@ -156,7 +156,7 @@ public interface PhoenixTransactionContext { * * @return the family delete marker */ - public byte[] get_famility_delete_marker(); + public byte[] getFamilyDeleteMarker(); /** * Setup transaction manager's configuration for testing http://git-wip-us.apache.org/repos/asf/phoenix/blob/476d13d5/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java index 5c4178d..ad01309 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java @@ -415,7 +415,7 @@ public class TephraTransactionContext implements PhoenixTransactionContext { } @Override - public byte[] get_famility_delete_marker() { + public byte[] getFamilyDeleteMarker() { return TxConstants.FAMILY_DELETE_QUALIFIER; }
