You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/08/11 14:44:21 UTC
[airavata-data-lake] branch master updated: Bug fix in searching
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
The following commit(s) were added to refs/heads/master by this push:
new a020325 Bug fix in searching
new 662bb68 Merge pull request #36 from isururanawaka/sharing_service_impl
a020325 is described below
commit a020325957248acc97ced977762e0169d97b95eb
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Wed Aug 11 10:43:34 2021 -0400
Bug fix in searching
---
ansible/datalake.yml | 4 ++--
ansible/inventories/test/group_vars/all/vars.yml | 2 +-
.../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ansible/datalake.yml b/ansible/datalake.yml
index 70c4bae..a9faf4f 100644
--- a/ansible/datalake.yml
+++ b/ansible/datalake.yml
@@ -21,6 +21,6 @@
---
- hosts: data-lake
roles:
- - custos
- - mft
+# - custos
+# - mft
- data_lake
\ No newline at end of file
diff --git a/ansible/inventories/test/group_vars/all/vars.yml b/ansible/inventories/test/group_vars/all/vars.yml
index ba1b655..1b7ea1a 100644
--- a/ansible/inventories/test/group_vars/all/vars.yml
+++ b/ansible/inventories/test/group_vars/all/vars.yml
@@ -86,7 +86,7 @@ datalake_drms_http_port: 8900
datalake_synch_broker_url: 149.165.156.200:9092
datalake_synch_broker_consumer_group: custosEventsGroup
-datalake_synch_broker_topic: 10002708-754b89b5-3a57-496c-aa34-8e2b4916fbcc
+datalake_synch_broker_topic: 10002640-561b67b4-fa7d-4368-8643-dcd9d0159c1d
datalake_synch_tenant_id: custos-ii8g0cfwsz6ruwezykn9-10002640
datalake_data_orch_datasource_url: jdbc:mysql://localhost:3306/data_orchestrator?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true
diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
index a57c6e7..35216f2 100644
--- a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
+++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -514,8 +514,8 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
if (depth == 1) {
query = " MATCH (u:User) where u.username = $username AND u.tenantId = $tenantId" +
" OPTIONAL MATCH (g:Group)<-[:MEMBER_OF]-(u) " +
- " OPTIONAL MATCH (s:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF*]-(r:" + value + ")-[relR:SHARED_WITH]->(u)" +
- " OPTIONAL MATCH (s:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF*]-(rg:" + value + ")-[relRG:SHARED_WITH]->(g)" +
+ " OPTIONAL MATCH (s:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF]-(r:" + value + ")-[relR:SHARED_WITH]->(u)" +
+ " OPTIONAL MATCH (s:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF]-(rg:" + value + ")-[relRG:SHARED_WITH]->(g)" +
" return distinct r,relR, rg, relRG ";
keyList = new ArrayList();
keyList.add("r:relR");