This is an automated email from the ASF dual-hosted git repository. kishor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ranger.git
commit a522bc6fda3de336bf38dbe42395fe4e57b54f7a Author: sanket-shelar <[email protected]> AuthorDate: Wed Oct 1 16:35:32 2025 +0530 RANGER-5345: [GDS] Shared resource creation api is failing for oracle db Signed-off-by: Kishor Gollapalliwar <[email protected]> --- .../org/apache/ranger/authorization/utils/JsonUtils.java | 13 +++++++------ .../src/main/resources/META-INF/jpa_named_queries.xml | 14 ++++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java b/agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java index ff0fe452d..507ecc366 100755 --- a/agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java +++ b/agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java @@ -276,13 +276,14 @@ public static List<RangerTag> jsonToRangerTagList(String jsonStr) { } public static List<RangerGdsMaskInfo> jsonToListGdsMaskInfo(String jsonStr) { - try { - return getMapper().readValue(jsonStr, TYPE_LIST_RANGER_GDS_MASK_INFO); - } catch (Exception e) { - LOG.error("Cannot get Map<String, RangerPolicyItemDataMaskInfo> from {}", jsonStr, e); - - return null; + if (StringUtils.isNotEmpty(jsonStr)) { + try { + return getMapper().readValue(jsonStr, TYPE_LIST_RANGER_GDS_MASK_INFO); + } catch (Exception e) { + LOG.error("Cannot get List<RangerGdsMaskInfo> from {}", jsonStr, e); + } } + return null; } public static Map<String, RangerPolicyResource> jsonToMapPolicyResource(String jsonStr) { diff --git a/security-admin/src/main/resources/META-INF/jpa_named_queries.xml b/security-admin/src/main/resources/META-INF/jpa_named_queries.xml index 265479422..30db0eacb 100755 --- a/security-admin/src/main/resources/META-INF/jpa_named_queries.xml +++ b/security-admin/src/main/resources/META-INF/jpa_named_queries.xml @@ -2263,12 +2263,14 @@ </named-query> <named-query name="XXGdsProject.findProjectsWithDataShareInStatus"> - <query>SELECT DISTINCT obj FROM XXGdsProject obj, XXGdsDatasetInProject dip, XXGdsDataShareInDataset dshid - WHERE dshid.dataShareId = :dataShareId - AND dshid.status = :status - AND dip.datasetId = dshid.datasetId - AND dip.projectId = obj.id - AND dip.status = :status</query> + <query>SELECT obj FROM XXGdsProject obj + WHERE EXISTS ( + SELECT 1 FROM XXGdsDatasetInProject dip, XXGdsDataShareInDataset dshid + WHERE dshid.dataShareId = :dataShareId + AND dshid.status = :status + AND dip.datasetId = dshid.datasetId + AND dip.projectId = obj.id + AND dip.status = :status)</query> </named-query> <named-query name="XXGdsProject.findServiceIds">
