You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2021/08/10 08:56:42 UTC
[airavata-data-lake] branch master updated: Fixing the storage
serch query
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe 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 67c05ee Fixing the storage serch query
67c05ee is described below
commit 67c05ee0f7aa31f61066263ad89b768f8ff895e3
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Tue Aug 10 04:56:26 2021 -0400
Fixing the storage serch query
---
.../org/apache/airavata/drms/api/handlers/StorageServiceHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
index dea8e26..de821e5 100644
--- a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
+++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
@@ -174,9 +174,9 @@ public class StorageServiceHandler extends StorageServiceGrpc.StorageServiceImpl
List<Record> records = this.neo4JConnector.searchNodes(userProps,
" MATCH (u:User) where u.username = $username = $username AND u.tenantId = $tenantId" +
" OPTIONAL MATCH (u)<-[r2:SHARED_WITH]-(s:Storage)" +
- " OPTIONAL MATCH (ch:Group)-[CHILD_OF*]->(g:Group)<-[r3:MEMBER_OF]-(u)" +
+ " OPTIONAL MATCH (ch:Group)-[CHILD_OF *0..]->(g:Group)<-[r3:MEMBER_OF]-(u)" +
" OPTIONAL MATCH (cs:Storage)-[SHARED_WITH]->(ch) " +
- " OPTIONAL MATCH (ds:Storage)-[SHARED_WITH]->(g) return distinct s, cs, ds");
+ " return distinct s, cs");
try {
List<AnyStorage> storageList = AnyStorageDeserializer.deserializeList(records);
StorageSearchResponse.Builder builder = StorageSearchResponse.newBuilder();