codope commented on code in PR #9565: URL: https://github.com/apache/hudi/pull/9565#discussion_r1311099826
########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/timeline/CompletionTimeQueryView.java: ########## @@ -0,0 +1,149 @@ +/* + * 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.client.timeline; + +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.util.Option; + +import org.apache.avro.generic.GenericRecord; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import static org.apache.hudi.common.table.timeline.HoodieArchivedTimeline.COMPLETION_TIME_ARCHIVED_META_FIELD; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.EQUALS; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.GREATER_THAN; + +/** + * Query view for instant completion time. + */ +public class CompletionTimeQueryView implements AutoCloseable { + private final HoodieTableMetaClient metaClient; + + /** + * Mapping from instant start time -> completion time. + * Should be thread-safe data structure. + */ + private final Map<String, String> startToCompletionInstantTimeMap; + + /** + * The start instant time to eagerly load from, by default load last 3 days of completed instants. + */ + private final String startInstant; + + /** + * The first instant on the active timeline, used for query optimization. + */ + private final String firstInstantOnActiveTimeline; + + /** + * The constructor. + * + * @param metaClient The table meta client. + * @param startInstant The earliest instant time to eagerly load from, by default load last 3 days of completed instants. + */ + public CompletionTimeQueryView(HoodieTableMetaClient metaClient, String startInstant) { + this.metaClient = metaClient; + this.startToCompletionInstantTimeMap = new ConcurrentHashMap<>(); + this.startInstant = startInstant; + this.firstInstantOnActiveTimeline = metaClient.getActiveTimeline().firstInstant().map(HoodieInstant::getTimestamp).orElse(""); + load(); + } + + /** + * Queries the instant completion time with given start time. + * + * @param startTime The start time. + * + * @return The completion time if the instant finished or empty if it is still pending. + */ + public Option<String> getCompletionTime(String startTime) { + String completionTime = this.startToCompletionInstantTimeMap.get(startTime); + if (completionTime != null) { + return Option.of(completionTime); + } + if (HoodieTimeline.compareTimestamps(startTime, GREATER_THAN, this.firstInstantOnActiveTimeline)) { + // the instant is still pending + return Option.empty(); + } + // the 'startTime' should be out of the eager loading range, switch to a lazy loading. + // This operation is resource costly. + HoodieArchivedTimeline.loadInstants(metaClient, + new EQTsFilter(startTime), + HoodieArchivedTimeline.LoadMode.SLIM, + r -> true, + this::readCompletionTime); + return Option.ofNullable(this.startToCompletionInstantTimeMap.get(startTime)); + } + + /** + * This is method to read instant completion time. + * This would also update 'startToCompletionInstantTimeMap' map with start time/completion time pairs. + * Only instants starts from 'startInstant' (inclusive) are considered. + */ + private void load() { + // load active instants first. + this.metaClient.getActiveTimeline() + .filterCompletedInstants().getInstantsAsStream() + .forEach(instant -> setCompletionTime(instant.getTimestamp(), instant.getStateTransitionTime())); + // then load the archived instants. + HoodieArchivedTimeline.loadInstants(metaClient, + new HoodieArchivedTimeline.StartTsFilter(this.startInstant), + HoodieArchivedTimeline.LoadMode.SLIM, + r -> true, + this::readCompletionTime); + } + + private void readCompletionTime(String instantTime, GenericRecord record) { + final String completionTime = record.get(COMPLETION_TIME_ARCHIVED_META_FIELD).toString(); + setCompletionTime(instantTime, completionTime); + } + + private void setCompletionTime(String instantTime, String completionTime) { + this.startToCompletionInstantTimeMap.putIfAbsent(instantTime, completionTime); + } + + @Override + public void close() throws Exception { + this.startToCompletionInstantTimeMap.clear(); + } + + // ------------------------------------------------------------------------- + // Inner class + // ------------------------------------------------------------------------- + + /** + * A time based filter with equality of specified timestamp. + */ + public static class EQTsFilter extends HoodieArchivedTimeline.TimeRangeFilter { Review Comment: Rename to `EqualTImestampsFilter`? Full name makes it more readable. ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/timeline/CompletionTimeQueryView.java: ########## @@ -0,0 +1,149 @@ +/* + * 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.client.timeline; + +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.util.Option; + +import org.apache.avro.generic.GenericRecord; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import static org.apache.hudi.common.table.timeline.HoodieArchivedTimeline.COMPLETION_TIME_ARCHIVED_META_FIELD; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.EQUALS; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.GREATER_THAN; + +/** + * Query view for instant completion time. + */ +public class CompletionTimeQueryView implements AutoCloseable { + private final HoodieTableMetaClient metaClient; + + /** + * Mapping from instant start time -> completion time. + * Should be thread-safe data structure. + */ + private final Map<String, String> startToCompletionInstantTimeMap; + + /** + * The start instant time to eagerly load from, by default load last 3 days of completed instants. Review Comment: Is there some internal config to control last N days of completed instants? ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/timeline/CompletionTimeQueryView.java: ########## @@ -0,0 +1,149 @@ +/* + * 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.client.timeline; + +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.util.Option; + +import org.apache.avro.generic.GenericRecord; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import static org.apache.hudi.common.table.timeline.HoodieArchivedTimeline.COMPLETION_TIME_ARCHIVED_META_FIELD; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.EQUALS; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.GREATER_THAN; + +/** + * Query view for instant completion time. + */ +public class CompletionTimeQueryView implements AutoCloseable { + private final HoodieTableMetaClient metaClient; + + /** + * Mapping from instant start time -> completion time. + * Should be thread-safe data structure. + */ + private final Map<String, String> startToCompletionInstantTimeMap; + + /** + * The start instant time to eagerly load from, by default load last 3 days of completed instants. + */ + private final String startInstant; + + /** + * The first instant on the active timeline, used for query optimization. + */ + private final String firstInstantOnActiveTimeline; + + /** + * The constructor. + * + * @param metaClient The table meta client. + * @param startInstant The earliest instant time to eagerly load from, by default load last 3 days of completed instants. + */ + public CompletionTimeQueryView(HoodieTableMetaClient metaClient, String startInstant) { + this.metaClient = metaClient; + this.startToCompletionInstantTimeMap = new ConcurrentHashMap<>(); + this.startInstant = startInstant; + this.firstInstantOnActiveTimeline = metaClient.getActiveTimeline().firstInstant().map(HoodieInstant::getTimestamp).orElse(""); + load(); + } + + /** + * Queries the instant completion time with given start time. + * + * @param startTime The start time. + * + * @return The completion time if the instant finished or empty if it is still pending. + */ + public Option<String> getCompletionTime(String startTime) { + String completionTime = this.startToCompletionInstantTimeMap.get(startTime); + if (completionTime != null) { + return Option.of(completionTime); + } + if (HoodieTimeline.compareTimestamps(startTime, GREATER_THAN, this.firstInstantOnActiveTimeline)) { + // the instant is still pending + return Option.empty(); + } + // the 'startTime' should be out of the eager loading range, switch to a lazy loading. + // This operation is resource costly. + HoodieArchivedTimeline.loadInstants(metaClient, + new EQTsFilter(startTime), + HoodieArchivedTimeline.LoadMode.SLIM, + r -> true, + this::readCompletionTime); + return Option.ofNullable(this.startToCompletionInstantTimeMap.get(startTime)); + } + + /** + * This is method to read instant completion time. + * This would also update 'startToCompletionInstantTimeMap' map with start time/completion time pairs. + * Only instants starts from 'startInstant' (inclusive) are considered. + */ + private void load() { + // load active instants first. + this.metaClient.getActiveTimeline() + .filterCompletedInstants().getInstantsAsStream() + .forEach(instant -> setCompletionTime(instant.getTimestamp(), instant.getStateTransitionTime())); + // then load the archived instants. + HoodieArchivedTimeline.loadInstants(metaClient, + new HoodieArchivedTimeline.StartTsFilter(this.startInstant), + HoodieArchivedTimeline.LoadMode.SLIM, Review Comment: `SLIM` mode is sufficient? We don't need any metadata? ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/timeline/CompletionTimeQueryView.java: ########## @@ -0,0 +1,149 @@ +/* + * 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.client.timeline; + +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.util.Option; + +import org.apache.avro.generic.GenericRecord; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import static org.apache.hudi.common.table.timeline.HoodieArchivedTimeline.COMPLETION_TIME_ARCHIVED_META_FIELD; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.EQUALS; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.GREATER_THAN; + +/** + * Query view for instant completion time. + */ +public class CompletionTimeQueryView implements AutoCloseable { + private final HoodieTableMetaClient metaClient; + + /** + * Mapping from instant start time -> completion time. + * Should be thread-safe data structure. + */ + private final Map<String, String> startToCompletionInstantTimeMap; + + /** + * The start instant time to eagerly load from, by default load last 3 days of completed instants. + */ + private final String startInstant; + + /** + * The first instant on the active timeline, used for query optimization. + */ + private final String firstInstantOnActiveTimeline; + + /** + * The constructor. + * + * @param metaClient The table meta client. + * @param startInstant The earliest instant time to eagerly load from, by default load last 3 days of completed instants. + */ + public CompletionTimeQueryView(HoodieTableMetaClient metaClient, String startInstant) { + this.metaClient = metaClient; + this.startToCompletionInstantTimeMap = new ConcurrentHashMap<>(); + this.startInstant = startInstant; + this.firstInstantOnActiveTimeline = metaClient.getActiveTimeline().firstInstant().map(HoodieInstant::getTimestamp).orElse(""); + load(); + } + + /** + * Queries the instant completion time with given start time. + * + * @param startTime The start time. + * + * @return The completion time if the instant finished or empty if it is still pending. + */ + public Option<String> getCompletionTime(String startTime) { + String completionTime = this.startToCompletionInstantTimeMap.get(startTime); + if (completionTime != null) { + return Option.of(completionTime); + } + if (HoodieTimeline.compareTimestamps(startTime, GREATER_THAN, this.firstInstantOnActiveTimeline)) { Review Comment: Not following this logic. If startTime > firstInstantOnActiveTimeline, it doesn't mean that instant is still pending right. Probably i'm missing something. Can you please explain with this example? Let's say firstInstantOnActiveTimeline has start time t0 and completion time t1. Another instant that has startTime t2 and completionTime t3. Here t2 > t0 but it is still completed. ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/timeline/CompletionTimeQueryView.java: ########## @@ -0,0 +1,149 @@ +/* + * 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.client.timeline; + +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.HoodieArchivedTimeline; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.common.util.Option; + +import org.apache.avro.generic.GenericRecord; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import static org.apache.hudi.common.table.timeline.HoodieArchivedTimeline.COMPLETION_TIME_ARCHIVED_META_FIELD; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.EQUALS; +import static org.apache.hudi.common.table.timeline.HoodieTimeline.GREATER_THAN; + +/** + * Query view for instant completion time. + */ +public class CompletionTimeQueryView implements AutoCloseable { + private final HoodieTableMetaClient metaClient; + + /** + * Mapping from instant start time -> completion time. + * Should be thread-safe data structure. + */ + private final Map<String, String> startToCompletionInstantTimeMap; + + /** + * The start instant time to eagerly load from, by default load last 3 days of completed instants. + */ + private final String startInstant; + + /** + * The first instant on the active timeline, used for query optimization. + */ + private final String firstInstantOnActiveTimeline; + + /** + * The constructor. + * + * @param metaClient The table meta client. + * @param startInstant The earliest instant time to eagerly load from, by default load last 3 days of completed instants. + */ + public CompletionTimeQueryView(HoodieTableMetaClient metaClient, String startInstant) { + this.metaClient = metaClient; + this.startToCompletionInstantTimeMap = new ConcurrentHashMap<>(); + this.startInstant = startInstant; + this.firstInstantOnActiveTimeline = metaClient.getActiveTimeline().firstInstant().map(HoodieInstant::getTimestamp).orElse(""); + load(); + } + + /** + * Queries the instant completion time with given start time. + * + * @param startTime The start time. + * + * @return The completion time if the instant finished or empty if it is still pending. + */ + public Option<String> getCompletionTime(String startTime) { + String completionTime = this.startToCompletionInstantTimeMap.get(startTime); + if (completionTime != null) { + return Option.of(completionTime); + } + if (HoodieTimeline.compareTimestamps(startTime, GREATER_THAN, this.firstInstantOnActiveTimeline)) { + // the instant is still pending + return Option.empty(); + } + // the 'startTime' should be out of the eager loading range, switch to a lazy loading. + // This operation is resource costly. + HoodieArchivedTimeline.loadInstants(metaClient, + new EQTsFilter(startTime), + HoodieArchivedTimeline.LoadMode.SLIM, + r -> true, + this::readCompletionTime); + return Option.ofNullable(this.startToCompletionInstantTimeMap.get(startTime)); + } + + /** + * This is method to read instant completion time. + * This would also update 'startToCompletionInstantTimeMap' map with start time/completion time pairs. + * Only instants starts from 'startInstant' (inclusive) are considered. + */ + private void load() { + // load active instants first. + this.metaClient.getActiveTimeline() + .filterCompletedInstants().getInstantsAsStream() + .forEach(instant -> setCompletionTime(instant.getTimestamp(), instant.getStateTransitionTime())); + // then load the archived instants. + HoodieArchivedTimeline.loadInstants(metaClient, + new HoodieArchivedTimeline.StartTsFilter(this.startInstant), + HoodieArchivedTimeline.LoadMode.SLIM, + r -> true, + this::readCompletionTime); + } + + private void readCompletionTime(String instantTime, GenericRecord record) { + final String completionTime = record.get(COMPLETION_TIME_ARCHIVED_META_FIELD).toString(); Review Comment: Will `COMPLETION_TIME_ARCHIVED_META_FIELD` be always present in the `record`? Do we need some validation like it must be greater tahn `insantTime`? -- 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]
