From 441aee5ecdef8ada138f34b2c1c4a3879303207b Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Fri, 28 Nov 2014 11:58:08 +0000 Subject: [PATCH] RandomSampleOnTable, SampleOnTable, SmartSampleOnTable and SubmitQuery algorithms modified in order to manage the file as output. pom file version modified in 1.3.0. git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManagerAlgorithms@101767 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../drmalgorithms/RandomSampleOnTable.java | 8 +++--- .../drmalgorithms/SampleOnTable.java | 10 ++++---- .../drmalgorithms/SmartSampleOnTable.java | 8 +++--- .../algorithms/drmalgorithms/SubmitQuery.java | 2 +- .../RegressionRandomSampleOnTable.java | 19 ++++++++------ .../RegressionSampleOnTable.java | 25 +++++++++++-------- .../RegressionSmartSampleOnTable.java | 20 ++++++++------- .../regressiontest/RegressionSubmitQuery.java | 22 ++++++++++------ .../RegressionTableDetails.java | 22 +++++++++------- 10 files changed, 79 insertions(+), 59 deletions(-) diff --git a/pom.xml b/pom.xml index fec515f..140c325 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.dataaccess.algorithms database-rm-algorithms - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT DatabasesResourcesManagerAlgorithms Databases Resources Manager Algorithms 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 c229ace..abc1e54 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java @@ -399,10 +399,10 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { } // to add the file - // PrimitiveType fileResult = new PrimitiveType(File.class.getName(), - // mgt.getFileSampleTableResult(), PrimitiveTypes.FILE, "File", - // "File"); - // mapResults.put("File", fileResult); + PrimitiveType fileResult = new PrimitiveType(File.class.getName(), + mgt.getFile(), PrimitiveTypes.FILE, "File", + "File"); + mapResults.put("File", fileResult); return mapResults; 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 8c0052e..4c4baf7 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java @@ -395,11 +395,11 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { } -// // to add the file -// PrimitiveType fileResult = new PrimitiveType(File.class.getName(), -// mgt.getFileSampleTableResult(), PrimitiveTypes.FILE, "File", -// "File"); -// mapResults.put("File", fileResult); + // to add the file + PrimitiveType fileResult = new PrimitiveType(File.class.getName(), + mgt.getFile(), PrimitiveTypes.FILE, "File", + "File"); + mapResults.put("File", fileResult); return mapResults; 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 e70f2b2..0ac0d37 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java @@ -399,10 +399,10 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { } // to add the file -// PrimitiveType fileResult = new PrimitiveType(File.class.getName(), -// mgt.getFileSampleTableResult(), PrimitiveTypes.FILE, "File", -// "File"); -// mapResults.put("File", fileResult); + PrimitiveType fileResult = new PrimitiveType(File.class.getName(), + mgt.getFile(), PrimitiveTypes.FILE, "File", + "File"); + mapResults.put("File", fileResult); return mapResults; } 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 f2104d3..f7d2f8e 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java @@ -611,7 +611,7 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // to add the file PrimitiveType fileResult = new PrimitiveType(File.class.getName(), - mgt.getFileQueryResult(), PrimitiveTypes.FILE, "File", + mgt.getFile(), PrimitiveTypes.FILE, "File", "File"); mapResults.put("File", fileResult); } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionRandomSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionRandomSampleOnTable.java index 990fc7f..519f610 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionRandomSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionRandomSampleOnTable.java @@ -19,7 +19,7 @@ public class RegressionRandomSampleOnTable { // "Mysql2", "NullInputValue1", "NullInputValue2", "NullInputValue3", // "NullInputValue4"}; - static AlgorithmConfiguration[] configs = { testPostgres1() }; + static AlgorithmConfiguration[] configs = { testMysql1() }; static String[] algorithms = { "Postgres1" }; public static void main(String[] args) throws Exception { @@ -102,16 +102,18 @@ public class RegressionRandomSampleOnTable { //// config.setParam("TableName", "hspec_suitable_peng_test_tbsp_1"); // config.setParam("TableName", "hspen"); - config.setParam("ResourceName", "Geoserver database "); - config.setParam("DatabaseName", "aquamapsdb"); - config.setParam("SchemaName", "public"); - config.setParam("TableName", "SeaVoX_sea_areas_polygons_v14"); +// config.setParam("ResourceName", "Geoserver database "); +// config.setParam("DatabaseName", "aquamapsdb"); +// config.setParam("SchemaName", "public"); +// config.setParam("TableName", "SeaVoX_sea_areas_polygons_v14"); // Obis -// config.setParam("ResourceName", "Obis2Repository"); -// config.setParam("DatabaseName", "obis"); + config.setParam("ResourceName", "Obis2Repository"); + config.setParam("DatabaseName", "obis"); // config.setParam("SchemaName", "calc"); // config.setParam("TableName", "map1d"); + config.setParam("SchemaName", "newd20110525"); + config.setParam("TableName", "edc"); // config.setParam("Query", "select * from area limit 3"); @@ -159,9 +161,10 @@ public class RegressionRandomSampleOnTable { // A test with a database mysql config.setParam("ResourceName", "CatalogOfLife2010"); config.setParam("DatabaseName", "col2oct2010"); + config.setParam("TableName", "common_names"); // config.setParam("TableName", "Common_names"); // mysql is not case // sensitive - config.setParam("TableName", "databases"); +// config.setParam("TableName", "databases"); // config.setParam("TableName", "simple_search"); config.setGcubeScope("/gcube/devsec"); diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSampleOnTable.java index 8e96204..d5f1848 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSampleOnTable.java @@ -15,7 +15,7 @@ public class RegressionSampleOnTable { // static String[] algorithms = { "Postgres1", "Postgis", "Mysql1", "Mysql2", "NullInputValue1", "NullInputValue2", "NullInputValue3", "NullInputValue4"}; - static AlgorithmConfiguration[] configs = { testPostgres1()}; + static AlgorithmConfiguration[] configs = { testMysql1()}; static String[] algorithms = { "Postgres1"}; @@ -52,12 +52,12 @@ public class RegressionSampleOnTable { config.setAgent("SAMPLEONTABLE"); -// config.setParam("ResourceName", "Geoserver database "); -// config.setParam("DatabaseName", "aquamapsdb"); -// config.setParam("SchemaName", "public"); + config.setParam("ResourceName", "Geoserver database "); + config.setParam("DatabaseName", "aquamapsdb"); + config.setParam("SchemaName", "public"); // config.setParam("TableName", "biodiversity"); -// config.setParam("TableName", "SeaVoX_sea_areas_polygons_v14"); + config.setParam("TableName", "SeaVoX_sea_areas_polygons_v14"); // config.setParam("TableName", ""); // A test with a database postgres Geoserver @@ -80,10 +80,10 @@ public class RegressionSampleOnTable { // config.setParam("SchemaName", "public"); // config.setParam("TableNamefcatalog", "countrylanguage"); //mysql is not case sensitive - config.setParam("ResourceName", "AquaMaps Service DataBase"); - config.setParam("DatabaseName", "aquamapsorgupdated"); - config.setParam("SchemaName", "public"); - config.setParam("TableName", "speciesoccursum"); +// config.setParam("ResourceName", "AquaMaps Service DataBase"); +// config.setParam("DatabaseName", "aquamapsorgupdated"); +// config.setParam("SchemaName", "public"); +// config.setParam("TableName", "speciesoccursum"); //// config.setParam("TableName", "hspec2012_07_11_12_33_05_526"); // config.setParam("TableName", "hspen"); @@ -102,7 +102,12 @@ public class RegressionSampleOnTable { // config.setParam("SchemaName", "calc"); // config.setParam("TableName", "map1d"); - + //Obis +// config.setParam("ResourceName", "Obis2Repository"); +// config.setParam("DatabaseName", "obis"); +// config.setParam("SchemaName", "newd20110525"); +//// config.setParam("TableName", "map1d"); +// config.setParam("TableName", "edc"); config.setGcubeScope("/gcube/devsec"); diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSmartSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSmartSampleOnTable.java index 3cd26ad..15d9dd4 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSmartSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSmartSampleOnTable.java @@ -101,10 +101,10 @@ public class RegressionSmartSampleOnTable { //// config.setParam("TableName", "hspec2012_07_11_12_33_05_526"); // config.setParam("TableName", "hspen"); - config.setParam("ResourceName", "Geoserver database "); - config.setParam("DatabaseName", "aquamapsdb"); - config.setParam("SchemaName", "public"); - config.setParam("TableName", "SeaVoX_sea_areas_polygons_v14"); +// config.setParam("ResourceName", "Geoserver database "); +// config.setParam("DatabaseName", "aquamapsdb"); +// config.setParam("SchemaName", "public"); +// config.setParam("TableName", "SeaVoX_sea_areas_polygons_v14"); ////// config.setParam("TableName", "hspec2012_07_11_12_33_05_483"); @@ -128,9 +128,11 @@ public class RegressionSmartSampleOnTable { ////// config.setParam("TableName", "hspec_id_3f4c79fa_442e_42ba_9344_1b3e64dc3326"); //Obis -// config.setParam("ResourceName", "Obis2Repository"); -// config.setParam("DatabaseName", "obis"); -// config.setParam("SchemaName", "calc"); + config.setParam("ResourceName", "Obis2Repository"); + config.setParam("DatabaseName", "obis"); + config.setParam("SchemaName", "newd20110525"); +// config.setParam("TableName", "map1d"); + config.setParam("TableName", "_positions1"); // config.setParam("TableName", "map1d"); config.setGcubeScope("/gcube/devsec"); @@ -170,10 +172,10 @@ public class RegressionSmartSampleOnTable { // A test with a database mysql config.setParam("ResourceName", "CatalogOfLife2010"); config.setParam("DatabaseName", "col2oct2010"); -// config.setParam("TableName", "Common_names"); //mysql is not case sensitive + config.setParam("TableName", "common_names"); //mysql is not case sensitive // config.setParam("TableName", "databases"); // config.setParam("TableName", "simple_search"); - config.setParam("TableName", "scientific_names"); +// config.setParam("TableName", "scientific_names"); diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSubmitQuery.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSubmitQuery.java index 71914d8..14d3a0b 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSubmitQuery.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionSubmitQuery.java @@ -55,11 +55,16 @@ public class RegressionSubmitQuery { config.setAgent("LISTSUBMITQUERY"); - // A test with a database postgres +// // A test with a database postgres // config.setParam("ResourceName", "StatisticalManagerDataBase"); // config.setParam("DatabaseName", "testdb"); -//// config.setParam("", "TRUE"); -// config.setParam("Read-Only Query", "FALSE"); +////// config.setParam("", "TRUE"); +// config.setParam("Read-Only Query", "true"); +// config.setParam("Apply Smart Correction", "FALSE"); +// config.setParam("Language", "NONE"); +//// config.setParam("Query", "DELETE from test_gsay_03217cfda4244870b4d11f9e0eca58fe"); +// config.setParam("Query", "select * from hcaf_d limit 20"); + // config.setParam("Apply Smart Correction", "TRUE"); // config.setParam("Language", "POSTGRES"); @@ -111,14 +116,15 @@ public class RegressionSubmitQuery { // config.setParam("TableName", "all_world"); // config.setParam("TableName", "biodiversity_lme"); - //Obis +// //Obis // config.setParam("ResourceName", "Obis2Repository"); // config.setParam("DatabaseName", "obis"); -// config.setParam("Read-Only Query", "TRUE"); +// config.setParam("Read-Only Query", "trie"); // config.setParam("Apply Smart Correction", "FALSE"); // config.setParam("Language", "NONE"); //// config.setParam("Query", "select id from fmap.randomdrs limit 1"); -// config.setParam("Query", "select lifestage from randomdrs"); +//// config.setParam("Query", "select lifestage from randomdrs"); +// config.setParam("Query", "select * from newd20110525."+"\""+"edc"+ "\""+" where id='76864082'"); // config.setParam("ResourceName", "AquaMaps Service DataBase"); @@ -140,10 +146,10 @@ public class RegressionSubmitQuery { config.setParam("ResourceName", "Geoserver database "); config.setParam("DatabaseName", "aquamapsdb"); config.setParam("SchemaName", "public"); - config.setParam("Read-Only Query", "TRUE"); + config.setParam("Read-Only Query", "true"); config.setParam("Apply Smart Correction", "FALSE"); config.setParam("Language", "NONE"); - config.setParam("Query", "select * from" +"\""+"SeaVoX_sea_areas_polygons_v14"+"\""+"limit 10"); + config.setParam("Query", "select st_astext(the_geom) from" +"\""+"SeaVoX_sea_areas_polygons_v14"+"\""+"limit 1"); // config.setParam("Query", "select * from public.depthmean limit 10"); diff --git a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionTableDetails.java b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionTableDetails.java index 5ab4bc4..66d7901 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionTableDetails.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/test/regressiontest/RegressionTableDetails.java @@ -18,7 +18,7 @@ public class RegressionTableDetails { // testPostgres2(), testPostgis(), Mysql(), NullInputValue(), Postgres3()}; static String[] algorithms = { "Postgres1" }; - static AlgorithmConfiguration[] configs = { Mysql() }; + static AlgorithmConfiguration[] configs = { testPostgis() }; public static void main(String[] args) throws Exception { @@ -84,17 +84,20 @@ public class RegressionTableDetails { // config.setParam("TableName", // "hspec_id_3f4c79fa_442e_42ba_9344_1b3e64dc3326"); - // config.setParam("ResourceName", "AquaMaps Service DataBase"); - // config.setParam("DatabaseName", "aquamapsorgupdated"); - // config.setParam("SchemaName", "public"); + //AquaMaps + config.setParam("ResourceName", "AquaMaps Service DataBase"); + config.setParam("DatabaseName", "aquamapsorgupdated"); + config.setParam("SchemaName", "public"); +// config.setParam("TableName", "geometry_columns"); + config.setParam("TableName", "source_generation_requests"); // //// config.setParam("TableName", "hspec2012_07_11_12_33_05_483"); // config.setParam("TableName", "hspec_suitable_peng_test_tbsp_1"); // Obis - config.setParam("ResourceName", "Obis2Repository"); - config.setParam("DatabaseName", "obis"); - config.setParam("SchemaName", "calc"); - config.setParam("TableName", "map1d"); +// config.setParam("ResourceName", "Obis2Repository"); +// config.setParam("DatabaseName", "obis"); +// config.setParam("SchemaName", "calc"); +// config.setParam("TableName", "map1d"); config.setGcubeScope("/gcube/devsec"); @@ -141,7 +144,8 @@ public class RegressionTableDetails { // config.setParam("TableName", "Divisions"); // config.setParam("TableName", "ContinentalMargins"); - config.setParam("TableName", "SeaVoX_sea_areas_polygons_v14"); +// config.setParam("TableName", "SeaVoX_sea_areas_polygons_v14"); + config.setParam("TableName", "laldrovandiaoleosa20130718230308233cest "); config.setGcubeScope("/gcube/devsec");