[airavata-data-lake] branch master updated: adding update properties
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 e58cf56 adding update properties
new b199b75 Merge pull request #205 from isururanawaka/mysql_conversion
e58cf56 is described below
commit e58cf56a911f76d092b904a68e0fc4dc93465a72
Author: Isuru Ranawaka
AuthorDate: Mon Jan 30 17:33:44 2023 -0500
adding update properties
---
.../airavata/drms/api/persistance/mapper/ResourceMapper.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
index e756475..3344b6b 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
@@ -100,7 +100,12 @@ public class ResourceMapper {
Resource prResource = new Resource();
+ Map resourceMap = resource.getPropertiesMap();
+ for(Map.Entry entry: resourceMap.entrySet()){
+ resourcePropertySet.add(new ResourceProperty(entry.getKey(),
entry.getValue(), prResource));
+}
+
if (allFields != null) {
allFields.forEach((descriptor, value) -> {
String fieldName = descriptor.getJsonName();
@@ -115,8 +120,6 @@ public class ResourceMapper {
resourcePropertySet.add(new ResourceProperty("tenantId",
authenticatedUser.getTenantId(), prResource));
resourcePropertySet.add(new ResourceProperty("lastModifiedTime",
String.valueOf(entity.getCreatedAt()), prResource));
resourcePropertySet.add(new ResourceProperty("owner",
entity.getOwnerId(), prResource));
-resourcePropertySet.add(new ResourceProperty("firstName",
authenticatedUser.getFirstName(), prResource));
-resourcePropertySet.add(new ResourceProperty("lastName",
authenticatedUser.getLastName(), prResource));
if(exResource != null){
Set properties = exResource.getResourceProperty();
[airavata-mft] branch master updated: README improvements
This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-mft.git The following commit(s) were added to refs/heads/master by this push: new b44a1bc README improvements b44a1bc is described below commit b44a1bc6c32dd3f9ec7622569a648462aa75763c Author: Suresh Marru AuthorDate: Mon Jan 30 17:27:41 2023 -0500 README improvements --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 52b3bb2..ee2ab52 100755 --- a/README.md +++ b/README.md @@ -22,12 +22,12 @@ under the License. # Airavata Managed File Transfers (MFT) -Airavata MFT is a high-performance, multi-protocol data transfer engine developed for orchestrating data movement and operations across most of the cloud and legacy storage endpoints. Through Airavata MFT, our vision is to provide simple but highly performing tools for users to access any cloud or on-premise storage endpoint just as they access local files in their workstations. +Apache Airavata MFT is a high-performance, multi-protocol data transfer engine to orchestrate data movement and operations across most cloud and legacy storage endpoints. Airavata MFT provides simple but highly-performing tools to access most cloud and on-premise storages as seamlessly as they access local files in their workstations. -Airavata MFT abstracts out the complexity of each storage type and provides a unified and simple interface for users to access and move data across any endpoint seamlessly. To gain the maximum throughput between storage endpoints, Airavata MFT utilizes Agents installed between the optimum network path with additional multi-channel, parallel data paths to further optimize the transfer performance. In addition to that, MFT can utilize parallel Agents to transfer data between endpoints to g [...] +Airavata MFT abstracts out the complexity of each storage type and provides a unified and simple interface for users to access and move data across any endpoint seamlessly. Airavata MFT bundles easily deployable agents which auto determine optimum network path with additional multi-channel, parallel data paths to optimize the transfer performance to gain the maximum throughput between storage endpoints. MFT utilizes parallel Agents to transfer data between endpoints to gain the advantage [...] # Try Airavata MFT -You need to have Java 11+ and python3.10+ installed to install Airavata MFT in your environment. We currently only support Linux and MacOS operating systems and plan to support Windows in future. +MFT requires Java 11+ and python3.10+ to install Airavata MFT in your environment. MFT currently supports Linux and MacOS operating systems. Contributions to support Windows are welcome!!. ### Download and Install
[airavata-data-lake] branch master updated: add drms
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 165a4f6 add drms
new 235ef31 Merge pull request #204 from isururanawaka/mysql_conversion
165a4f6 is described below
commit 165a4f69a741276088cbe31f26e80dafe1e14922
Author: Isuru Ranawaka
AuthorDate: Mon Jan 30 17:15:22 2023 -0500
add drms
---
.../airavata/drms/api/handlers/ResourceServiceHandler.java | 5 +++--
.../drms/api/persistance/mapper/ResourceMapper.java | 13 -
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
index 296267f..b3d24a0 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -148,7 +148,7 @@ public class ResourceServiceHandler extends
ResourceServiceGrpc.ResourceServiceI
callUser.getUsername());
if (exEntity.isPresent()) {
-Resource resource = ResourceMapper.map(request.getResource(),
exEntity.get(), callUser);
+Resource resource =
ResourceMapper.map(request.getResource(),null, exEntity.get(), callUser);
resource.setResourceType(type);
resource.setParentResourceId(parentId);
resourceRepository.save(resource);
@@ -265,9 +265,10 @@ public class ResourceServiceHandler extends
ResourceServiceGrpc.ResourceServiceI
resourceProperties.get(0).getPropertyValue());
if (exEntity.isPresent()) {
- Resource resource =
ResourceMapper.map(request.getResource(), exEntity.get(), callUser);
+ Resource resource =
ResourceMapper.map(request.getResource(), exResource.get(),exEntity.get(),
callUser);
resource.setResourceType(type);
resource.setParentResourceId(parentId);
+
resourceRepository.save(resource);
GenericResource genericResource =
ResourceMapper.map(resource, exEntity.get());
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
index c23db9f..e756475 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
@@ -91,7 +91,8 @@ public class ResourceMapper {
}
-public static Resource map(GenericResource resource, Entity entity,
AuthenticatedUser authenticatedUser) {
+public static Resource map(GenericResource resource, Resource exResource,
Entity entity,
+ AuthenticatedUser authenticatedUser) {
Map allFields =
resource.getAllFields();
@@ -117,6 +118,16 @@ public class ResourceMapper {
resourcePropertySet.add(new ResourceProperty("firstName",
authenticatedUser.getFirstName(), prResource));
resourcePropertySet.add(new ResourceProperty("lastName",
authenticatedUser.getLastName(), prResource));
+if(exResource != null){
+ Set properties = exResource.getResourceProperty();
+ for(ResourceProperty property: properties){
+ if (property.getPropertyKey().equals("metadata")||
+ property.getPropertyKey().equals("firstName")||
+ property.getPropertyKey().equals("lastName")){
+ resourcePropertySet.add(property);
+ }
+ }
+}
prResource.setId(entity.getId());
prResource.setResourceProperty(resourcePropertySet);
[airavata-data-lake] branch master updated: big fix in update entity
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 f0e8609 big fix in update entity
new 7cc5e0a Merge pull request #203 from isururanawaka/mysql_conversion
f0e8609 is described below
commit f0e86092a9eff5589ddb53acd1b9a784049fd11a
Author: Isuru Ranawaka
AuthorDate: Mon Jan 30 13:30:39 2023 -0500
big fix in update entity
---
.../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
index e3943ca..296267f 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -266,6 +266,8 @@ public class ResourceServiceHandler extends
ResourceServiceGrpc.ResourceServiceI
if (exEntity.isPresent()) {
Resource resource =
ResourceMapper.map(request.getResource(), exEntity.get(), callUser);
+ resource.setResourceType(type);
+ resource.setParentResourceId(parentId);
resourceRepository.save(resource);
GenericResource genericResource =
ResourceMapper.map(resource, exEntity.get());
[airavata-data-lake] branch master updated: bug fix in update entity
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 a7fe803 bug fix in update entity
new c359d79 Merge pull request #202 from isururanawaka/mysql_conversion
a7fe803 is described below
commit a7fe803bd60cec77ab04cb26ea2fc64de24fd1fa
Author: Isuru Ranawaka
AuthorDate: Mon Jan 30 13:10:45 2023 -0500
bug fix in update entity
---
.../apache/airavata/drms/api/handlers/ResourceServiceHandler.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
index 897cbaa..e3943ca 100644
---
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
+++
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -254,15 +254,16 @@ public class ResourceServiceHandler extends
ResourceServiceGrpc.ResourceServiceI
Optional exResource =
resourceRepository.findById(entityId);
if (exResource.isPresent()) {
-
List resourceProperties =
resourcePropertyRepository.
findByPropertyKeyAndResourceId("owner",exResource.get().getId());
+ if (parentId == null|| parentId.isEmpty())
+ parentId = exResource.get().getParentResourceId();
if (!resourceProperties.isEmpty()) {
Optional exEntity =
CustosUtils.mergeResourceEntity(custosClientProvider, callUser.getTenantId(),
parentId, type, entityId,
request.getResource().getResourceName(),
request.getResource().getResourceName(),
resourceProperties.get(0).getPropertyValue());
-
+
if (exEntity.isPresent()) {
Resource resource =
ResourceMapper.map(request.getResource(), exEntity.get(), callUser);
resourceRepository.save(resource);
[airavata-data-lake] branch master updated (b0a9503 -> b388a30)
This is an automated email from the ASF dual-hosted git repository. isjarana pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git from b0a9503 Merge pull request #200 from isururanawaka/mysql_conversion new fe1d59a Bug fix in GenricParserTask, workdrectory creation new e35a294 Bug fix in GenricParserTask, workdrectory creation new 90b0c68 bug fix in update entity new b388a30 Merge pull request #201 from isururanawaka/mysql_conversion The 528 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../engine/task/impl/GenericDataParsingTask.java | 13 -- .../drms/api/handlers/ResourceServiceHandler.java | 46 +- .../airavata/drms/api/utils/CustosUtils.java | 2 + 3 files changed, 39 insertions(+), 22 deletions(-)
