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/09/10 02:31:02 UTC
[airavata-data-lake] branch master updated: Bug fix in resource
fetching
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 b1087ca Bug fix in resource fetching
new 11f6c28 Merge pull request #69 from isururanawaka/sharing_service_impl
b1087ca is described below
commit b1087ca22fd0c18d31a360634525fb0cfca9b2e2
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Thu Sep 9 22:15:12 2021 -0400
Bug fix in resource fetching
---
.../apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 9c852f7..5195ff5 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
@@ -556,9 +556,9 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
" OPTIONAL MATCH (g:Group)<-[:MEMBER_OF]-(u) " +
" OPTIONAL MATCH (s:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF]-(r:" + value + ")-[relR:SHARED_WITH]->(u)" +
" OPTIONAL MATCH (sp:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF]-(rg:" + value + ")-[relRG:SHARED_WITH]->(g)" +
- " OPTIONAL MATCH (s2:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF*]-(r2:" + value + ")-[relR2:SHARED_WITH]->(u) where NOT r2.owner=$username" +
- " OPTIONAL MATCH (s3:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF*]-(r3:" + value + ")-[relR3:SHARED_WITH]->(u) where NOT r3.owner=$username" +
- " return distinct r,relR, rg,relRG, r2,relR2, r3,relR3 ";
+ " OPTIONAL MATCH (s2:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF*]-(r2:" + value + ")-[relR2:SHARED_WITH]->(u) where NOT r2.owner=$username " +
+ " AND NOT (r2)-[:CHILD_OF*]->(r)" +
+ " return distinct r,relR, rg,relRG, r2,relR2";
keyList = new ArrayList();
keyList.add("r:relR");
keyList.add("rg:relRG");