Skip to content

Honor skipSegmentPreprocess in ImmutableSegmentLoader#preprocess #19394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
deepthi912 wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −0
Draft

Honor skipSegmentPreprocess in ImmutableSegmentLoader#preprocess #19394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions ...in/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,16 @@ public static void preprocess(File indexDir, IndexLoadingConfig indexLoadingConf
Preconditions.checkArgument(indexDir.isDirectory(), "Index directory: %s does not exist or is not a directory",
indexDir);

// Respect skipSegmentPreprocess uniformly across every caller — including cold-download load paths
// (BaseTableDataManager#downloadAndLoadSegment and #replaceSegmentIfCrcMismatch) that hard-code
// needPreprocess=true. Without this early exit, those paths run every index handler even when the
// (possibly tier-scoped) flag says to skip, defeating the point of the setting.
if (indexLoadingConfig.isSkipSegmentPreprocess()) {
LOGGER.info("Skipping preprocess for segment: {} because skipSegmentPreprocess is set",
indexDir.getName());
return;
}

SegmentMetadataImpl segmentMetadata = new SegmentMetadataImpl(indexDir);
if (segmentMetadata.getTotalDocs() > 0) {
if (segmentOperationsThrottlerSet != null) {
Expand Down
25 changes: 25 additions & 0 deletions ...t-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/LoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,31 @@ public void testIfNeedConvertSegmentFormat()
}
}

@Test
public void testSkipSegmentPreprocessShortCircuitsPreprocess()
throws Exception {
constructV1Segment();
// Baseline: freshly built V1 segment, no V3 directory yet.
assertEquals(new SegmentMetadataImpl(_indexDir).getVersion(), SegmentVersion.v1);
assertFalse(SegmentDirectoryPaths.segmentDirectoryFor(_indexDir, SegmentVersion.v3).exists());

// Build a v3 ILC with skipSegmentPreprocess=true. Preprocess (including the V1→V3 format
// conversion) must be a no-op even though the caller invoked preprocess directly — mirroring the
// cold-download path in BaseTableDataManager#downloadAndLoadSegment / #replaceSegmentIfCrcMismatch
// which hard-codes needPreprocess=true.
TableConfig skipTableConfig = new TableConfigBuilder(TableType.OFFLINE).setTableName(RAW_TABLE_NAME)
.setSegmentVersion("v3")
.setSkipSegmentPreprocess(true)
.build();
IndexLoadingConfig skipIlc = new IndexLoadingConfig(skipTableConfig, createSchema());

ImmutableSegmentLoader.preprocess(_indexDir, skipIlc, SEGMENT_OPERATIONS_THROTTLER, null);

// Skip flag honored: segment stays V1, no V3 directory materialized.
assertEquals(new SegmentMetadataImpl(_indexDir).getVersion(), SegmentVersion.v1);
assertFalse(SegmentDirectoryPaths.segmentDirectoryFor(_indexDir, SegmentVersion.v3).exists());
}

private void testConversion()
throws Exception {
// Do not set segment version, should not convert the segment
Expand Down
Loading