This is an automated email from the ASF dual-hosted git repository.
yuqi1129 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 682d835c69 [Cherry-pick to branch-1.3] [#11817] fix(idp): Use
millisecond precision for soft deletes (#11815) (#11822)
682d835c69 is described below
commit 682d835c69026af9fb2919d9a5b84df85ad348cb
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Jun 29 22:44:37 2026 +0800
[Cherry-pick to branch-1.3] [#11817] fix(idp): Use millisecond precision
for soft deletes (#11815) (#11822)
**Cherry-pick Information:**
- Original commit: 195f18611db336c404a3a3fde397a838c3ff15be
- Target branch: `branch-1.3`
- Status: ✅ Clean cherry-pick (no conflicts)
Co-authored-by: Qi Yu <[email protected]>
---
.../provider/base/IdpGroupMetaBaseSQLProvider.java | 2 +-
.../base/IdpUserGroupRelBaseSQLProvider.java | 2 +-
.../provider/base/IdpUserMetaBaseSQLProvider.java | 2 +-
.../base/TestIdpSoftDeleteSQLProvider.java | 59 ++++++++++++++++++++++
4 files changed, 62 insertions(+), 3 deletions(-)
diff --git
a/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpGroupMetaBaseSQLProvider.java
b/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpGroupMetaBaseSQLProvider.java
index 46cf1e54ed..ff071e4678 100644
---
a/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpGroupMetaBaseSQLProvider.java
+++
b/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpGroupMetaBaseSQLProvider.java
@@ -80,6 +80,6 @@ public class IdpGroupMetaBaseSQLProvider {
}
protected String currentTimeMillisExpression() {
- return "(UNIX_TIMESTAMP() * 1000.0)";
+ return "(UNIX_TIMESTAMP() * 1000.0) + EXTRACT(MICROSECOND FROM
CURRENT_TIMESTAMP(3)) / 1000";
}
}
diff --git
a/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpUserGroupRelBaseSQLProvider.java
b/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpUserGroupRelBaseSQLProvider.java
index f7608bc1d7..9c4cb3f7cd 100644
---
a/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpUserGroupRelBaseSQLProvider.java
+++
b/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpUserGroupRelBaseSQLProvider.java
@@ -125,6 +125,6 @@ public class IdpUserGroupRelBaseSQLProvider {
}
protected String currentTimeMillisExpression() {
- return "(UNIX_TIMESTAMP() * 1000.0)";
+ return "(UNIX_TIMESTAMP() * 1000.0) + EXTRACT(MICROSECOND FROM
CURRENT_TIMESTAMP(3)) / 1000";
}
}
diff --git
a/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpUserMetaBaseSQLProvider.java
b/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpUserMetaBaseSQLProvider.java
index 255baa518b..4227b90bcd 100644
---
a/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpUserMetaBaseSQLProvider.java
+++
b/plugins/idp-basic/src/main/java/org/apache/gravitino/idp/storage/mapper/provider/base/IdpUserMetaBaseSQLProvider.java
@@ -105,6 +105,6 @@ public class IdpUserMetaBaseSQLProvider {
}
protected String currentTimeMillisExpression() {
- return "(UNIX_TIMESTAMP() * 1000.0)";
+ return "(UNIX_TIMESTAMP() * 1000.0) + EXTRACT(MICROSECOND FROM
CURRENT_TIMESTAMP(3)) / 1000";
}
}
diff --git
a/plugins/idp-basic/src/test/java/org/apache/gravitino/idp/storage/mapper/provider/base/TestIdpSoftDeleteSQLProvider.java
b/plugins/idp-basic/src/test/java/org/apache/gravitino/idp/storage/mapper/provider/base/TestIdpSoftDeleteSQLProvider.java
new file mode 100644
index 0000000000..1d83b7903f
--- /dev/null
+++
b/plugins/idp-basic/src/test/java/org/apache/gravitino/idp/storage/mapper/provider/base/TestIdpSoftDeleteSQLProvider.java
@@ -0,0 +1,59 @@
+/*
+ * 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.idp.storage.mapper.provider.base;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+class TestIdpSoftDeleteSQLProvider {
+
+ private static final String MILLISECOND_TIMESTAMP_COMPONENT =
+ "EXTRACT(MICROSECOND FROM CURRENT_TIMESTAMP(3)) / 1000";
+
+ @Test
+ void testUserDeletedAtPrecision() {
+ String sql = new IdpUserMetaBaseSQLProvider().softDeleteIdpUser("user1");
+
+ assertUsesMillisecondTimestamp(sql);
+ }
+
+ @Test
+ void testGroupDeletedAtPrecision() {
+ String sql = new
IdpGroupMetaBaseSQLProvider().softDeleteIdpGroup("group1");
+
+ assertUsesMillisecondTimestamp(sql);
+ }
+
+ @Test
+ void testRelationDeletedAtPrecision() {
+ IdpUserGroupRelBaseSQLProvider provider = new
IdpUserGroupRelBaseSQLProvider();
+
+ assertUsesMillisecondTimestamp(provider.softDeleteRelations("group1",
List.of("user1")));
+
assertUsesMillisecondTimestamp(provider.softDeleteRelationsByUsername("user1"));
+
assertUsesMillisecondTimestamp(provider.softDeleteRelationsByGroupName("group1"));
+ }
+
+ private static void assertUsesMillisecondTimestamp(String sql) {
+ assertTrue(sql.contains("(UNIX_TIMESTAMP() * 1000.0)"), sql);
+ assertTrue(sql.contains(MILLISECOND_TIMESTAMP_COMPONENT), sql);
+ }
+}
