(phoenix) branch master updated: PHOENIX-7422 Fix Flapper TableTTLIT#testMinorCompactionShouldNotRetainCellsWhenMaxLookbackIsDisabled (#1999)

[tkhurana]

This is an automated email from the ASF dual-hosted git repository.

tkhurana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new 13ed99b7c8 PHOENIX-7422 Fix Flapper 
TableTTLIT#testMinorCompactionShouldNotRetainCellsWhenMaxLookbackIsDisabled 
(#1999)
13ed99b7c8 is described below

commit 13ed99b7c897d160b89ba4c6d8308a037faea90c
Author: tkhurana <khurana.ta...@gmail.com>
AuthorDate: Mon Oct 14 09:02:59 2024 -0700

    PHOENIX-7422 Fix Flapper 
TableTTLIT#testMinorCompactionShouldNotRetainCellsWhenMaxLookbackIsDisabled 
(#1999)
    
    * PHOENIX-7422 Fix Flapper 
TableTTLIT#testMinorCompactionShouldNotRetainCellsWhenMaxLookbackIsDisabled
    
    When multiple updates happen to the same row within the same millisecond the
    latest update simply overwrites the cells of the previous update. This 
breaks the test.
    
    * Address review comments
    
    ---------
    
    Co-authored-by: Tanuj Khurana <tkhur...@apache.org>
---
 .../org/apache/phoenix/end2end/TableTTLIT.java     | 42 +++++++++++++---------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableTTLIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableTTLIT.java
index f7188e8006..ba22bf667a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableTTLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableTTLIT.java
@@ -261,25 +261,33 @@ public class TableTTLIT extends BaseTest {
             final int flushCount = 10;
             byte[] row = Bytes.toBytes("a");
             int rowUpdateCounter = 0;
-            for (int i = 0; i < flushCount; i++) {
-                // Generate more row versions than the maximum cell versions 
for the table
-                int updateCount = RAND.nextInt(10) + versions;
-                rowUpdateCounter += updateCount;
-                for (int j = 0; j < updateCount; j++) {
-                    updateRow(conn, tableName, "a");
+            try {
+                for (int i = 0; i < flushCount; i++) {
+                    // Generate more row versions than the maximum cell 
versions for the table
+                    int updateCount = RAND.nextInt(10) + versions;
+                    rowUpdateCounter += updateCount;
+                    LOG.info(String.format("Iteration:%d uc:%d cntr:%d",
+                            i, updateCount, rowUpdateCounter));
+                    for (int j = 0; j < updateCount; j++) {
+                        updateRow(conn, tableName, "a");
+                        // Sometimes multiple updates to the same row are done 
in the same millisecond
+                        // This results in overwriting the previous version 
which breaks the test
+                        Thread.sleep(1);
+                    }
+                    flush(TableName.valueOf(tableName));
+                    // Flushes dump and retain all the cells to HFile.
+                    // Doing MAX_COLUMN_INDEX + 1 to account for empty cells
+                    assertEquals(TestUtil.getRawCellCount(conn, 
TableName.valueOf(tableName), row),
+                            rowUpdateCounter * (MAX_COLUMN_INDEX + 1));
                 }
-                flush(TableName.valueOf(tableName));
-                // Flushes dump and retain all the cells to HFile.
-                // Doing MAX_COLUMN_INDEX + 1 to account for empty cells
-                assertEquals(TestUtil.getRawCellCount(conn, 
TableName.valueOf(tableName), row),
-                        rowUpdateCounter * (MAX_COLUMN_INDEX + 1));
+                // Run one minor compaction (in case no minor compaction has 
happened yet)
+                TestUtil.minorCompact(utility, TableName.valueOf(tableName));
+                assertEquals(TestUtil.getRawCellCount(conn, 
TableName.valueOf(tableName),
+                                Bytes.toBytes("a")), (MAX_COLUMN_INDEX + 1) * 
versions);
+            } catch (AssertionError e) {
+                TestUtil.dumpTable(conn, TableName.valueOf(tableName));
+                throw e;
             }
-            TestUtil.dumpTable(conn, TableName.valueOf(tableName));
-            // Run one minor compaction (in case no minor compaction has 
happened yet)
-            TestUtil.minorCompact(utility, TableName.valueOf(tableName));
-            TestUtil.dumpTable(conn, TableName.valueOf(tableName));
-            assertEquals(TestUtil.getRawCellCount(conn, 
TableName.valueOf(tableName), Bytes.toBytes("a")),
-                    (MAX_COLUMN_INDEX + 1) * versions);
         }
     }