Stephen0421 commented on code in PR #10420: URL: https://github.com/apache/paimon/pull/10420#discussion_r4248503261
########## paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/procedure/CreateTagFromWatermarkProcedure.java: ########## @@ -0,0 +1,139 @@ +/* + * 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.paimon.spark.procedure; + +import org.apache.paimon.Snapshot; +import org.apache.paimon.table.FileStoreTable; +import org.apache.paimon.utils.SnapshotManager; +import org.apache.paimon.utils.SnapshotNotExistException; +import org.apache.paimon.utils.TimeUtils; + +import org.apache.spark.sql.catalyst.InternalRow; +import org.apache.spark.sql.connector.catalog.Identifier; +import org.apache.spark.sql.connector.catalog.TableCatalog; +import org.apache.spark.sql.types.DataTypes; +import org.apache.spark.sql.types.Metadata; +import org.apache.spark.sql.types.StructField; +import org.apache.spark.sql.types.StructType; +import org.apache.spark.unsafe.types.UTF8String; + +import java.time.Duration; +import java.util.Set; + +import static org.apache.spark.sql.types.DataTypes.LongType; +import static org.apache.spark.sql.types.DataTypes.StringType; + +/** The procedure supports creating tags from snapshot watermarks. */ +public class CreateTagFromWatermarkProcedure extends BaseProcedure { + + private static final ProcedureParameter[] PARAMETERS = + new ProcedureParameter[] { + ProcedureParameter.required("table", StringType), + ProcedureParameter.required("tag", StringType), + ProcedureParameter.required("watermark", LongType), + ProcedureParameter.optional("time_retained", StringType) + }; + + private static final StructType OUTPUT_TYPE = + new StructType( + new StructField[] { + new StructField("tagName", DataTypes.StringType, true, Metadata.empty()), + new StructField("snapshot", DataTypes.LongType, true, Metadata.empty()), + new StructField("commit_time", DataTypes.LongType, true, Metadata.empty()), + new StructField("watermark", DataTypes.StringType, true, Metadata.empty()) + }); + + private CreateTagFromWatermarkProcedure(TableCatalog tableCatalog) { + super(tableCatalog); + } + + @Override + public ProcedureParameter[] parameters() { + return PARAMETERS; + } + + @Override + public StructType outputType() { + return OUTPUT_TYPE; + } + + @Override + public InternalRow[] call(InternalRow args) { + Identifier tableIdent = toIdentifier(args.getString(0), PARAMETERS[0].name()); + String tag = args.getString(1); + Long watermark = args.getLong(2); + Duration timeRetained = + args.isNullAt(3) ? null : TimeUtils.parseDuration(args.getString(3)); + + return modifyPaimonTable( + tableIdent, + table -> { + FileStoreTable fileStoreTable = (FileStoreTable) table; + SnapshotManager snapshotManager = fileStoreTable.snapshotManager(); + Snapshot snapshot = snapshotManager.laterOrEqualWatermark(watermark); Review Comment: Fixed. `laterOrEqualWatermark` no longer stops at the binary-search midpoint when the watermark is equal. An exact match stays a candidate and the search continues left, so a run of identical watermarks resolves to the earliest retained snapshot. Repeated watermarks are normal: a null commit watermark inherits the previous value, and a new value takes the maximum. With no existing tags, the procedure's tie-break never runs, so it cannot correct a midpoint hit. The lower bound belongs in the search itself. Tests: - `SnapshotManagerTest`: watermarks `[500, 1000, 1000, 1000, 2000]` return the first `1000`, including when null watermarks sit inside the plateau. A query of `2000` still returns that snapshot. - `CreateTagFromWatermarkProcedureTest`: with no tags, `CALL sys.create_tag_from_watermark(..., watermark => 1000)` tags snapshot 2, and watermark `2000` still tags snapshot 5. This is the shared helper, so Flink `create_tag_from_watermark` and `scan.watermark` also take the first snapshot of a plateau. That matches their documented "first snapshot" contract. -- 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]
