(gravitino) branch branch-1.3 updated: [Cherry-pick to branch-1.3] [#12238] fix(core): Make PostgreSQL table version soft delete idempotent (#12243) (#12245)

[jshao]

This is an automated email from the ASF dual-hosted git repository.

jerryshao pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new f244e96d3c [Cherry-pick to branch-1.3] [#12238] fix(core): Make 
PostgreSQL table version soft delete idempotent (#12243) (#12245)
f244e96d3c is described below

commit f244e96d3c4a70482b5c598d1be2a7e38fc0a41d
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jul 29 17:25:49 2026 +0800

    [Cherry-pick to branch-1.3] [#12238] fix(core): Make PostgreSQL table 
version soft delete idempotent (#12243) (#12245)
    
    **Cherry-pick Information:**
    - Original commit: 7270c750a4e1cd32756c1ce86dff1e7fbce50c75
    - Target branch: `branch-1.3`
    - Status: ✅ Clean cherry-pick (no conflicts)
    
    Co-authored-by: Qi Yu <y...@datastrato.com>
---
 .../postgresql/TableVersionPostgreSQLProvider.java |  2 +-
 .../TestTableVersionPostgreSQLProvider.java        | 37 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableVersionPostgreSQLProvider.java
 
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableVersionPostgreSQLProvider.java
index fd5a7fadfd..bc462c3839 100644
--- 
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableVersionPostgreSQLProvider.java
+++ 
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableVersionPostgreSQLProvider.java
@@ -63,7 +63,7 @@ public class TableVersionPostgreSQLProvider extends 
TableVersionBaseSQLProvider
         + TABLE_NAME
         + " SET deleted_at = round(extract(epoch from(current_timestamp -"
         + " timestamp '1970-01-01 00:00:00')) * 1000)"
-        + " WHERE table_id = #{tableId} AND version = #{version}";
+        + " WHERE table_id = #{tableId} AND version = #{version} AND 
deleted_at = 0";
   }
 
   @Override
diff --git 
a/core/src/test/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TestTableVersionPostgreSQLProvider.java
 
b/core/src/test/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TestTableVersionPostgreSQLProvider.java
new file mode 100644
index 0000000000..965283b7d7
--- /dev/null
+++ 
b/core/src/test/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TestTableVersionPostgreSQLProvider.java
@@ -0,0 +1,37 @@
+/*
+ * 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.gravitino.storage.relational.mapper.provider.postgresql;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class TestTableVersionPostgreSQLProvider {
+
+  @Test
+  void testSoftDeleteOnlyActiveTableVersion() {
+    TableVersionPostgreSQLProvider provider = new 
TableVersionPostgreSQLProvider();
+
+    String sql = provider.softDeleteTableVersionByTableIdAndVersion(1L, 1L);
+
+    assertTrue(
+        sql.endsWith("WHERE table_id = #{tableId} AND version = #{version} AND 
deleted_at = 0"),
+        "Soft delete should only update an active table version");
+  }
+}