This is an automated email from the ASF dual-hosted git repository.
virajjasani pushed a commit to branch 5.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.3 by this push:
new 120e2c2d6f PHOENIX-8003 Reduce index mutation propagation gap for
eventually consistent GSIs (#2616)
120e2c2d6f is described below
commit 120e2c2d6ff338d4caaa513f32b12890a51f523d
Author: Viraj Jasani <[email protected]>
AuthorDate: Wed Sep 16 22:11:15 2026 -0700
PHOENIX-8003 Reduce index mutation propagation gap for eventually
consistent GSIs (#2616)
---
.../main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java | 4 ++--
phoenix-core/src/it/java/org/apache/phoenix/end2end/Bson5IT.java | 2 --
.../phoenix/end2end/ConcurrentMutationsCoveredEventualGenerateIT.java | 2 --
.../apache/phoenix/end2end/ConcurrentMutationsExtendedGenerateIT.java | 2 --
.../org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java | 2 --
.../phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java | 2 --
.../end2end/ConcurrentMutationsUncoveredEventualGenerateIT.java | 2 --
.../src/it/java/org/apache/phoenix/end2end/IndexCDCConsumerLagIT.java | 3 ---
.../end2end/IndexToolForNonTxGlobalIndexEventualGenerateIT.java | 2 --
.../phoenix/end2end/IndexToolForNonTxGlobalIndexEventualIT.java | 2 --
.../apache/phoenix/end2end/MultiTenantEventualIndexGenerateIT.java | 2 --
.../java/org/apache/phoenix/end2end/MultiTenantEventualIndexIT.java | 2 --
.../src/it/java/org/apache/phoenix/end2end/VarBinaryEncoded2IT.java | 2 --
.../apache/phoenix/end2end/VarBinaryEncodedIndexUpsertSelectIT.java | 2 --
.../phoenix/end2end/index/GlobalIndexCheckerEventualGenerateIT.java | 2 --
.../apache/phoenix/end2end/index/GlobalIndexCheckerEventualIT.java | 2 --
16 files changed, 2 insertions(+), 33 deletions(-)
diff --git
a/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java
b/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java
index 46423f0d87..3306a351b7 100644
---
a/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java
+++
b/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java
@@ -125,9 +125,9 @@ public class IndexCDCConsumer implements Runnable {
* The time buffer in milliseconds subtracted from current time when
querying CDC mutations to
* help avoid reading mutations that are too recent.
*/
- public static final String INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS =
+ private static final String INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS =
"phoenix.index.cdc.consumer.timestamp.buffer.ms";
- private static final long DEFAULT_TIMESTAMP_BUFFER_MS = 5000;
+ private static final long DEFAULT_TIMESTAMP_BUFFER_MS = 1000;
/**
* Maximum number of retries when CDC events exist but the corresponding
data table mutations are
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Bson5IT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Bson5IT.java
index eea0ca8efe..4d3d585b83 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Bson5IT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Bson5IT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
@@ -81,7 +80,6 @@ public class Bson5IT extends ParallelStatsDisabledIT {
props.put(BaseScannerRegionObserverConstants.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
Integer.toString(60 * 60));
props.put(QueryServices.USE_STATS_FOR_PARALLELIZATION,
Boolean.toString(false));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(2000));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(5));
props.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE, Boolean.TRUE.toString());
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsCoveredEventualGenerateIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsCoveredEventualGenerateIT.java
index 0088a38a64..6491c4bee5 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsCoveredEventualGenerateIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsCoveredEventualGenerateIT.java
@@ -20,7 +20,6 @@ package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_PARENT_PROGRESS_PAUSE_MS;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Arrays;
@@ -57,7 +56,6 @@ public class ConcurrentMutationsCoveredEventualGenerateIT
props.put(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB,
Long.toString(2));
props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
Long.toString(1));
props.put(INDEX_CDC_CONSUMER_BATCH_SIZE, Integer.toString(4500));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(5000));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(200));
props.put(QueryServices.PHOENIX_SERVER_PAGE_SIZE_MS, Integer.toString(-1));
props.put("hbase.coprocessor.master.classes",
PhoenixMasterObserver.class.getName());
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedGenerateIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedGenerateIT.java
index 7a5cd7fb67..92a5a81226 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedGenerateIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedGenerateIT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Arrays;
@@ -52,7 +51,6 @@ public class ConcurrentMutationsExtendedGenerateIT extends
ConcurrentMutationsEx
props.put(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB,
Long.toString(2));
props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
Long.toString(1));
props.put(INDEX_CDC_CONSUMER_BATCH_SIZE, Integer.toString(4500));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(2500));
// props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(200));
props.put("hbase.coprocessor.master.classes",
PhoenixMasterObserver.class.getName());
props.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE, Boolean.FALSE.toString());
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java
index 63c0484c78..5253df3954 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIT.java
@@ -20,7 +20,6 @@ package org.apache.phoenix.end2end;
import static org.apache.phoenix.end2end.IndexToolIT.verifyIndexTable;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_PARENT_PROGRESS_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -98,7 +97,6 @@ public class ConcurrentMutationsExtendedIT extends
ParallelStatsDisabledIT {
props.put(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB,
Long.toString(2));
props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
Long.toString(1));
props.put(INDEX_CDC_CONSUMER_BATCH_SIZE, Integer.toString(4500));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(1000));
props.put("hbase.coprocessor.master.classes",
PhoenixMasterObserver.class.getName());
props.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE, Boolean.TRUE.toString());
props.put(INDEX_CDC_CONSUMER_PARENT_PROGRESS_PAUSE_MS,
Integer.toString(1000));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java
index 3b49514b99..f725d8cb2d 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Map;
@@ -57,7 +56,6 @@ public class ConcurrentMutationsLazyPostBatchWriteIT extends
ConcurrentMutations
props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
Long.toString(1));
props.put(QueryServices.PHOENIX_SERVER_PAGE_SIZE_MS, Integer.toString(-1));
props.put(INDEX_CDC_CONSUMER_BATCH_SIZE, Integer.toString(4500));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(2500));
props.put("hbase.coprocessor.master.classes",
PhoenixMasterObserver.class.getName());
props.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE, Boolean.FALSE.toString());
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsUncoveredEventualGenerateIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsUncoveredEventualGenerateIT.java
index 24511b46db..7c59f25284 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsUncoveredEventualGenerateIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsUncoveredEventualGenerateIT.java
@@ -20,7 +20,6 @@ package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_PARENT_PROGRESS_PAUSE_MS;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Arrays;
@@ -57,7 +56,6 @@ public class ConcurrentMutationsUncoveredEventualGenerateIT
props.put(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB,
Long.toString(2));
props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
Long.toString(1));
props.put(INDEX_CDC_CONSUMER_BATCH_SIZE, Integer.toString(4500));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(5000));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(200));
props.put(QueryServices.PHOENIX_SERVER_PAGE_SIZE_MS, Integer.toString(-1));
props.put("hbase.coprocessor.master.classes",
PhoenixMasterObserver.class.getName());
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexCDCConsumerLagIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexCDCConsumerLagIT.java
index db2ff8871e..d7e668e848 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexCDCConsumerLagIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexCDCConsumerLagIT.java
@@ -20,7 +20,6 @@ package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_LAG_SAMPLE_INTERVAL_MS;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_POLL_INTERVAL_MS;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.metrics.MetricsIndexCDCConsumerSource.CDC_INDEX_UPDATE_LAG;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -55,7 +54,6 @@ public class IndexCDCConsumerLagIT extends
ParallelStatsDisabledIT {
private static final Logger LOG =
LoggerFactory.getLogger(IndexCDCConsumerLagIT.class);
- private static final int TIMESTAMP_BUFFER_MS = 2_000;
private static final int POLL_INTERVAL_MS = 500;
private static final int LAG_SAMPLE_INTERVAL_MS = 500;
private static final int RETRY_PAUSE_MS = 100;
@@ -78,7 +76,6 @@ public class IndexCDCConsumerLagIT extends
ParallelStatsDisabledIT {
props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
Long.toString(1));
props.put(QueryServices.SERVER_SIDE_IMMUTABLE_INDEXES_ENABLED_ATTRIB,
Boolean.TRUE.toString());
props.put("hbase.coprocessor.master.classes",
PhoenixMasterObserver.class.getName());
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS,
Integer.toString(TIMESTAMP_BUFFER_MS));
props.put(INDEX_CDC_CONSUMER_POLL_INTERVAL_MS,
Integer.toString(POLL_INTERVAL_MS));
props.put(INDEX_CDC_CONSUMER_LAG_SAMPLE_INTERVAL_MS,
Integer.toString(LAG_SAMPLE_INTERVAL_MS));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS,
Integer.toString(RETRY_PAUSE_MS));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexEventualGenerateIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexEventualGenerateIT.java
index 533427174d..8ec9f1d0d2 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexEventualGenerateIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexEventualGenerateIT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Arrays;
@@ -68,7 +67,6 @@ public class IndexToolForNonTxGlobalIndexEventualGenerateIT
extends IndexToolFor
Long.toString(0));
serverProps.put("hbase.regionserver.rpc.retry.interval", Long.toString(0));
serverProps.put("hbase.procedure.remote.dispatcher.delay.msec",
Integer.toString(0));
- serverProps.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS,
Integer.toString(2000));
serverProps.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(5));
serverProps.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE,
Boolean.FALSE.toString());
serverProps.put(QueryServices.PHOENIX_SERVER_PAGE_SIZE_MS,
Integer.toString(-1));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexEventualIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexEventualIT.java
index 737be134cd..88f4a55396 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexEventualIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexEventualIT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Arrays;
@@ -68,7 +67,6 @@ public class IndexToolForNonTxGlobalIndexEventualIT extends
IndexToolForNonTxGlo
Long.toString(0));
serverProps.put("hbase.regionserver.rpc.retry.interval", Long.toString(0));
serverProps.put("hbase.procedure.remote.dispatcher.delay.msec",
Integer.toString(0));
- serverProps.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS,
Integer.toString(2000));
serverProps.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(5));
serverProps.put(QueryServices.PHOENIX_SERVER_PAGE_SIZE_MS,
Integer.toString(-1));
serverProps.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE,
Boolean.TRUE.toString());
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiTenantEventualIndexGenerateIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiTenantEventualIndexGenerateIT.java
index 857abf5e81..84725c0c12 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiTenantEventualIndexGenerateIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiTenantEventualIndexGenerateIT.java
@@ -19,7 +19,6 @@ package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Map;
@@ -42,7 +41,6 @@ public class MultiTenantEventualIndexGenerateIT extends
MultiTenantEventualIndex
props.put(BaseScannerRegionObserverConstants.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
Integer.toString(MAX_LOOKBACK_AGE));
props.put(INDEX_CDC_CONSUMER_BATCH_SIZE, Integer.toString(3500));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(4000));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Long.toString(10));
props.put(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB,
Long.toString(2));
props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
Long.toString(1));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiTenantEventualIndexIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiTenantEventualIndexIT.java
index e0a4ab2a4f..995c0a2391 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiTenantEventualIndexIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MultiTenantEventualIndexIT.java
@@ -19,7 +19,6 @@ package org.apache.phoenix.end2end;
import static org.apache.phoenix.end2end.IndexToolIT.verifyIndexTable;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -73,7 +72,6 @@ public class MultiTenantEventualIndexIT extends
ParallelStatsDisabledIT {
props.put(BaseScannerRegionObserverConstants.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
Integer.toString(MAX_LOOKBACK_AGE));
props.put(INDEX_CDC_CONSUMER_BATCH_SIZE, Integer.toString(3500));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(4000));
props.put(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB,
Long.toString(2));
props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
Long.toString(1));
props.put(QueryServices.SERVER_SIDE_IMMUTABLE_INDEXES_ENABLED_ATTRIB,
Boolean.TRUE.toString());
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VarBinaryEncoded2IT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VarBinaryEncoded2IT.java
index 6b05b7dd0a..b70b5c2f37 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VarBinaryEncoded2IT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VarBinaryEncoded2IT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
@@ -75,7 +74,6 @@ public class VarBinaryEncoded2IT extends
ParallelStatsDisabledIT {
props.put(BaseScannerRegionObserverConstants.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
Integer.toString(60 * 60));
props.put(QueryServices.USE_STATS_FOR_PARALLELIZATION,
Boolean.toString(false));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(2000));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(5));
props.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE, Boolean.FALSE.toString());
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VarBinaryEncodedIndexUpsertSelectIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VarBinaryEncodedIndexUpsertSelectIT.java
index 4962db30bd..d1b5c038f5 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/VarBinaryEncodedIndexUpsertSelectIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/VarBinaryEncodedIndexUpsertSelectIT.java
@@ -23,7 +23,6 @@ import static
org.apache.phoenix.end2end.VarBinaryEncodedUpsertSelectTestUtil.co
import static
org.apache.phoenix.end2end.VarBinaryEncodedUpsertSelectTestUtil.createTable;
import static
org.apache.phoenix.end2end.VarBinaryEncodedUpsertSelectTestUtil.upsertEncodedRow;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
@@ -67,7 +66,6 @@ public class VarBinaryEncodedIndexUpsertSelectIT extends
ParallelStatsDisabledIT
props.put(BaseScannerRegionObserverConstants.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
Integer.toString(60 * 60));
props.put(QueryServices.USE_STATS_FOR_PARALLELIZATION,
Boolean.toString(false));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(200));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(5));
props.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE, Boolean.FALSE.toString());
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerEventualGenerateIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerEventualGenerateIT.java
index a862df07ad..0e61fe7bb0 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerEventualGenerateIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerEventualGenerateIT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end.index;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Collection;
@@ -47,7 +46,6 @@ public class GlobalIndexCheckerEventualGenerateIT extends
GlobalIndexCheckerIT {
public static synchronized void doSetup() throws Exception {
Map<String, String> props = Maps.newHashMapWithExpectedSize(10);
props.put(QueryServices.GLOBAL_INDEX_ROW_AGE_THRESHOLD_TO_DELETE_MS_ATTRIB,
Long.toString(0));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(2000));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(5));
props.put(PHOENIX_INDEX_CDC_MUTATION_SERIALIZE, Boolean.FALSE.toString());
props.put(QueryServices.PHOENIX_SERVER_PAGE_SIZE_MS, Integer.toString(-1));
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerEventualIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerEventualIT.java
index d7b5a35e1c..1e21ca4cf3 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerEventualIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerEventualIT.java
@@ -18,7 +18,6 @@
package org.apache.phoenix.end2end.index;
import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_RETRY_PAUSE_MS;
-import static
org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS;
import static
org.apache.phoenix.hbase.index.IndexRegionObserver.PHOENIX_INDEX_CDC_MUTATION_SERIALIZE;
import java.util.Collection;
@@ -47,7 +46,6 @@ public class GlobalIndexCheckerEventualIT extends
GlobalIndexCheckerIT {
public static synchronized void doSetup() throws Exception {
Map<String, String> props = Maps.newHashMapWithExpectedSize(8);
props.put(QueryServices.GLOBAL_INDEX_ROW_AGE_THRESHOLD_TO_DELETE_MS_ATTRIB,
Long.toString(0));
- props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(2000));
props.put(INDEX_CDC_CONSUMER_RETRY_PAUSE_MS, Integer.toString(5));
props.put(QueryServices.PHOENIX_SERVER_PAGE_SIZE_MS, Integer.toString(-1));
props.put(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB,
Long.toString(2));
