Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -667,8 +667,7 @@ public static long addEpochToTxId(long epoch, long txId) {
*/
@VisibleForTesting
public static long getTxIdFromObjectId(long objectId) {
return ((Long.MAX_VALUE >> REVERSE_EPOCH_ID_SHIFT) & objectId)
>> TRANSACTION_ID_SHIFT;
return (0x3FFFFFFFFFFFFFFFL & objectId) >> TRANSACTION_ID_SHIFT;
Comment thread
ivandika3 marked this conversation as resolved.
Outdated
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

import java.io.File;
Expand Down Expand Up @@ -257,5 +258,104 @@ public void testGetActiveNonListenerOMNodeIdsFiltering() {
assertEquals(expected.size(), result.size());
assertTrue(result.containsAll(expected));
}
}

@Test
void testGetOMEpoch() {
assertEquals(2, OmUtils.getOMEpoch());
assertEquals(OmUtils.EPOCH_WHEN_RATIS_ENABLED, OmUtils.getOMEpoch());
}

@Test
void testAddEpochToTxId() {
assertEquals(0L, OmUtils.addEpochToTxId(0, 0));
assertEquals(1L << 62, OmUtils.addEpochToTxId(1, 0));
assertEquals(2L << 62, OmUtils.addEpochToTxId(2, 0));
assertEquals(3L << 62, OmUtils.addEpochToTxId(3, 0));

long txId = 12345L;
long expected = (2L << 62) | (txId << 8);
assertEquals(expected, OmUtils.addEpochToTxId(2, txId));

long maxTxId = OmUtils.MAX_TRXN_ID;
long maxExpected = (2L << 62) | (maxTxId << 8);
assertEquals(maxExpected, OmUtils.addEpochToTxId(2, maxTxId));

// Verify bit structure
long result = OmUtils.addEpochToTxId(2, 0x123456789ABCDL);
assertEquals(2L, result >>> 62);
assertEquals(0x123456789ABCDL, (result & 0x3FFFFFFFFFFFFFFFL) >>> 8);
}

@Test
void testGetTxIdFromObjectId() {
long[] testTxIds = {0L, 1L, 100L, 1000L, 0x123456789ABCDL, OmUtils.MAX_TRXN_ID};
long[] testEpochs = {0L, 1L, 2L, 3L};

for (long epoch : testEpochs) {
for (long txId : testTxIds) {
long objectId = OmUtils.addEpochToTxId(epoch, txId);
long extractedTxId = OmUtils.getTxIdFromObjectId(objectId);
assertEquals(txId, extractedTxId,
String.format("Round-trip failed for epoch=%d, txId=%d", epoch, txId));
}
}

long objectId = (2L << 62) | (0x123456789ABCDL << 8);
long extractedTxId = OmUtils.getTxIdFromObjectId(objectId);
assertEquals(0x123456789ABCDL, extractedTxId);
}

@Test
void testGetObjectIdFromTxId() {
long txId = 12345L;
long epoch = 2L;
long expected = OmUtils.addEpochToTxId(epoch, txId);
assertEquals(expected, OmUtils.getObjectIdFromTxId(epoch, txId));

for (long e = 0; e <= 3; e++) {
long result = OmUtils.getObjectIdFromTxId(e, txId);
assertEquals(e, result >>> 62);
assertEquals(txId, (result & 0x3FFFFFFFFFFFFFFFL) >>> 8);
}

long maxTxId = OmUtils.MAX_TRXN_ID;
long maxResult = OmUtils.getObjectIdFromTxId(epoch, maxTxId);
assertEquals(epoch, maxResult >>> 62);
assertEquals(maxTxId, (maxResult & 0x3FFFFFFFFFFFFFFFL) >>> 8);
}

@Test
void testGetObjectIdFromTxIdValidation() {
long validTxId = OmUtils.MAX_TRXN_ID;
// Test valid case - should not throw exception
try {
OmUtils.getObjectIdFromTxId(2, validTxId);
} catch (Exception e) {
fail("Valid txId should not throw exception: " + e.getMessage());
}

long invalidTxId = (1L << 54) - 1; // MAX_TRXN_ID + 1
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
() -> OmUtils.getObjectIdFromTxId(2, invalidTxId));
assertTrue(exception.getMessage().contains("TransactionID exceeds max limit"));
}

@Test
void testEpochAndTxIdCalculationConsistency() {
long[] testCases = {
0L, 1L, 100L, 1000L, 10000L,
0x123456789ABCDL, 0xFFFFFFFFFFFFL, OmUtils.MAX_TRXN_ID
};

for (long txId : testCases) {
long epoch = OmUtils.getOMEpoch();
long objectId = OmUtils.getObjectIdFromTxId(epoch, txId);
long extractedTxId = OmUtils.getTxIdFromObjectId(objectId);

assertEquals(txId, extractedTxId,
String.format("Consistency check failed for txId=%d", txId));
assertEquals(epoch, objectId >>> 62,
String.format("Epoch not preserved for txId=%d", txId));
}
}
}