[ranger] 02/02: RANGER-4410: dataShareName/partailName not working - #2

[madhan]

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

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 9d62eef59a6bc1f25f035d1e5aac25c91a1b3d94
Author: root <prashant.satam...@gmail.com>
AuthorDate: Mon Oct 16 17:49:55 2023 +0530

    RANGER-4410: dataShareName/partailName not working - #2
    
    Signed-off-by: Madhan Neethiraj <mad...@apache.org>
---
 .../main/java/org/apache/ranger/service/RangerGdsDatasetService.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsDatasetService.java
 
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsDatasetService.java
index 072889f1d..75833ea7b 100755
--- 
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsDatasetService.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsDatasetService.java
@@ -61,8 +61,8 @@ public class RangerGdsDatasetService extends 
RangerGdsBaseModelService<XXGdsData
         searchFields.add(new SearchField(SearchFilter.PROJECT_NAME,            
  "proj.name",         SearchField.DATA_TYPE.STRING,  
SearchField.SEARCH_TYPE.FULL, "XXGdsDatasetInProject dip, XXGdsProject proj", 
"obj.id = dip.datasetId and dip.projectId = proj.id"));
         searchFields.add(new SearchField(SearchFilter.PROJECT_NAME_PARTIAL,    
  "proj.name",         SearchField.DATA_TYPE.STRING,  
SearchField.SEARCH_TYPE.PARTIAL, "XXGdsDatasetInProject dip, XXGdsProject 
proj", "obj.id = dip.datasetId and dip.projectId = proj.id"));
         searchFields.add(new SearchField(SearchFilter.PROJECT_ID,              
  "dip.projectId",     SearchField.DATA_TYPE.INTEGER, 
SearchField.SEARCH_TYPE.FULL, "XXGdsDatasetInProject dip", "obj.id = 
dip.datasetId"));
-        searchFields.add(new SearchField(SearchFilter.DATA_SHARE_NAME,         
  "ds.name",           SearchField.DATA_TYPE.STRING,  
SearchField.SEARCH_TYPE.FULL, "XXGdsDataset ds XXGdsDataShareInDataset dshid, 
XXGdsDataShare dsh", "obj.id = dshid.datasetId and dshid.dataShareId = 
dsh.id"));
-        searchFields.add(new SearchField(SearchFilter.DATA_SHARE_NAME_PARTIAL, 
  "ds.name",           SearchField.DATA_TYPE.STRING,  
SearchField.SEARCH_TYPE.PARTIAL, "XXGdsDataset ds XXGdsDataShareInDataset 
dshid, XXGdsDataShare dsh", "obj.id = dshid.datasetId and dshid.dataShareId = 
dsh.id"));
+        searchFields.add(new SearchField(SearchFilter.DATA_SHARE_NAME,         
  "dsh.name",          SearchField.DATA_TYPE.STRING,  
SearchField.SEARCH_TYPE.FULL, "XXGdsDataset ds, XXGdsDataShareInDataset dshid, 
XXGdsDataShare dsh", "obj.id = dshid.datasetId and dshid.dataShareId = 
dsh.id"));
+        searchFields.add(new SearchField(SearchFilter.DATA_SHARE_NAME_PARTIAL, 
  "dsh.name",          SearchField.DATA_TYPE.STRING,  
SearchField.SEARCH_TYPE.PARTIAL, "XXGdsDataset ds, XXGdsDataShareInDataset 
dshid, XXGdsDataShare dsh", "obj.id = dshid.datasetId and dshid.dataShareId = 
dsh.id"));
         searchFields.add(new SearchField(SearchFilter.DATA_SHARE_ID,           
  "dshid.dataShareId", SearchField.DATA_TYPE.INTEGER, 
SearchField.SEARCH_TYPE.FULL, "XXGdsDataShareInDataset dshid", "obj.id = 
dshid.datasetId"));
         searchFields.add(new SearchField(SearchFilter.SERVICE_NAME,            
  "s.name",            SearchField.DATA_TYPE.STRING, 
SearchField.SEARCH_TYPE.FULL, "XXGdsDataShareInDataset dshid, XXGdsDataShare 
dsh, XXService s", "obj.id = dshid.datasetId and dshid.dataShareId = dsh.id and 
dsh.serviceId = s.id"));
         searchFields.add(new SearchField(SearchFilter.SERVICE_NAME_PARTIAL,    
  "s.name",            SearchField.DATA_TYPE.STRING, 
SearchField.SEARCH_TYPE.PARTIAL, "XXGdsDataShareInDataset dshid, XXGdsDataShare 
dsh, XXService s", "obj.id = dshid.datasetId and dshid.dataShareId = dsh.id and 
dsh.serviceId = s.id"));