Skip to content

RANGER-5345: [GDS] Shared resource creation api is failing for oracle db #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RANGER-5345: [GDS] Shared resource creation api is failing for oracle db #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions agents-common/src/main/java/org/apache/ranger/authorization/utils/JsonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
14 changes: 8 additions & 6 deletions security-admin/src/main/resources/META-INF/jpa_named_queries.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading