From 724acf2d0280539daa3bcce797fef38f8677eec8 Mon Sep 17 00:00:00 2001 From: Ranganath Govardhanagiri Date: Wed, 3 Jul 2024 16:44:04 +0530 Subject: [PATCH] PHOENIX-7321 : Rename PhoenixIndexBuilderHelper to AtomicUpsertHelper --- .../java/org/apache/phoenix/compile/UpsertCompiler.java | 6 +++--- .../java/org/apache/phoenix/execute/MutationState.java | 8 ++++---- ...nixIndexBuilderHelper.java => AtomicUpsertHelper.java} | 2 +- .../apache/phoenix/hbase/index/IndexRegionObserver.java | 7 +++---- .../org/apache/phoenix/index/PhoenixIndexBuilder.java | 8 ++++---- 5 files changed, 15 insertions(+), 16 deletions(-) rename phoenix-core-client/src/main/java/org/apache/phoenix/index/{PhoenixIndexBuilderHelper.java => AtomicUpsertHelper.java} (99%) diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java b/phoenix-core-client/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java index e9ff7d15e4f..42775fc1080 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java @@ -43,7 +43,7 @@ import org.apache.phoenix.expression.LiteralExpression; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.index.IndexMaintainer; -import org.apache.phoenix.index.PhoenixIndexBuilderHelper; +import org.apache.phoenix.index.AtomicUpsertHelper; import org.apache.phoenix.index.PhoenixIndexCodec; import org.apache.phoenix.iterate.ResultIterator; import org.apache.phoenix.jdbc.PhoenixConnection; @@ -883,7 +883,7 @@ public MutationPlan compile(UpsertStatement upsert) throws SQLException { .build().buildException(); } if (onDupKeyPairs.isEmpty()) { // ON DUPLICATE KEY IGNORE - onDupKeyBytesToBe = PhoenixIndexBuilderHelper.serializeOnDupKeyIgnore(); + onDupKeyBytesToBe = AtomicUpsertHelper.serializeOnDupKeyIgnore(); } else { // ON DUPLICATE KEY UPDATE; onDupKeyBytesToBe = getOnDuplicateKeyBytes(table, context, onDupKeyPairs, resolver); } @@ -959,7 +959,7 @@ public int getPosition() { } PTable onDupKeyTable = PTableImpl.builderWithColumns(table, updateColumns).build(); onDupKeyBytesToBe = - PhoenixIndexBuilderHelper.serializeOnDupKeyUpdate(onDupKeyTable, updateExpressions); + AtomicUpsertHelper.serializeOnDupKeyUpdate(onDupKeyTable, updateExpressions); return onDupKeyBytesToBe; } diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core-client/src/main/java/org/apache/phoenix/execute/MutationState.java index 529b6cd60ed..877893441fb 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/execute/MutationState.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/execute/MutationState.java @@ -82,7 +82,7 @@ import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.index.IndexMetaDataCacheClient; -import org.apache.phoenix.index.PhoenixIndexBuilderHelper; +import org.apache.phoenix.index.AtomicUpsertHelper; import org.apache.phoenix.index.PhoenixIndexFailurePolicyHelper; import org.apache.phoenix.index.PhoenixIndexFailurePolicyHelper.MutateCommand; import org.apache.phoenix.index.PhoenixIndexMetaData; @@ -845,7 +845,7 @@ private void generateMutations(final TableRef tableRef, final long mutationTimes // TODO: use our ServerCache for (Mutation mutation : rowMutations) { if (onDupKeyBytes != null) { - mutation.setAttribute(PhoenixIndexBuilderHelper.ATOMIC_OP_ATTRIB, onDupKeyBytes); + mutation.setAttribute(AtomicUpsertHelper.ATOMIC_OP_ATTRIB, onDupKeyBytes); } } rowMutationsPertainingToIndex = rowMutations; @@ -1103,7 +1103,7 @@ static MutationBytes calculateMutationSize(List mutations, } else if (mutation instanceof Put) { upsertsize += temp; upsertCounter++; - if (mutation.getAttribute(PhoenixIndexBuilderHelper.ATOMIC_OP_ATTRIB) != null) { + if (mutation.getAttribute(AtomicUpsertHelper.ATOMIC_OP_ATTRIB) != null) { atomicUpsertsize += temp; } allDeletesMutations = false; @@ -2374,7 +2374,7 @@ boolean join(RowMutationState newRow) { } // Concatenate ON DUPLICATE KEY bytes to allow multiple // increments of the same row in the same commit batch. - this.onDupKeyBytes = PhoenixIndexBuilderHelper.combineOnDupKey(this.onDupKeyBytes, newRow.onDupKeyBytes); + this.onDupKeyBytes = AtomicUpsertHelper.combineOnDupKey(this.onDupKeyBytes, newRow.onDupKeyBytes); statementIndexes = joinSortedIntArrays(statementIndexes, newRow.getStatementIndexes()); return true; } diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilderHelper.java b/phoenix-core-client/src/main/java/org/apache/phoenix/index/AtomicUpsertHelper.java similarity index 99% rename from phoenix-core-client/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilderHelper.java rename to phoenix-core-client/src/main/java/org/apache/phoenix/index/AtomicUpsertHelper.java index 81bda56408e..903a3dd9d2e 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilderHelper.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/index/AtomicUpsertHelper.java @@ -34,7 +34,7 @@ import org.apache.phoenix.schema.PTableImpl; import org.apache.phoenix.util.TrustedByteArrayOutputStream; -public final class PhoenixIndexBuilderHelper { +public final class AtomicUpsertHelper { private static final byte[] ON_DUP_KEY_IGNORE_BYTES = new byte[] {1}; // boolean true private static final int ON_DUP_KEY_HEADER_BYTE_SIZE = Bytes.SIZEOF_SHORT + Bytes.SIZEOF_BOOLEAN; public static final String ATOMIC_OP_ATTRIB = "_ATOMIC_OP_ATTRIB"; diff --git a/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java b/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java index 317841fb13d..3dbb82906a9 100644 --- a/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java +++ b/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.phoenix.execute.MutationState; import org.apache.phoenix.expression.CaseExpression; -import org.apache.phoenix.index.PhoenixIndexBuilderHelper; +import org.apache.phoenix.index.AtomicUpsertHelper; import org.apache.phoenix.schema.types.PInteger; import org.apache.phoenix.thirdparty.com.google.common.base.Preconditions; import org.apache.phoenix.thirdparty.com.google.common.collect.ArrayListMultimap; @@ -58,7 +58,6 @@ import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HConstants.OperationStatusCode; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; @@ -141,7 +140,7 @@ import static org.apache.phoenix.coprocessor.IndexRebuildRegionScanner.applyNew; import static org.apache.phoenix.coprocessor.IndexRebuildRegionScanner.removeColumn; -import static org.apache.phoenix.index.PhoenixIndexBuilderHelper.ATOMIC_OP_ATTRIB; +import static org.apache.phoenix.index.AtomicUpsertHelper.ATOMIC_OP_ATTRIB; import static org.apache.phoenix.util.ByteUtil.EMPTY_BYTE_ARRAY; /** @@ -1564,7 +1563,7 @@ private List generateOnDupMutations(BatchMutateContext context, Put at Pair dataRowState = context.dataRowStates.get(rowKeyPtr); Put currentDataRowState = dataRowState != null ? dataRowState.getFirst() : null; - if (PhoenixIndexBuilderHelper.isDupKeyIgnore(opBytes)) { + if (AtomicUpsertHelper.isDupKeyIgnore(opBytes)) { if (currentDataRowState == null) { // new row mutations.add(atomicPut); diff --git a/phoenix-core-server/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java b/phoenix-core-server/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java index 6720c6b5a21..65c08af7711 100644 --- a/phoenix-core-server/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java +++ b/phoenix-core-server/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java @@ -102,7 +102,7 @@ public void batchStarted(MiniBatchOperationInProgress miniBatchOp, Ind @Override public boolean isAtomicOp(Mutation m) { - return m.getAttribute(PhoenixIndexBuilderHelper.ATOMIC_OP_ATTRIB) != null; + return m.getAttribute(AtomicUpsertHelper.ATOMIC_OP_ATTRIB) != null; } private static void transferCells(Mutation source, Mutation target) { @@ -123,11 +123,11 @@ private static List convertIncrementToPutInSingletonList(Increment inc @Override public List executeAtomicOp(Increment inc) throws IOException { - byte[] opBytes = inc.getAttribute(PhoenixIndexBuilderHelper.ATOMIC_OP_ATTRIB); + byte[] opBytes = inc.getAttribute(AtomicUpsertHelper.ATOMIC_OP_ATTRIB); if (opBytes == null) { // Unexpected return null; } - inc.setAttribute(PhoenixIndexBuilderHelper.ATOMIC_OP_ATTRIB, null); + inc.setAttribute(AtomicUpsertHelper.ATOMIC_OP_ATTRIB, null); Put put = null; Delete delete = null; // We cannot neither use the time stamp in the Increment to set the Get time range @@ -140,7 +140,7 @@ public List executeAtomicOp(Increment inc) throws IOException { long ts = HConstants.LATEST_TIMESTAMP; byte[] rowKey = inc.getRow(); final Get get = new Get(rowKey); - if (PhoenixIndexBuilderHelper.isDupKeyIgnore(opBytes)) { + if (AtomicUpsertHelper.isDupKeyIgnore(opBytes)) { get.setFilter(new FirstKeyOnlyFilter()); try (RegionScanner scanner = this.env.getRegion().getScanner(new Scan(get))) { List cells = new ArrayList<>();