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 6798477..9e88bb5 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java @@ -23,6 +23,9 @@ import org.hibernate.HibernateException; /** Class that allows to retrieve some information about the chosen table */ public class GetTableDetails extends StandardLocalExternalAlgorithm { + private static final String ROWS_NUMBER = "Rows Number"; + private static final String NAME_OF_COLUMNS = "Name Of Columns"; + private static final String CREATE_TABLE_STATEMENT = "Create Table Statement"; private LinkedHashMap map = new LinkedHashMap(); // object that allows to manage some operations on a database private DatabaseManagement mgt; @@ -410,12 +413,13 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { createTable = mgt.getCreateTable(tableName, databaseName); } + PrimitiveType valCreateTable = new PrimitiveType( String.class.getName(), createTable, PrimitiveTypes.STRING, - "Create Table Statement", "Create Table Statement"); + CREATE_TABLE_STATEMENT, CREATE_TABLE_STATEMENT); - map.put("CreateTable", valCreateTable); + map.put(CREATE_TABLE_STATEMENT, valCreateTable); AnalysisLogger.getLogger().debug( "In GetTableDetails->getting the \"CreateTableStatement\": " @@ -443,9 +447,9 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { PrimitiveType valListColumnNamesTable = new PrimitiveType( String.class.getName(), ColumnName, PrimitiveTypes.STRING, - "Column Name", "Column Name"); + NAME_OF_COLUMNS, NAME_OF_COLUMNS); - map.put("Column Names", valListColumnNamesTable); + map.put(NAME_OF_COLUMNS, valListColumnNamesTable); AnalysisLogger.getLogger().debug( "In GetTableDetails->getting the column names list: " @@ -473,23 +477,14 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { } -// long rows = mgt.getNumberOfRows(tableName); - - // PrimitiveType valRows = new PrimitiveType( - // String.class.getName(), rows.toString(), - // PrimitiveTypes.STRING, "NumberRows", "Rows' Number"); - + PrimitiveType valRows = new PrimitiveType(String.class.getName(), - Long.toString(rows), PrimitiveTypes.STRING, "Number Rows", - "Rows' Number"); + Long.toString(rows), PrimitiveTypes.STRING, ROWS_NUMBER, + ROWS_NUMBER); - map.put("NumberRows", valRows); - - // AnalysisLogger - // .getLogger() - // .debug("In TableDetails->getting the number of rows: " + - // rows.toString()); + map.put(ROWS_NUMBER, valRows); + AnalysisLogger.getLogger().debug( "In GetTableDetails->getting the number of rows: " + Long.toString(rows)); 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 5b9d40f..27cc931 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java @@ -376,7 +376,7 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { // "In RandomSampleOnTable->string encoded: " + encoded); PrimitiveType val = new PrimitiveType(String.class.getName(), encoded, - PrimitiveTypes.STRING, "Row", "Row"); + PrimitiveTypes.STRING, "Row Header", "Row Header"); mapResults.put("HEADERS", val); for (int i = 0; i < mapResult.size() - 1; i++) { @@ -386,9 +386,9 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { // // check the encoded value // AnalysisLogger.getLogger().debug( // "In RandomSampleOnTable->string encoded: " + encoded); - + String row="Row "+Integer.toString(i+1); PrimitiveType val1 = new PrimitiveType(String.class.getName(), - encoded, PrimitiveTypes.STRING, "Row", "Row"); + encoded, PrimitiveTypes.STRING, row, row); mapResults.put(String.valueOf(i), val1); // //check value contained in map // String value = (String) val1.getContent(); 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 f252294..7189058 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java @@ -369,7 +369,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // "In SampleOnTable->string encoded: " + encoded); PrimitiveType val = new PrimitiveType(String.class.getName(), encoded, - PrimitiveTypes.STRING, "Row", "Row"); + PrimitiveTypes.STRING, "Row Header", "Row Header"); mapResults.put("HEADERS", val); for (int i = 0; i < mapResult.size() - 1; i++) { @@ -379,9 +379,10 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { // // check encoded value // AnalysisLogger.getLogger().debug( // "In SampleOnTable->string encoded: " + encoded); - + + String row="Row "+Integer.toString(i+1); PrimitiveType val1 = new PrimitiveType(String.class.getName(), - encoded, PrimitiveTypes.STRING, "Row", "Row"); + encoded, PrimitiveTypes.STRING, row, row); mapResults.put(String.valueOf(i), val1); // //check value contained in the map // String value = (String) val1.getContent(); 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 fc3d7f9..4fff4e7 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java @@ -375,7 +375,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // "In SmartSampleOnTable->string encoded: " + encoded); PrimitiveType val = new PrimitiveType(String.class.getName(), encoded, - PrimitiveTypes.STRING, "Row", "Row"); + PrimitiveTypes.STRING, "Row Header", "Row Header"); mapResults.put("HEADERS", val); for (int i = 0; i < mapResult.size() - 1; i++) { @@ -385,9 +385,9 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { // // check encoded value // AnalysisLogger.getLogger().debug( // "In SmartSampleOnTable->string encoded: " + encoded); - + String row="Row "+Integer.toString(i+1); PrimitiveType val1 = new PrimitiveType(String.class.getName(), - encoded, PrimitiveTypes.STRING, "Row", "Row"); + encoded, PrimitiveTypes.STRING, row, row); mapResults.put(String.valueOf(i), val1); // //check value // String value = (String) val1.getContent(); 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 66c1f2f..534069f 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SubmitQuery.java @@ -37,6 +37,9 @@ import com.adventnet.swissqlapi.sql.parser.ParseException; */ public class SubmitQuery extends StandardLocalExternalAlgorithm { + private static final String FILE = "File"; + private static final String TOTAL_ROWS = "Total Rows"; + static long maximum_execution_time = 30*60*1000; //time to stop execution query private LinkedHashMap map = new LinkedHashMap(); // object that allows to manage some operations on a database @@ -414,6 +417,7 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { String DatabaseUserName = iterator.next(); String DatabasePassword = iterator.next(); String DatabaseDriver = iterator.next(); + @SuppressWarnings("unused") String DatabaseDialect = iterator.next(); String DatabaseURL = iterator.next(); String DatabaseName = iterator.next(); @@ -583,7 +587,7 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // "In RandomSampleOnTable->string encoded: " + encoded); PrimitiveType val = new PrimitiveType(String.class.getName(), - encoded, PrimitiveTypes.STRING, "Row", "Row"); + encoded, PrimitiveTypes.STRING, "Row Header", "Row Header"); mapResults.put("HEADERS", val); @@ -595,9 +599,9 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // // check the encoded value // AnalysisLogger.getLogger().debug( // "In RandomSampleOnTable->string encoded: " + encoded); - + String row="Row "+Integer.toString(i+1); PrimitiveType val1 = new PrimitiveType(String.class.getName(), - encoded, PrimitiveTypes.STRING, "Row", "Row"); + encoded, PrimitiveTypes.STRING, row, row); mapResults.put(String.valueOf(i), val1); // //check value contained in map // String value = (String) val1.getContent(); @@ -609,15 +613,16 @@ public class SubmitQuery extends StandardLocalExternalAlgorithm { // to add the file PrimitiveType fileResult = new PrimitiveType(File.class.getName(), - mgt.getFile(), PrimitiveTypes.FILE, "File", - "File"); - mapResults.put("File", fileResult); + mgt.getFile(), PrimitiveTypes.FILE, FILE, + FILE); + mapResults.put(FILE, fileResult); + // //to add the number of total rows for a result of a submit query operation PrimitiveType totalRows = new PrimitiveType(String.class.getName(), - String.valueOf(mgt.getSubmitQueryTotalRows()), PrimitiveTypes.STRING, "Total Rows", - "Total Rows"); - mapResults.put("Total Rows", totalRows); + String.valueOf(mgt.getSubmitQueryTotalRows()), PrimitiveTypes.STRING, TOTAL_ROWS,TOTAL_ROWS + ); + mapResults.put(TOTAL_ROWS, totalRows); } return mapResults; diff --git a/target/apidocs/allclasses-frame.html b/target/apidocs/allclasses-frame.html index 0e3739b..9e7a82e 100644 --- a/target/apidocs/allclasses-frame.html +++ b/target/apidocs/allclasses-frame.html @@ -2,10 +2,10 @@ - + All Classes (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/allclasses-noframe.html b/target/apidocs/allclasses-noframe.html index 13c1e3f..6bc8ed8 100644 --- a/target/apidocs/allclasses-noframe.html +++ b/target/apidocs/allclasses-noframe.html @@ -2,10 +2,10 @@ - + All Classes (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/constant-values.html b/target/apidocs/constant-values.html index aa27cce..c9f3a7d 100644 --- a/target/apidocs/constant-values.html +++ b/target/apidocs/constant-values.html @@ -2,10 +2,10 @@ - + Constant Field Values (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/deprecated-list.html b/target/apidocs/deprecated-list.html index cb10087..70f87c8 100644 --- a/target/apidocs/deprecated-list.html +++ b/target/apidocs/deprecated-list.html @@ -2,10 +2,10 @@ - + Deprecated List (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/help-doc.html b/target/apidocs/help-doc.html index d25c3b5..0831cb8 100644 --- a/target/apidocs/help-doc.html +++ b/target/apidocs/help-doc.html @@ -2,10 +2,10 @@ - + API Help (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/index-all.html b/target/apidocs/index-all.html index d6828d3..e192c9b 100644 --- a/target/apidocs/index-all.html +++ b/target/apidocs/index-all.html @@ -2,10 +2,10 @@ - + Index (DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API) - + diff --git a/target/apidocs/index.html b/target/apidocs/index.html index 2f4f995..a914af9 100644 --- a/target/apidocs/index.html +++ b/target/apidocs/index.html @@ -2,7 +2,7 @@ - + DatabasesResourcesManagerAlgorithms 1.4.0-SNAPSHOT API