You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2023/03/02 18:46:57 UTC
[pinot] branch master updated: Fix for flaky test ForwardIndexHandlerTest.testEnableDictionaryForMultipleColumns (#10366)
This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 398b7f5350 Fix for flaky test ForwardIndexHandlerTest.testEnableDictionaryForMultipleColumns (#10366)
398b7f5350 is described below
commit 398b7f53507b731b98a0331574201b319562f737
Author: Sonam Mandal <so...@linkedin.com>
AuthorDate: Thu Mar 2 10:46:48 2023 -0800
Fix for flaky test ForwardIndexHandlerTest.testEnableDictionaryForMultipleColumns (#10366)
---
.../local/segment/index/loader/ForwardIndexHandler.java | 6 +-----
.../local/segment/index/loader/ForwardIndexHandlerTest.java | 10 ++++++++--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandler.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandler.java
index 69c431fcdb..9213f3aea7 100644
--- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandler.java
+++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandler.java
@@ -271,11 +271,7 @@ public class ForwardIndexHandler extends BaseIndexHandler {
continue;
}
- if (newNoDictColumns.contains(column)) {
- columnOperationsMap.put(column, Collections.singletonList(Operation.ENABLE_FORWARD_INDEX));
- } else {
- columnOperationsMap.put(column, Collections.singletonList(Operation.ENABLE_FORWARD_INDEX));
- }
+ columnOperationsMap.put(column, Collections.singletonList(Operation.ENABLE_FORWARD_INDEX));
} else if (existingForwardIndexDisabledColumns.contains(column)
&& newForwardIndexDisabledColumns.contains(column)) {
// Forward index is disabled for the existing column and should remain disabled based on the latest config
diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandlerTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandlerTest.java
index aca34113ee..a0e5bdaa44 100644
--- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandlerTest.java
+++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/ForwardIndexHandlerTest.java
@@ -1204,9 +1204,15 @@ public class ForwardIndexHandlerTest {
IndexLoadingConfig indexLoadingConfig = new IndexLoadingConfig(null, _tableConfig);
Random rand = new Random();
- String col1 = _noDictionaryColumns.get(rand.nextInt(_noDictionaryColumns.size()));
+ String col1;
+ do {
+ col1 = _noDictionaryColumns.get(rand.nextInt(_noDictionaryColumns.size()));
+ } while (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(col1));
indexLoadingConfig.getNoDictionaryColumns().remove(col1);
- String col2 = _noDictionaryColumns.get(rand.nextInt(_noDictionaryColumns.size()));
+ String col2;
+ do {
+ col2 = _noDictionaryColumns.get(rand.nextInt(_noDictionaryColumns.size()));
+ } while (FORWARD_INDEX_DISABLED_RAW_COLUMNS.contains(col2) || col2.equals(col1));
indexLoadingConfig.getNoDictionaryColumns().remove(col2);
ForwardIndexHandler fwdIndexHandler = new ForwardIndexHandler(segmentLocalFSDirectory, indexLoadingConfig, _schema);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org