tibrewalpratik17 commented on code in PR #13107: URL: https://github.com/apache/pinot/pull/13107#discussion_r1617017946
########## pinot-common/src/main/java/org/apache/pinot/common/utils/UploadedRealtimeSegmentName.java: ########## @@ -0,0 +1,134 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.common.utils; + +import com.google.common.base.Preconditions; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + + +/** + * Class to represent segment names like: uploaded_{tableName}_{partitionId}_{sequenceId}_{creationTime} + * + * This naming convention is adopted to represent a batch generated segment uploaded to a realtime table. The naming + * convention has been kept different from {@LLCSegmentName} to differentiate between batch generated segments and + * low level consumer segments. + */ +public class UploadedRealtimeSegmentName implements Comparable<UploadedRealtimeSegmentName> { + + public static final String UPLOADED_REALTIME_SEGMENT_NAME_REGEX = "^uploaded_(.+)_(\\d+)_(\\d+)_(\\d+)$"; + + private static final Pattern NAME_PATTERN = Pattern.compile(UPLOADED_REALTIME_SEGMENT_NAME_REGEX); + private static final String UPLOADED_PREFIX = "uploaded"; + private static final String SEPARATOR = "_"; + private final String _tableName; + private final int _partitionId; + private final int _sequenceId; + private final long _creationTime; + private final String _segmentName; + + public UploadedRealtimeSegmentName(String segmentName) { + + Matcher matcher = NAME_PATTERN.matcher(segmentName); + + if (matcher.find()) { + _tableName = matcher.group(1); + _partitionId = Integer.parseInt(matcher.group(2)); + _sequenceId = Integer.parseInt(matcher.group(3)); + _creationTime = Long.parseLong(matcher.group(4)); + + _segmentName = segmentName; + } else { + throw new IllegalArgumentException("Invalid uploaded realtime segment name: " + segmentName); + } + } + + public UploadedRealtimeSegmentName(String tableName, int partitionId, int sequenceId, long creationTime) { + _tableName = tableName; + _partitionId = partitionId; + _sequenceId = sequenceId; + _creationTime = creationTime; + _segmentName = + UPLOADED_PREFIX + SEPARATOR + tableName + SEPARATOR + partitionId + SEPARATOR + sequenceId + SEPARATOR + + creationTime; Review Comment: nit: we can use `Joiner` for better readability. ########## pinot-common/src/main/java/org/apache/pinot/common/utils/UploadedRealtimeSegmentName.java: ########## @@ -0,0 +1,134 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.common.utils; + +import com.google.common.base.Preconditions; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + + +/** + * Class to represent segment names like: uploaded_{tableName}_{partitionId}_{sequenceId}_{creationTime} + * + * This naming convention is adopted to represent a batch generated segment uploaded to a realtime table. The naming + * convention has been kept different from {@LLCSegmentName} to differentiate between batch generated segments and + * low level consumer segments. + */ +public class UploadedRealtimeSegmentName implements Comparable<UploadedRealtimeSegmentName> { + + public static final String UPLOADED_REALTIME_SEGMENT_NAME_REGEX = "^uploaded_(.+)_(\\d+)_(\\d+)_(\\d+)$"; + + private static final Pattern NAME_PATTERN = Pattern.compile(UPLOADED_REALTIME_SEGMENT_NAME_REGEX); + private static final String UPLOADED_PREFIX = "uploaded"; + private static final String SEPARATOR = "_"; + private final String _tableName; + private final int _partitionId; + private final int _sequenceId; + private final long _creationTime; + private final String _segmentName; + + public UploadedRealtimeSegmentName(String segmentName) { + + Matcher matcher = NAME_PATTERN.matcher(segmentName); + + if (matcher.find()) { + _tableName = matcher.group(1); + _partitionId = Integer.parseInt(matcher.group(2)); + _sequenceId = Integer.parseInt(matcher.group(3)); + _creationTime = Long.parseLong(matcher.group(4)); + + _segmentName = segmentName; + } else { + throw new IllegalArgumentException("Invalid uploaded realtime segment name: " + segmentName); + } + } + + public UploadedRealtimeSegmentName(String tableName, int partitionId, int sequenceId, long creationTime) { + _tableName = tableName; + _partitionId = partitionId; + _sequenceId = sequenceId; + _creationTime = creationTime; + _segmentName = + UPLOADED_PREFIX + SEPARATOR + tableName + SEPARATOR + partitionId + SEPARATOR + sequenceId + SEPARATOR + + creationTime; + } + + public static boolean isUploadedRealtimeSegmentName(String segmentName) { + Matcher matcher = NAME_PATTERN.matcher(segmentName); + if (matcher.find()) { + return true; + } + return false; + } Review Comment: ```suggestion return matcher.matches(); ``` ########## pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-common/src/main/java/org/apache/pinot/plugin/ingestion/batch/common/SegmentGenerationTaskRunner.java: ########## @@ -159,14 +161,24 @@ private SegmentNameGenerator getSegmentNameGenerator(SegmentGeneratorConfig segm Boolean.parseBoolean(segmentNameGeneratorConfigs.get(EXCLUDE_SEQUENCE_ID)), IngestionConfigUtils.getBatchSegmentIngestionType(tableConfig), IngestionConfigUtils.getBatchSegmentIngestionFrequency(tableConfig), dateTimeFormatSpec, - segmentNameGeneratorConfigs.get(SEGMENT_NAME_POSTFIX), - appendUUIDToSegmentName); + segmentNameGeneratorConfigs.get(SEGMENT_NAME_POSTFIX), appendUUIDToSegmentName); case BatchConfigProperties.SegmentNameGeneratorType.INPUT_FILE: String inputFileUri = _taskSpec.getCustomProperty(BatchConfigProperties.INPUT_DATA_FILE_URI_KEY); return new InputFileSegmentNameGenerator(segmentNameGeneratorConfigs.get(FILE_PATH_PATTERN), - segmentNameGeneratorConfigs.get(SEGMENT_NAME_TEMPLATE), - inputFileUri, - appendUUIDToSegmentName); + segmentNameGeneratorConfigs.get(SEGMENT_NAME_TEMPLATE), inputFileUri, appendUUIDToSegmentName); + case BatchConfigProperties.SegmentNameGeneratorType.UPLOADED_REALTIME: + Preconditions.checkState(segmentGeneratorConfig.getCreationTime() != null, + "Creation time must be set for uploaded realtime segment name generator"); + Preconditions.checkState(segmentGeneratorConfig.getUploadedSegmentPartitionId() != -1, + "Valid partition id must be set for uploaded realtime segment name generator"); Review Comment: can we also add sequence_id here? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
