From d74564df6dd132c48925b911fddf8865a0f37b71 Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Tue, 29 Jul 2014 13:41:02 +0000 Subject: [PATCH] bug fixed when two algorithm computations are submitted (for example executing two submitquery). This is related to the map result's name when it has the same name for both computations. git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManagerAlgorithms@99065 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../dataaccess/algorithms/drmalgorithms/GetTableDetails.java | 3 ++- .../gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java | 3 ++- .../gcube/dataaccess/algorithms/drmalgorithms/ListNames.java | 3 ++- .../gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java | 3 ++- .../gcube/dataaccess/algorithms/drmalgorithms/ListTables.java | 3 ++- .../algorithms/drmalgorithms/RandomSampleOnTable.java | 3 ++- .../dataaccess/algorithms/drmalgorithms/SampleOnTable.java | 3 ++- .../algorithms/drmalgorithms/SmartSampleOnTable.java | 3 ++- .../gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java index 7ffa6a4..32c2faf 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -180,7 +181,7 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java index e8d176c..23b4d8d 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListDBInfo.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -199,7 +200,7 @@ public class ListDBInfo extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.java index 1c488fd..ec05c94 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListNames.java @@ -3,6 +3,7 @@ package org.gcube.dataaccess.algorithms.drmalgorithms; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -145,7 +146,7 @@ public class ListNames extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java index 5018c34..e99f93c 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -196,7 +197,7 @@ public class ListSchemas extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java index c0fbc3f..34ca001 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -236,7 +237,7 @@ public class ListTables extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java index 171532d..81bfe00 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -162,7 +163,7 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { "In RandomSampleOnTable->retrieving outputs"); // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java index 4a902b5..7d9987a 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -161,7 +162,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java index ea412cb..4c6ee25 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -161,7 +162,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java index e019817..150a686 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.UUID; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.lexicalmatcher.utils.AnalysisLogger; @@ -172,7 +173,7 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { AnalysisLogger.getLogger().debug("In SubmitQuery->retrieving outputs"); // generate a primitive type for the collection PrimitiveType output = new PrimitiveType(LinkedHashMap.class.getName(), - map, PrimitiveTypes.MAP, "ResultsMap", "Results Map"); + map, PrimitiveTypes.MAP, "ResultsMap"+UUID.randomUUID(), "Results Map"); return output; }