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 15:20:45 UTC
[airavata-data-lake] branch master updated: Bug fix in collection
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 d8104c6 Bug fix in collection searching
new 167eb3e Merge pull request #37 from isururanawaka/sharing_service_impl
d8104c6 is described below
commit d8104c6eb444c0f448c931fc1eb7ab1f2618d746
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Wed Aug 11 11:19:55 2021 -0400
Bug fix in collection searching
---
.../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 35216f2..d8dac8d 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
@@ -515,7 +515,7 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
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 (sp:Storage{entityId:'" + storageId + "'})<-[:CHILD_OF]-(rg:" + value + ")-[relRG:SHARED_WITH]->(g)" +
" return distinct r,relR, rg, relRG ";
keyList = new ArrayList();
keyList.add("r:relR");