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/01 19:44:04 UTC
[airavata-data-lake] branch master updated: Bug fix in storage
preference search
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 dce1a9c Bug fix in storage preference search
new 70dcf5d Merge pull request #49 from isururanawaka/sharing_service_impl
dce1a9c is described below
commit dce1a9c8b88562aad2d2d0b3cf96bcafde5a47ff
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Wed Sep 1 15:43:06 2021 -0400
Bug fix in storage preference search
---
.../drms/api/handlers/StoragePreferenceServiceHandler.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
index 9528d69..2843f37 100644
--- a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
+++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
@@ -142,7 +142,7 @@ public class StoragePreferenceServiceHandler extends StoragePreferenceServiceGrp
StoragePreferenceConstants.SSH_STORAGE_PREFERENCE_TYPE_LABEL);
parentPropertiesMap = AnyStorageSerializer.serializeToMap(AnyStorage
.newBuilder().setSshStorage(storage.getSshStoragePreference().getStorage()).build());
- }else if (storage.getStorageCase()
+ } else if (storage.getStorageCase()
.equals(AnyStoragePreference.StorageCase.SDA_STORAGE_PREFERENCE)) {
storageId = storage.getSdaStoragePreference().getStorage().getStorageId();
@@ -251,12 +251,14 @@ public class StoragePreferenceServiceHandler extends StoragePreferenceServiceGrp
userProps.put("tenantId", callUser.getTenantId());
String query = " MATCH (u:User) where u.username = $username AND u.tenantId = $tenantId" +
- " OPTIONAL MATCH (u)<-[:SHARED_WITH]-(s1:Storage)<-[:CHILD_OF]->(sp1:StoragePreference)" +
+ " OPTIONAL MATCH (u)<-[:SHARED_WITH]-(s1:Storage)<-[:CHILD_OF]-(sp1:StoragePreference)" +
" OPTIONAL MATCH (cg:Group)-[:CHILD_OF *0..]->(g:Group)<-[:MEMBER_OF]-(u)" +
" OPTIONAL MATCH (sp2:StoragePreference)-[:CHILD_OF]->(s2:Storage)-[:SHARED_WITH]->(cg) " +
- " OPTIONAL MATCH (s4:Storage)<-[:CHILD_OF]->(sp4:StoragePreference)-[:SHARED_WITH]->(u)" +
- " OPTIONAL MATCH (s5:Storage)<-[:CHILD_OF]->(sp5:StoragePreference)-[:SHARED_WITH]->(cg)" +
- " return distinct s1, sp1, s2, sp2, s4,sp4, s5,sp5";
+ " OPTIONAL MATCH (sp3:StoragePreference)-[:CHILD_OF]->(s3:Storage)-[:SHARED_WITH]->(g) " +
+ " OPTIONAL MATCH (s4:Storage)<-[:CHILD_OF]-(sp4:StoragePreference)-[:SHARED_WITH]->(u)" +
+ " OPTIONAL MATCH (s5:Storage)<-[:CHILD_OF]-(sp5:StoragePreference)-[:SHARED_WITH]->(cg)" +
+ " OPTIONAL MATCH (s6:Storage)<-[:CHILD_OF]-(sp6:StoragePreference)-[:SHARED_WITH]->(g)" +
+ " return distinct s1, sp1, s2, sp2,s3,sp3, s4,sp4, s5,sp5, s6,sp6";
String storageId = null;