bvaradar commented on code in PR #11923: URL: https://github.com/apache/hudi/pull/11923#discussion_r1796256389
########## hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v1/InstantComparatorV1.java: ########## @@ -0,0 +1,77 @@ +/* + * 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.hudi.common.table.timeline.versioning.v1; + +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.InstantComparator; +import org.apache.hudi.common.table.timeline.versioning.common.InstantComparatorHelper; + +import java.io.Serializable; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; + +import static org.apache.hudi.common.table.timeline.HoodieTimeline.COMMIT_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.COMPACTION_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.DELTA_COMMIT_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.LOG_COMPACTION_ACTION; + +public class InstantComparatorV1 implements Serializable, InstantComparator { + + /** + * A COMPACTION action eventually becomes COMMIT when completed. So, when grouping instants + * for state transitions, this needs to be taken into account + */ + private static final Map<String, String> COMPARABLE_ACTIONS = createComparableActionsMap(); + + public static final Comparator<HoodieInstant> ACTION_COMPARATOR = + new InstantComparatorHelper.ActionComparator(COMPARABLE_ACTIONS); + + public static final Comparator<HoodieInstant> COMPARATOR = + new InstantComparatorHelper.TimestampBasedComparator(COMPARABLE_ACTIONS); + + public static final Comparator<HoodieInstant> COMPLETION_TIME_COMPARATOR = + new InstantComparatorHelper.CompletionTimeBasedComparator(COMPARABLE_ACTIONS); Review Comment: yes, it will be based on File Modification time ########## hudi-common/src/main/java/org/apache/hudi/common/table/timeline/ActiveTimelineUtils.java: ########## @@ -0,0 +1,165 @@ +/* + * 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.hudi.common.table.timeline; + +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.exception.HoodieIOException; +import org.apache.hudi.storage.HoodieStorage; +import org.apache.hudi.storage.StoragePath; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.text.ParseException; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +import static org.apache.hudi.common.table.timeline.HoodieTimeline.COMMIT_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.COMPACTION_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.DELTA_COMMIT_ACTION; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.LOG_COMPACTION_ACTION; + +public class ActiveTimelineUtils { + private static final Logger LOG = LoggerFactory.getLogger(ActiveTimelineUtils.class); + + public static final Set<String> NOT_PARSABLE_TIMESTAMPS = new HashSet<String>(3) { + { + add(HoodieTimeline.INIT_INSTANT_TS); + add(HoodieTimeline.METADATA_BOOTSTRAP_INSTANT_TS); + add(HoodieTimeline.FULL_BOOTSTRAP_INSTANT_TS); + } + }; + + /** + * Parse the timestamp of an Instant and return a {@code Date}. + * Throw ParseException if timestamp is not valid format as + * {@link org.apache.hudi.common.table.timeline.HoodieInstantTimeGenerator#SECS_INSTANT_TIMESTAMP_FORMAT}. + * + * @param timestamp a timestamp String which follow pattern as + * {@link org.apache.hudi.common.table.timeline.HoodieInstantTimeGenerator#SECS_INSTANT_TIMESTAMP_FORMAT}. + * @return Date of instant timestamp + */ + public static Date parseDateFromInstantTime(String timestamp) throws ParseException { + return HoodieInstantTimeGenerator.parseDateFromInstantTime(timestamp); + } + + /** + * The same parsing method as above, but this method will mute ParseException. + * If the given timestamp is invalid, returns {@code Option.empty}. + * Or a corresponding Date value if these timestamp strings are provided + * {@link org.apache.hudi.common.table.timeline.HoodieTimeline#INIT_INSTANT_TS}, + * {@link org.apache.hudi.common.table.timeline.HoodieTimeline#METADATA_BOOTSTRAP_INSTANT_TS}, + * {@link org.apache.hudi.common.table.timeline.HoodieTimeline#FULL_BOOTSTRAP_INSTANT_TS}. + * This method is useful when parsing timestamp for metrics + * + * @param timestamp a timestamp String which follow pattern as + * {@link org.apache.hudi.common.table.timeline.HoodieInstantTimeGenerator#SECS_INSTANT_TIMESTAMP_FORMAT}. + * @return {@code Option<Date>} of instant timestamp, {@code Option.empty} if invalid timestamp + */ + public static Option<Date> parseDateFromInstantTimeSafely(String timestamp) { + Option<Date> parsedDate; + try { + parsedDate = Option.of(HoodieInstantTimeGenerator.parseDateFromInstantTime(timestamp)); + } catch (ParseException e) { + if (NOT_PARSABLE_TIMESTAMPS.contains(timestamp)) { + parsedDate = Option.of(new Date(Integer.parseInt(timestamp))); + } else { + LOG.warn("Failed to parse timestamp " + timestamp + ": " + e.getMessage()); Review Comment: Done -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
