Skip to content

remove tar.gz suffix condition from segment file names #428

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

Open
wants to merge 2 commits into
base: hypertrace-1.2.0
Choose a base branch
from
Open

remove tar.gz suffix condition from segment file names #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7652a5
remove tar.gz suffix condition from segment file names
ravisingal Apr 3, 2025
001fec0
log ignored files
ravisingal Apr 3, 2025
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
5 changes: 2 additions & 3 deletions ...rc/main/java/org/apache/pinot/plugin/ingestion/batch/common/BaseSegmentPushJobRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
package org.apache.pinot.plugin.ingestion.batch.common;

import com.google.common.base.Preconditions;
import java.io.File;
import java.io.IOException;
import java.net.URI;
Expand Down Expand Up @@ -113,8 +112,8 @@ public List<String> getSegmentsToReplace(Map<String, String> segmentsUriToTarPat
for (String tarFilePath : tarFilePaths) {
File tarFile = new File(tarFilePath);
String fileName = tarFile.getName();
Preconditions.checkArgument(fileName.endsWith(Constants.TAR_GZ_FILE_EXT));
String segmentName = fileName.substring(0, fileName.length() - Constants.TAR_GZ_FILE_EXT.length());
String segmentName = fileName.endsWith(Constants.TAR_GZ_FILE_EXT)
? fileName.substring(0, fileName.length() - Constants.TAR_GZ_FILE_EXT.length()) : fileName;
segmentNames.add(segmentName);
}
return segmentNames;
Expand Down
16 changes: 8 additions & 8 deletions pinot-segment-local/src/main/java/org/apache/pinot/segment/local/utils/SegmentPushUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
package org.apache.pinot.segment.local.utils;

import com.google.common.base.Preconditions;
import java.io.File;
import java.io.InputStream;
import java.io.Serializable;
Expand Down Expand Up @@ -152,8 +151,8 @@ public static void pushSegments(SegmentGenerationJobSpec spec, PinotFS fileSyste
URI tarFileURI = URI.create(tarFilePath);
File tarFile = new File(tarFilePath);
String fileName = tarFile.getName();
Preconditions.checkArgument(fileName.endsWith(Constants.TAR_GZ_FILE_EXT));
String segmentName = fileName.substring(0, fileName.length() - Constants.TAR_GZ_FILE_EXT.length());
String segmentName = fileName.endsWith(Constants.TAR_GZ_FILE_EXT)
? fileName.substring(0, fileName.length() - Constants.TAR_GZ_FILE_EXT.length()) : fileName;
for (PinotClusterSpec pinotClusterSpec : spec.getPinotClusterSpecs()) {
URI controllerURI;
try {
Expand Down Expand Up @@ -370,6 +369,7 @@ public static Map<String, String> getSegmentUriToTarPathMap(URI outputDirURI, Pu
for (String file : files) {
if (pushFilePathMatcher != null) {
if (!pushFilePathMatcher.matches(Paths.get(file))) {
LOGGER.info("Ignoring file {}", file);
continue;
}
}
Expand All @@ -379,11 +379,11 @@ public static Map<String, String> getSegmentUriToTarPathMap(URI outputDirURI, Pu
// Skip segment metadata tar gz files
continue;
}
if (uri.getPath().endsWith(Constants.TAR_GZ_FILE_EXT)) {
URI updatedURI = SegmentPushUtils.generateSegmentTarURI(outputDirURI, uri, pushSpec.getSegmentUriPrefix(),
pushSpec.getSegmentUriSuffix());
segmentUriToTarPathMap.put(updatedURI.toString(), file);
}
//if (uri.getPath().endsWith(Constants.TAR_GZ_FILE_EXT)) {
URI updatedURI = SegmentPushUtils.generateSegmentTarURI(outputDirURI, uri, pushSpec.getSegmentUriPrefix(),
pushSpec.getSegmentUriSuffix());
segmentUriToTarPathMap.put(updatedURI.toString(), file);
//}
}
return segmentUriToTarPathMap;
}
Expand Down