gCubeSystem
/
smart-executor
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed query to improve result

This commit is contained in:
Luca Frosini 2019-09-20 16:45:41 +02:00
parent 0f10b1a5d7
commit 98768688a0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/gcube/vremanagement/executor/persistence/orientdb/OrientDBPersistenceConnector.java
View File

@ -83,7 +83,7 @@ public class OrientDBPersistenceConnector extends
params.put(SCOPE, SmartExecutorInitializator.getCurrentScope());
OSQLSynchQuery<ODocument> query = null;
if (iterationNumber != null) {
if (iterationNumber != null && iterationNumber > 0) {
query = new OSQLSynchQuery<ODocument>(
String.format(
"SELECT FROM %s WHERE %s = :%s AND %s = :%s AND %s = :%s ORDER BY %s DESC LIMIT 1",
@ -91,14 +91,22 @@ public class OrientDBPersistenceConnector extends
ITERATION, TIMESTAMP));
params.put(ITERATION, iterationNumber);
} else {
/*
query = new OSQLSynchQuery<ODocument>(
String.format(
"SELECT FROM %s WHERE %s = :%s AND %s = :%s ORDER BY %s DESC",
type, SCOPE, SCOPE, UUID, UUID, ITERATION));
*/
query = new OSQLSynchQuery<ODocument>(
String.format(
"SELECT FROM %s WHERE %s = :%s AND %s = :%s ORDER BY %s DESC, %s DESC LIMIT 1",
type, SCOPE, SCOPE, UUID, UUID, ITERATION, TIMESTAMP));
}
List<ODocument> result = query.execute(params);
ODocument resDoc = result.get(0);
/*
ODocument resDoc = null;
if (iterationNumber != null) {
@ -114,7 +122,8 @@ public class OrientDBPersistenceConnector extends
}
}
}
*/
String json = resDoc.toJSON("class");
PluginStateEvolution pluginStateEvolution = ObjectMapperManager.getObjectMapper().readValue(json,
PluginStateEvolution.class);