This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 243d8b6e66 [#8347] fix(core): Fix softDeleteSQL to correctly calculate
deleted_at in milliseconds (#8354)
243d8b6e66 is described below
commit 243d8b6e666a3a536c2c0e85b02bf4741a1ea8ab
Author: Aman Chandra Kumar
<[email protected]>
AuthorDate: Fri Sep 5 07:15:55 2025 +0530
[#8347] fix(core): Fix softDeleteSQL to correctly calculate deleted_at in
milliseconds (#8354)
Moved the * 1000 multiplication outside the extract(epoch ...) call.
The SQL now reads:
```SET deleted_at = floor(extract(epoch from current_timestamp - timestamp
'1970-01-01 00:00:00') * 1000)```
This change ensures the deleted timestamp is properly recorded in
milliseconds, providing accuracy required by downstream consumers.
Closes #8347
---------
Co-authored-by: yuqi <[email protected]>
---
.../postgresql/CatalogMetaPostgreSQLProvider.java | 8 +++----
.../postgresql/FilesetMetaPostgreSQLProvider.java | 16 ++++++-------
.../FilesetVersionPostgreSQLProvider.java | 20 ++++++++--------
.../postgresql/GroupMetaPostgreSQLProvider.java | 8 +++----
.../postgresql/GroupRoleRelPostgreSQLProvider.java | 16 ++++++-------
.../postgresql/JobMetaPostgreSQLProvider.java | 16 ++++++-------
.../JobTemplateMetaPostgreSQLProvider.java | 8 +++----
.../postgresql/MetalakeMetaPostgreSQLProvider.java | 4 ++--
.../postgresql/ModelMetaPostgreSQLProvider.java | 16 ++++++-------
.../ModelVersionAliasRelPostgreSQLProvider.java | 24 +++++++++----------
.../ModelVersionMetaPostgreSQLProvider.java | 24 +++++++++----------
.../postgresql/OwnerMetaPostgreSQLProvider.java | 18 +++++++-------
.../postgresql/PolicyMetaPostgreSQLProvider.java | 8 +++----
.../PolicyMetadataObjectRelPostgreSQLProvider.java | 2 +-
.../PolicyVersionPostgreSQLProvider.java | 12 +++++-----
.../postgresql/RoleMetaPostgreSQLProvider.java | 8 +++----
.../postgresql/SchemaMetaPostgreSQLProvider.java | 12 +++++-----
.../SecurableObjectPostgreSQLProvider.java | 24 +++++++++----------
.../postgresql/StatisticPostgresSQLProvider.java | 4 ++--
.../postgresql/TableColumnPostgreSQLProvider.java | 16 ++++++-------
.../postgresql/TableMetaPostgreSQLProvider.java | 16 ++++++-------
.../postgresql/TagMetaPostgreSQLProvider.java | 8 +++----
.../TagMetadataObjectRelPostgreSQLProvider.java | 28 +++++++++++-----------
.../postgresql/TopicMetaPostgreSQLProvider.java | 16 ++++++-------
.../postgresql/UserMetaPostgreSQLProvider.java | 8 +++----
.../postgresql/UserRoleRelPostgreSQLProvider.java | 16 ++++++-------
26 files changed, 178 insertions(+), 178 deletions(-)
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/CatalogMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/CatalogMetaPostgreSQLProvider.java
index a945a709c7..20c42fb96d 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/CatalogMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/CatalogMetaPostgreSQLProvider.java
@@ -29,8 +29,8 @@ public class CatalogMetaPostgreSQLProvider extends
CatalogMetaBaseSQLProvider {
public String softDeleteCatalogMetasByCatalogId(Long catalogId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
@@ -38,8 +38,8 @@ public class CatalogMetaPostgreSQLProvider extends
CatalogMetaBaseSQLProvider {
public String softDeleteCatalogMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/FilesetMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/FilesetMetaPostgreSQLProvider.java
index 7b55549c1c..f8d87d7e4b 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/FilesetMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/FilesetMetaPostgreSQLProvider.java
@@ -29,8 +29,8 @@ public class FilesetMetaPostgreSQLProvider extends
FilesetMetaBaseSQLProvider {
public String softDeleteFilesetMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ META_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
@@ -38,8 +38,8 @@ public class FilesetMetaPostgreSQLProvider extends
FilesetMetaBaseSQLProvider {
public String softDeleteFilesetMetasByCatalogId(Long catalogId) {
return "UPDATE "
+ META_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
@@ -47,8 +47,8 @@ public class FilesetMetaPostgreSQLProvider extends
FilesetMetaBaseSQLProvider {
public String softDeleteFilesetMetasBySchemaId(Long schemaId) {
return "UPDATE "
+ META_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND deleted_at = 0";
}
@@ -56,8 +56,8 @@ public class FilesetMetaPostgreSQLProvider extends
FilesetMetaBaseSQLProvider {
public String softDeleteFilesetMetasByFilesetId(Long filesetId) {
return "UPDATE "
+ META_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE fileset_id = #{filesetId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/FilesetVersionPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/FilesetVersionPostgreSQLProvider.java
index 98b5dede88..0ba1487b8a 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/FilesetVersionPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/FilesetVersionPostgreSQLProvider.java
@@ -30,8 +30,8 @@ public class FilesetVersionPostgreSQLProvider extends
FilesetVersionBaseSQLProvi
public String softDeleteFilesetVersionsByMetalakeId(Long metalakeId) {
return "UPDATE "
+ VERSION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
@@ -39,8 +39,8 @@ public class FilesetVersionPostgreSQLProvider extends
FilesetVersionBaseSQLProvi
public String softDeleteFilesetVersionsByCatalogId(Long catalogId) {
return "UPDATE "
+ VERSION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
@@ -48,8 +48,8 @@ public class FilesetVersionPostgreSQLProvider extends
FilesetVersionBaseSQLProvi
public String softDeleteFilesetVersionsBySchemaId(Long schemaId) {
return "UPDATE "
+ VERSION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND deleted_at = 0";
}
@@ -57,8 +57,8 @@ public class FilesetVersionPostgreSQLProvider extends
FilesetVersionBaseSQLProvi
public String softDeleteFilesetVersionsByFilesetId(Long filesetId) {
return "UPDATE "
+ VERSION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE fileset_id = #{filesetId} AND deleted_at = 0";
}
@@ -77,8 +77,8 @@ public class FilesetVersionPostgreSQLProvider extends
FilesetVersionBaseSQLProvi
Long filesetId, long versionRetentionLine, int limit) {
return "UPDATE "
+ VERSION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE id IN (SELECT id FROM "
+ VERSION_TABLE_NAME
+ " WHERE fileset_id = #{filesetId} AND version <=
#{versionRetentionLine} AND deleted_at = 0 LIMIT #{limit})";
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/GroupMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/GroupMetaPostgreSQLProvider.java
index 063136c0b8..749606135a 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/GroupMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/GroupMetaPostgreSQLProvider.java
@@ -31,8 +31,8 @@ public class GroupMetaPostgreSQLProvider extends
GroupMetaBaseSQLProvider {
public String softDeleteGroupMetaByGroupId(Long groupId) {
return "UPDATE "
+ GROUP_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE group_id = #{groupId} AND deleted_at = 0";
}
@@ -40,8 +40,8 @@ public class GroupMetaPostgreSQLProvider extends
GroupMetaBaseSQLProvider {
public String softDeleteGroupMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ GROUP_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/GroupRoleRelPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/GroupRoleRelPostgreSQLProvider.java
index 8148c95728..3173cb3abc 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/GroupRoleRelPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/GroupRoleRelPostgreSQLProvider.java
@@ -30,8 +30,8 @@ public class GroupRoleRelPostgreSQLProvider extends
GroupRoleRelBaseSQLProvider
public String softDeleteGroupRoleRelByGroupId(Long groupId) {
return "UPDATE "
+ GROUP_ROLE_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE group_id = #{groupId} AND deleted_at = 0";
}
@@ -40,8 +40,8 @@ public class GroupRoleRelPostgreSQLProvider extends
GroupRoleRelBaseSQLProvider
return "<script>"
+ "UPDATE "
+ GROUP_ROLE_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE group_id = #{groupId} AND role_id in ("
+ "<foreach collection='roleIds' item='roleId' separator=','>"
+ "#{roleId}"
@@ -55,8 +55,8 @@ public class GroupRoleRelPostgreSQLProvider extends
GroupRoleRelBaseSQLProvider
public String softDeleteGroupRoleRelByMetalakeId(Long metalakeId) {
return "UPDATE "
+ GROUP_ROLE_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE group_id IN (SELECT group_id FROM "
+ GROUP_TABLE_NAME
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0)"
@@ -67,8 +67,8 @@ public class GroupRoleRelPostgreSQLProvider extends
GroupRoleRelBaseSQLProvider
public String softDeleteGroupRoleRelByRoleId(Long roleId) {
return "UPDATE "
+ GROUP_ROLE_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE role_id = #{roleId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/JobMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/JobMetaPostgreSQLProvider.java
index b226a4a2a3..60737f29f4 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/JobMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/JobMetaPostgreSQLProvider.java
@@ -64,8 +64,8 @@ public class JobMetaPostgreSQLProvider extends
JobMetaBaseSQLProvider {
@Param("jobTemplateName") String jobTemplateName) {
return "UPDATE "
+ JobMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id IN ("
+ " SELECT metalake_id FROM "
+ MetalakeMetaMapper.TABLE_NAME
@@ -81,16 +81,16 @@ public class JobMetaPostgreSQLProvider extends
JobMetaBaseSQLProvider {
public String softDeleteJobMetasByMetalakeId(@Param("metalakeId") Long
metalakeId) {
return "UPDATE "
+ JobMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
public String softDeleteJobMetaByRunId(@Param("jobRunId") Long jobRunId) {
return "UPDATE "
+ JobMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE job_run_id = #{jobRunId} AND deleted_at = 0";
}
@@ -98,8 +98,8 @@ public class JobMetaPostgreSQLProvider extends
JobMetaBaseSQLProvider {
public String softDeleteJobMetasByLegacyTimeline(@Param("legacyTimeline")
Long legacyTimeline) {
return "UPDATE "
+ JobMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE job_finished_at < #{legacyTimeline} AND job_finished_at > 0
AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/JobTemplateMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/JobTemplateMetaPostgreSQLProvider.java
index e0c9557319..84e95360a3 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/JobTemplateMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/JobTemplateMetaPostgreSQLProvider.java
@@ -32,8 +32,8 @@ public class JobTemplateMetaPostgreSQLProvider extends
JobTemplateMetaBaseSQLPro
@Param("jobTemplateName") String jobTemplateName) {
return "UPDATE "
+ JobTemplateMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id IN ("
+ " SELECT metalake_id FROM "
+ MetalakeMetaMapper.TABLE_NAME
@@ -45,8 +45,8 @@ public class JobTemplateMetaPostgreSQLProvider extends
JobTemplateMetaBaseSQLPro
public String softDeleteJobTemplateMetasByMetalakeId(@Param("metalakeId")
Long metalakeId) {
return "UPDATE "
+ JobTemplateMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/MetalakeMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/MetalakeMetaPostgreSQLProvider.java
index f52eafb8a2..4fee692088 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/MetalakeMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/MetalakeMetaPostgreSQLProvider.java
@@ -29,8 +29,8 @@ public class MetalakeMetaPostgreSQLProvider extends
MetalakeMetaBaseSQLProvider
public String softDeleteMetalakeMetaByMetalakeId(Long metalakeId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelMetaPostgreSQLProvider.java
index b7db5a4d70..6ebfc639ad 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelMetaPostgreSQLProvider.java
@@ -52,8 +52,8 @@ public class ModelMetaPostgreSQLProvider extends
ModelMetaBaseSQLProvider {
@Param("schemaId") Long schemaId, @Param("modelName") String modelName) {
return "UPDATE "
+ ModelMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND model_name = #{modelName} AND
deleted_at = 0";
}
@@ -61,8 +61,8 @@ public class ModelMetaPostgreSQLProvider extends
ModelMetaBaseSQLProvider {
public String softDeleteModelMetasByCatalogId(@Param("catalogId") Long
catalogId) {
return "UPDATE "
+ ModelMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
@@ -70,8 +70,8 @@ public class ModelMetaPostgreSQLProvider extends
ModelMetaBaseSQLProvider {
public String softDeleteModelMetasByMetalakeId(@Param("metalakeId") Long
metalakeId) {
return "UPDATE "
+ ModelMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
@@ -79,8 +79,8 @@ public class ModelMetaPostgreSQLProvider extends
ModelMetaBaseSQLProvider {
public String softDeleteModelMetasBySchemaId(@Param("schemaId") Long
schemaId) {
return "UPDATE "
+ ModelMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelVersionAliasRelPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelVersionAliasRelPostgreSQLProvider.java
index 7bcac308af..a035c3ad9d 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelVersionAliasRelPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelVersionAliasRelPostgreSQLProvider.java
@@ -30,8 +30,8 @@ public class ModelVersionAliasRelPostgreSQLProvider extends
ModelVersionAliasRel
@Param("schemaId") Long schemaId, @Param("modelName") String modelName) {
return "UPDATE "
+ ModelVersionAliasRelMapper.TABLE_NAME
- + " mvar SET deleted_at = floor(extract(epoch from((current_timestamp
-"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " mvar SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE mvar.model_id = ("
+ " SELECT mm.model_id FROM "
+ ModelMetaMapper.TABLE_NAME
@@ -44,8 +44,8 @@ public class ModelVersionAliasRelPostgreSQLProvider extends
ModelVersionAliasRel
@Param("modelId") Long modelId, @Param("modelVersion") Integer
modelVersion) {
return "UPDATE "
+ ModelVersionAliasRelMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE model_id = #{modelId} AND model_version = #{modelVersion}
AND deleted_at = 0";
}
@@ -54,8 +54,8 @@ public class ModelVersionAliasRelPostgreSQLProvider extends
ModelVersionAliasRel
@Param("modelId") Long modelId, @Param("alias") String alias) {
return "UPDATE "
+ ModelVersionAliasRelMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE model_id = #{modelId} AND model_version = ("
+ " SELECT model_version FROM "
+ ModelVersionAliasRelMapper.TABLE_NAME
@@ -67,8 +67,8 @@ public class ModelVersionAliasRelPostgreSQLProvider extends
ModelVersionAliasRel
public String softDeleteModelVersionAliasRelsBySchemaId(@Param("schemaId")
Long schemaId) {
return "UPDATE "
+ ModelVersionAliasRelMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE model_id IN ("
+ " SELECT model_id FROM "
+ ModelMetaMapper.TABLE_NAME
@@ -79,8 +79,8 @@ public class ModelVersionAliasRelPostgreSQLProvider extends
ModelVersionAliasRel
public String softDeleteModelVersionAliasRelsByCatalogId(@Param("catalogId")
Long catalogId) {
return "UPDATE "
+ ModelVersionAliasRelMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE model_id IN ("
+ " SELECT model_id FROM "
+ ModelMetaMapper.TABLE_NAME
@@ -91,8 +91,8 @@ public class ModelVersionAliasRelPostgreSQLProvider extends
ModelVersionAliasRel
public String
softDeleteModelVersionAliasRelsByMetalakeId(@Param("metalakeId") Long
metalakeId) {
return "UPDATE "
+ ModelVersionAliasRelMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE model_id IN ("
+ " SELECT model_id FROM "
+ ModelMetaMapper.TABLE_NAME
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelVersionMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelVersionMetaPostgreSQLProvider.java
index 28fa2d5001..73f5871fcd 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelVersionMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/ModelVersionMetaPostgreSQLProvider.java
@@ -31,8 +31,8 @@ public class ModelVersionMetaPostgreSQLProvider extends
ModelVersionMetaBaseSQLP
@Param("schemaId") Long schemaId, @Param("modelName") String modelName) {
return "UPDATE "
+ ModelVersionMetaMapper.TABLE_NAME
- + " mvi SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " mvi SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE mvi.schema_id = #{schemaId} AND mvi.model_id = ("
+ " SELECT mm.model_id FROM "
+ ModelMetaMapper.TABLE_NAME
@@ -45,8 +45,8 @@ public class ModelVersionMetaPostgreSQLProvider extends
ModelVersionMetaBaseSQLP
@Param("modelId") Long modelId, @Param("modelVersion") Integer
modelVersion) {
return "UPDATE "
+ ModelVersionMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE model_id = #{modelId} AND version = #{modelVersion} AND
deleted_at = 0";
}
@@ -55,8 +55,8 @@ public class ModelVersionMetaPostgreSQLProvider extends
ModelVersionMetaBaseSQLP
@Param("modelId") Long modelId, @Param("alias") String alias) {
return "UPDATE "
+ ModelVersionMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE model_id = #{modelId} AND version = ("
+ " SELECT model_version FROM "
+ ModelVersionAliasRelMapper.TABLE_NAME
@@ -68,8 +68,8 @@ public class ModelVersionMetaPostgreSQLProvider extends
ModelVersionMetaBaseSQLP
public String softDeleteModelVersionMetasBySchemaId(@Param("schemaId") Long
schemaId) {
return "UPDATE "
+ ModelVersionMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND deleted_at = 0";
}
@@ -77,8 +77,8 @@ public class ModelVersionMetaPostgreSQLProvider extends
ModelVersionMetaBaseSQLP
public String softDeleteModelVersionMetasByCatalogId(@Param("catalogId")
Long catalogId) {
return "UPDATE "
+ ModelVersionMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
@@ -86,8 +86,8 @@ public class ModelVersionMetaPostgreSQLProvider extends
ModelVersionMetaBaseSQLP
public String softDeleteModelVersionMetasByMetalakeId(@Param("metalakeId")
Long metalakeId) {
return "UPDATE "
+ ModelVersionMetaMapper.TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/OwnerMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/OwnerMetaPostgreSQLProvider.java
index c88f292ae4..f9755b10d4 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/OwnerMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/OwnerMetaPostgreSQLProvider.java
@@ -35,8 +35,8 @@ public class OwnerMetaPostgreSQLProvider extends
OwnerMetaBaseSQLProvider {
Long metadataObjectId, String metadataObjectType) {
return "UPDATE "
+ OWNER_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp - "
+ + " timestamp '1970-01-01 00:00:00')) *1000 )"
+ " WHERE metadata_object_id = #{metadataObjectId} AND
metadata_object_type = #{metadataObjectType} AND deleted_at = 0";
}
@@ -44,8 +44,8 @@ public class OwnerMetaPostgreSQLProvider extends
OwnerMetaBaseSQLProvider {
public String softDeleteOwnerRelByOwnerIdAndType(Long ownerId, String
ownerType) {
return "UPDATE "
+ OWNER_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp - "
+ + " timestamp '1970-01-01 00:00:00')) *1000 )"
+ " WHERE owner_id = #{ownerId} AND owner_type = #{ownerType} AND
deleted_at = 0";
}
@@ -53,8 +53,8 @@ public class OwnerMetaPostgreSQLProvider extends
OwnerMetaBaseSQLProvider {
public String softDeleteOwnerRelByMetalakeId(Long metalakeId) {
return "UPDATE "
+ OWNER_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp - "
+ + " timestamp '1970-01-01 00:00:00')) *1000 )"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at =0";
}
@@ -62,8 +62,8 @@ public class OwnerMetaPostgreSQLProvider extends
OwnerMetaBaseSQLProvider {
public String softDeleteOwnerRelByCatalogId(Long catalogId) {
return "UPDATE "
+ OWNER_TABLE_NAME
- + " ot SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " ot SET deleted_at = floor(extract(epoch from(current_timestamp - "
+ + " timestamp '1970-01-01 00:00:00')) *1000 )"
+ " WHERE ot.deleted_at = 0 AND EXISTS ("
+ " SELECT ct.catalog_id FROM "
+ CatalogMetaMapper.TABLE_NAME
@@ -101,7 +101,7 @@ public class OwnerMetaPostgreSQLProvider extends
OwnerMetaBaseSQLProvider {
public String softDeleteOwnerRelBySchemaId(Long schemaId) {
return "UPDATE "
+ OWNER_TABLE_NAME
- + " ot SET deleted_at = floor(extract(epoch from((current_timestamp -
timestamp '1970-01-01 00:00:00')*1000))) "
+ + " ot SET deleted_at = floor(extract(epoch from(current_timestamp -
timestamp '1970-01-01 00:00:00')) * 1000) "
+ " WHERE ot.deleted_at = 0 AND EXISTS ("
+ " SELECT st.schema_id FROM "
+ SchemaMetaMapper.TABLE_NAME
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyMetaPostgreSQLProvider.java
index 5b0a7ae421..1b6ec91b74 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyMetaPostgreSQLProvider.java
@@ -29,8 +29,8 @@ public class PolicyMetaPostgreSQLProvider extends
PolicyMetaBaseSQLProvider {
public String softDeletePolicyByMetalakeAndPolicyName(String metalakeName,
String policyName) {
return "UPDATE "
+ POLICY_META_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = (SELECT metalake_id FROM "
+ " metalake_meta mm WHERE mm.metalake_name = #{metalakeName} AND
mm.deleted_at = 0)"
+ " AND policy_name = #{policyName} AND deleted_at = 0";
@@ -40,8 +40,8 @@ public class PolicyMetaPostgreSQLProvider extends
PolicyMetaBaseSQLProvider {
public String softDeletePolicyMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ POLICY_META_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyMetadataObjectRelPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyMetadataObjectRelPostgreSQLProvider.java
index 4e3a7bd48c..99ef046f38 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyMetadataObjectRelPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyMetadataObjectRelPostgreSQLProvider.java
@@ -36,7 +36,7 @@ import org.apache.ibatis.annotations.Param;
public class PolicyMetadataObjectRelPostgreSQLProvider
extends PolicyMetadataObjectRelBaseSQLProvider {
private static final String DELETED_AT_NOW_EXPRESSION =
- " floor(extract(epoch from((current_timestamp - timestamp '1970-01-01
00:00:00')*1000))) ";
+ " floor(extract(epoch from(current_timestamp - timestamp '1970-01-01
00:00:00')) * 1000)";
@Override
public String softDeletePolicyMetadataObjectRelsByMetalakeAndPolicyName(
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyVersionPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyVersionPostgreSQLProvider.java
index 471099a5ec..610ee08587 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyVersionPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/PolicyVersionPostgreSQLProvider.java
@@ -31,8 +31,8 @@ public class PolicyVersionPostgreSQLProvider extends
PolicyVersionBaseSQLProvide
String metalakeName, String policyName) {
return "UPDATE "
+ POLICY_VERSION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = (SELECT metalake_id FROM "
+ MetalakeMetaMapper.TABLE_NAME
+ " mm WHERE mm.metalake_name = #{metalakeName} AND mm.deleted_at = 0)"
@@ -56,8 +56,8 @@ public class PolicyVersionPostgreSQLProvider extends
PolicyVersionBaseSQLProvide
Long policyId, long versionRetentionLine, int limit) {
return "UPDATE "
+ POLICY_VERSION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE id IN (SELECT id FROM "
+ POLICY_VERSION_TABLE_NAME
+ " WHERE policy_id = #{policyId} AND version <
#{versionRetentionLine}"
@@ -68,8 +68,8 @@ public class PolicyVersionPostgreSQLProvider extends
PolicyVersionBaseSQLProvide
public String softDeletePolicyVersionsByMetalakeId(Long metalakeId) {
return "UPDATE "
+ POLICY_VERSION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/RoleMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/RoleMetaPostgreSQLProvider.java
index b4b1054be7..6782207e55 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/RoleMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/RoleMetaPostgreSQLProvider.java
@@ -29,8 +29,8 @@ public class RoleMetaPostgreSQLProvider extends
RoleMetaBaseSQLProvider {
public String softDeleteRoleMetaByRoleId(Long roleId) {
return "UPDATE "
+ ROLE_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE role_id = #{roleId} AND deleted_at = 0";
}
@@ -38,8 +38,8 @@ public class RoleMetaPostgreSQLProvider extends
RoleMetaBaseSQLProvider {
public String softDeleteRoleMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ ROLE_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/SchemaMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/SchemaMetaPostgreSQLProvider.java
index 5ba59ac685..bc7fee4fbd 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/SchemaMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/SchemaMetaPostgreSQLProvider.java
@@ -60,8 +60,8 @@ public class SchemaMetaPostgreSQLProvider extends
SchemaMetaBaseSQLProvider {
public String softDeleteSchemaMetasBySchemaId(Long schemaId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND deleted_at = 0";
}
@@ -69,8 +69,8 @@ public class SchemaMetaPostgreSQLProvider extends
SchemaMetaBaseSQLProvider {
public String softDeleteSchemaMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
@@ -78,8 +78,8 @@ public class SchemaMetaPostgreSQLProvider extends
SchemaMetaBaseSQLProvider {
public String softDeleteSchemaMetasByCatalogId(Long catalogId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/SecurableObjectPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/SecurableObjectPostgreSQLProvider.java
index 3b25a7f469..e89e12d475 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/SecurableObjectPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/SecurableObjectPostgreSQLProvider.java
@@ -39,8 +39,8 @@ public class SecurableObjectPostgreSQLProvider extends
SecurableObjectBaseSQLPro
return "<script>"
+ "UPDATE "
+ SECURABLE_OBJECT_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE FALSE "
+ "<foreach collection='securableObjects' item='item' separator=' '>"
+ " OR (metadata_object_id = #{item.metadataObjectId} AND"
@@ -53,8 +53,8 @@ public class SecurableObjectPostgreSQLProvider extends
SecurableObjectBaseSQLPro
public String softDeleteSecurableObjectsByRoleId(Long roleId) {
return "UPDATE "
+ SECURABLE_OBJECT_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE role_id = #{roleId} AND deleted_at = 0";
}
@@ -62,8 +62,8 @@ public class SecurableObjectPostgreSQLProvider extends
SecurableObjectBaseSQLPro
public String softDeleteSecurableObjectsByMetalakeId(Long metalakeId) {
return "UPDATE "
+ SECURABLE_OBJECT_TABLE_NAME
- + " ob SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " ob SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE exists (SELECT * from "
+ ROLE_TABLE_NAME
+ " ro WHERE ro.metalake_id = #{metalakeId} AND ro.role_id =
ob.role_id"
@@ -76,8 +76,8 @@ public class SecurableObjectPostgreSQLProvider extends
SecurableObjectBaseSQLPro
@Param("metadataObjectType") String metadataObjectType) {
return "UPDATE "
+ SECURABLE_OBJECT_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metadata_object_id = #{metadataObjectId} AND deleted_at = 0
AND type = #{metadataObjectType}";
}
@@ -85,8 +85,8 @@ public class SecurableObjectPostgreSQLProvider extends
SecurableObjectBaseSQLPro
public String softDeleteObjectRelsByCatalogId(@Param("catalogId") Long
catalogId) {
return "UPDATE "
+ SECURABLE_OBJECT_TABLE_NAME
- + " sect SET deleted_at = floor(extract(epoch from((current_timestamp
-"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " sect SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE sect.deleted_at = 0 AND EXISTS ("
+ " SELECT ct.catalog_id FROM "
+ CatalogMetaMapper.TABLE_NAME
@@ -124,8 +124,8 @@ public class SecurableObjectPostgreSQLProvider extends
SecurableObjectBaseSQLPro
public String softDeleteObjectRelsBySchemaId(@Param("schemaId") Long
schemaId) {
return "UPDATE "
+ SECURABLE_OBJECT_TABLE_NAME
- + " sect SET deleted_at = floor(extract(epoch from((current_timestamp
-"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " sect SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE sect.deleted_at = 0 AND EXISTS ("
+ " SELECT st.schema_id FROM "
+ SchemaMetaMapper.TABLE_NAME
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/StatisticPostgresSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/StatisticPostgresSQLProvider.java
index de94eef949..99ffe93751 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/StatisticPostgresSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/StatisticPostgresSQLProvider.java
@@ -27,8 +27,8 @@ import org.apache.gravitino.storage.relational.po.StatisticPO;
public class StatisticPostgresSQLProvider extends StatisticBaseSQLProvider {
@Override
protected String softDeleteSQL() {
- return " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) ";
+ return " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)";
}
@Override
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableColumnPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableColumnPostgreSQLProvider.java
index e8ae522ac7..b768b89f1b 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableColumnPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableColumnPostgreSQLProvider.java
@@ -28,8 +28,8 @@ public class TableColumnPostgreSQLProvider extends
TableColumnBaseSQLProvider {
public String softDeleteColumnsByTableId(@Param("tableId") Long tableId) {
return "UPDATE "
+ TableColumnMapper.COLUMN_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE table_id = #{tableId} AND deleted_at = 0";
}
@@ -37,8 +37,8 @@ public class TableColumnPostgreSQLProvider extends
TableColumnBaseSQLProvider {
public String softDeleteColumnsByMetalakeId(@Param("metalakeId") Long
metalakeId) {
return "UPDATE "
+ TableColumnMapper.COLUMN_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
@@ -46,8 +46,8 @@ public class TableColumnPostgreSQLProvider extends
TableColumnBaseSQLProvider {
public String softDeleteColumnsByCatalogId(@Param("catalogId") Long
catalogId) {
return "UPDATE "
+ TableColumnMapper.COLUMN_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
@@ -55,8 +55,8 @@ public class TableColumnPostgreSQLProvider extends
TableColumnBaseSQLProvider {
public String softDeleteColumnsBySchemaId(@Param("schemaId") Long schemaId) {
return "UPDATE "
+ TableColumnMapper.COLUMN_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableMetaPostgreSQLProvider.java
index 227f73f585..00b11a5612 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TableMetaPostgreSQLProvider.java
@@ -58,8 +58,8 @@ public class TableMetaPostgreSQLProvider extends
TableMetaBaseSQLProvider {
public String softDeleteTableMetasByTableId(Long tableId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE table_id = #{tableId} AND deleted_at = 0";
}
@@ -67,8 +67,8 @@ public class TableMetaPostgreSQLProvider extends
TableMetaBaseSQLProvider {
public String softDeleteTableMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
@@ -76,8 +76,8 @@ public class TableMetaPostgreSQLProvider extends
TableMetaBaseSQLProvider {
public String softDeleteTableMetasByCatalogId(Long catalogId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
@@ -85,8 +85,8 @@ public class TableMetaPostgreSQLProvider extends
TableMetaBaseSQLProvider {
public String softDeleteTableMetasBySchemaId(Long schemaId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TagMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TagMetaPostgreSQLProvider.java
index 9f30b3f3f6..b887f16bd5 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TagMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TagMetaPostgreSQLProvider.java
@@ -30,8 +30,8 @@ public class TagMetaPostgreSQLProvider extends
TagMetaBaseSQLProvider {
public String softDeleteTagMetaByMetalakeAndTagName(String metalakeName,
String tagName) {
return "UPDATE "
+ TAG_TABLE_NAME
- + " tm SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " tm SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE tm.metalake_id IN ("
+ " SELECT mm.metalake_id FROM "
+ MetalakeMetaMapper.TABLE_NAME
@@ -43,8 +43,8 @@ public class TagMetaPostgreSQLProvider extends
TagMetaBaseSQLProvider {
public String softDeleteTagMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ TAG_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TagMetadataObjectRelPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TagMetadataObjectRelPostgreSQLProvider.java
index be008deca5..7daedc59f5 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TagMetadataObjectRelPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TagMetadataObjectRelPostgreSQLProvider.java
@@ -40,8 +40,8 @@ public class TagMetadataObjectRelPostgreSQLProvider extends
TagMetadataObjectRel
String metalakeName, String tagName) {
return "UPDATE "
+ TAG_METADATA_OBJECT_RELATION_TABLE_NAME
- + " te SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " te SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE te.tag_id IN (SELECT tm.tag_id FROM "
+ TagMetaMapper.TAG_TABLE_NAME
+ " tm WHERE tm.metalake_id IN (SELECT mm.metalake_id FROM "
@@ -54,8 +54,8 @@ public class TagMetadataObjectRelPostgreSQLProvider extends
TagMetadataObjectRel
public String softDeleteTagMetadataObjectRelsByMetalakeId(Long metalakeId) {
return "UPDATE "
+ TAG_METADATA_OBJECT_RELATION_TABLE_NAME
- + " te SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " te SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE EXISTS (SELECT * FROM "
+ TagMetaMapper.TAG_TABLE_NAME
+ " tm WHERE tm.metalake_id = #{metalakeId} AND tm.tag_id = te.tag_id"
@@ -68,8 +68,8 @@ public class TagMetadataObjectRelPostgreSQLProvider extends
TagMetadataObjectRel
@Param("metadataObjectType") String metadataObjectType) {
return " UPDATE "
+ TAG_METADATA_OBJECT_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metadata_object_id = #{metadataObjectId} AND deleted_at = 0"
+ " AND metadata_object_type = #{metadataObjectType}";
}
@@ -78,8 +78,8 @@ public class TagMetadataObjectRelPostgreSQLProvider extends
TagMetadataObjectRel
public String softDeleteTagMetadataObjectRelsByCatalogId(@Param("catalogId")
Long catalogId) {
return " UPDATE "
+ TagMetadataObjectRelMapper.TAG_METADATA_OBJECT_RELATION_TABLE_NAME
- + " tmt SET deleted_at = floor(extract(epoch from((current_timestamp
-"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " tmt SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE tmt.deleted_at = 0 AND EXISTS ("
+ " SELECT ct.catalog_id FROM "
+ CatalogMetaMapper.TABLE_NAME
@@ -122,8 +122,8 @@ public class TagMetadataObjectRelPostgreSQLProvider extends
TagMetadataObjectRel
public String softDeleteTagMetadataObjectRelsBySchemaId(@Param("schemaId")
Long schemaId) {
return " UPDATE "
+ TagMetadataObjectRelMapper.TAG_METADATA_OBJECT_RELATION_TABLE_NAME
- + " tmt SET deleted_at = floor(extract(epoch from((current_timestamp
-"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " tmt SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE tmt.deleted_at = 0 AND EXISTS ("
+ " SELECT st.schema_id FROM "
+ SchemaMetaMapper.TABLE_NAME
@@ -161,8 +161,8 @@ public class TagMetadataObjectRelPostgreSQLProvider extends
TagMetadataObjectRel
public String softDeleteTagMetadataObjectRelsByTableId(@Param("tableId")
Long tableId) {
return " UPDATE "
+ TagMetadataObjectRelMapper.TAG_METADATA_OBJECT_RELATION_TABLE_NAME
- + " tmt SET deleted_at = floor(extract(epoch from((current_timestamp
-"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " tmt SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE tmt.deleted_at = 0 AND EXISTS ("
+ " SELECT tat.table_id FROM "
+ TableMetaMapper.TABLE_NAME
@@ -182,8 +182,8 @@ public class TagMetadataObjectRelPostgreSQLProvider extends
TagMetadataObjectRel
return "<script>"
+ "UPDATE "
+ TAG_METADATA_OBJECT_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE tag_id IN "
+ "<foreach item='tagId' collection='tagIds' open='(' separator=','
close=')'>"
+ "#{tagId}"
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TopicMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TopicMetaPostgreSQLProvider.java
index 5ddcb4eb41..1d93440c7f 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TopicMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/TopicMetaPostgreSQLProvider.java
@@ -30,8 +30,8 @@ public class TopicMetaPostgreSQLProvider extends
TopicMetaBaseSQLProvider {
public String softDeleteTopicMetasByTopicId(Long topicId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE topic_id = #{topicId} AND deleted_at = 0";
}
@@ -39,8 +39,8 @@ public class TopicMetaPostgreSQLProvider extends
TopicMetaBaseSQLProvider {
public String softDeleteTopicMetasByCatalogId(Long catalogId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE catalog_id = #{catalogId} AND deleted_at = 0";
}
@@ -48,8 +48,8 @@ public class TopicMetaPostgreSQLProvider extends
TopicMetaBaseSQLProvider {
public String softDeleteTopicMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000)))"
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
@@ -57,8 +57,8 @@ public class TopicMetaPostgreSQLProvider extends
TopicMetaBaseSQLProvider {
public String softDeleteTopicMetasBySchemaId(Long schemaId) {
return "UPDATE "
+ TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE schema_id = #{schemaId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/UserMetaPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/UserMetaPostgreSQLProvider.java
index e5c2427791..2323bb2090 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/UserMetaPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/UserMetaPostgreSQLProvider.java
@@ -31,8 +31,8 @@ public class UserMetaPostgreSQLProvider extends
UserMetaBaseSQLProvider {
public String softDeleteUserMetaByUserId(Long userId) {
return "UPDATE "
+ USER_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE user_id = #{userId} AND deleted_at = 0";
}
@@ -40,8 +40,8 @@ public class UserMetaPostgreSQLProvider extends
UserMetaBaseSQLProvider {
public String softDeleteUserMetasByMetalakeId(Long metalakeId) {
return "UPDATE "
+ USER_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0";
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/UserRoleRelPostgreSQLProvider.java
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/UserRoleRelPostgreSQLProvider.java
index 4661b93020..e6c322f5f5 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/UserRoleRelPostgreSQLProvider.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/postgresql/UserRoleRelPostgreSQLProvider.java
@@ -32,8 +32,8 @@ public class UserRoleRelPostgreSQLProvider extends
UserRoleRelBaseSQLProvider {
public String softDeleteUserRoleRelByUserId(Long userId) {
return "UPDATE "
+ USER_ROLE_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE user_id = #{userId} AND deleted_at = 0";
}
@@ -42,8 +42,8 @@ public class UserRoleRelPostgreSQLProvider extends
UserRoleRelBaseSQLProvider {
return "<script>"
+ "UPDATE "
+ USER_ROLE_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE user_id = #{userId} AND role_id in ("
+ "<foreach collection='roleIds' item='roleId' separator=','>"
+ "#{roleId}"
@@ -57,8 +57,8 @@ public class UserRoleRelPostgreSQLProvider extends
UserRoleRelBaseSQLProvider {
public String softDeleteUserRoleRelByMetalakeId(Long metalakeId) {
return "UPDATE "
+ USER_ROLE_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE user_id IN (SELECT user_id FROM "
+ USER_TABLE_NAME
+ " WHERE metalake_id = #{metalakeId} AND deleted_at = 0)"
@@ -69,8 +69,8 @@ public class UserRoleRelPostgreSQLProvider extends
UserRoleRelBaseSQLProvider {
public String softDeleteUserRoleRelByRoleId(Long roleId) {
return "UPDATE "
+ USER_ROLE_RELATION_TABLE_NAME
- + " SET deleted_at = floor(extract(epoch from((current_timestamp -"
- + " timestamp '1970-01-01 00:00:00')*1000))) "
+ + " SET deleted_at = floor(extract(epoch from(current_timestamp -"
+ + " timestamp '1970-01-01 00:00:00'))*1000)"
+ " WHERE role_id = #{roleId} AND deleted_at = 0";
}
