Fixes for failing scheduler tests

polypheny · Dec 12, 2024 · 86b9743 · 86b9743
1 parent 3224ca0
commit 86b9743
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 30 deletions.
diff --git a/core/src/main/java/org/polypheny/db/rex/RexLiteral.java b/core/src/main/java/org/polypheny/db/rex/RexLiteral.java
@@ -424,15 +424,15 @@ private static void printAsJava( PolyValue value, PrintWriter pw, PolyType typeN
                 pw.print( value.asBoolean().value );
                 break;
             case DECIMAL:
-                assert value.isBigDecimal();
+                assert value.isNumber();
                 pw.print( value.asBigDecimal().value );
                 break;
             case DOUBLE:
                 assert value.isNumber();
                 pw.print( Util.toScientificNotation( value.asNumber().BigDecimalValue() ) );
                 break;
             case BIGINT:
-                assert value.isBigDecimal();
+                assert value.isNumber();
                 pw.print( value.asNumber().bigDecimalValue() );
                 pw.print( 'L' );
                 break;

diff --git a/...adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/rel2sql/SqlImplementor.java b/...adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/rel2sql/SqlImplementor.java
@@ -517,9 +517,9 @@ public SqlNode toSql( RexProgram program, RexNode rex ) {
                             return SqlLiteral.createCharString( literal.value.asString().value, POS );
                         case NUMERIC:
                         case EXACT_NUMERIC:
-                            return SqlLiteral.createExactNumeric( literal.value.asBigDecimal().value.toString(), POS );
+                            return SqlLiteral.createExactNumeric( literal.value.asNumber().bigDecimalValue().toString(), POS );
                         case APPROXIMATE_NUMERIC:
-                            return SqlLiteral.createApproxNumeric( literal.value.asBigDecimal().value.toString(), POS );
+                            return SqlLiteral.createApproxNumeric( literal.value.asNumber().bigDecimalValue().toString(), POS );
                         case BOOLEAN:
                             return SqlLiteral.createBoolean( literal.value.asBoolean().value, POS );
                         case INTERVAL_YEAR_MONTH:

diff --git a/plugins/workflow-engine/src/main/java/org/polypheny/db/workflow/dag/WorkflowImpl.java b/plugins/workflow-engine/src/main/java/org/polypheny/db/workflow/dag/WorkflowImpl.java
@@ -387,4 +387,16 @@ public void validateStructure( StorageManager sm, AttributedDirectedGraph<UUID,
 
     }
 
+
+    @Override
+    public String toString() {
+        return "WorkflowImpl{" +
+                "\n    activities=" + getActivities() +
+                ", \n    edges=" + getEdges() +
+                ", \n    config=" + config +
+                ", \n    state=" + state +
+                ", \n    variables=" + variables +
+                "\n}";
+    }
+
 }
diff --git a/plugins/workflow-engine/src/main/java/org/polypheny/db/workflow/dag/edges/ControlEdge.java b/plugins/workflow-engine/src/main/java/org/polypheny/db/workflow/dag/edges/ControlEdge.java
@@ -68,6 +68,7 @@ public String toString() {
                 ", isIgnored=" + isIgnored +
                 ", from=" + from +
                 ", to=" + to +
+                ", edgeState=" + getState() +
                 '}';
     }
 

diff --git a/plugins/workflow-engine/src/main/java/org/polypheny/db/workflow/dag/edges/DataEdge.java b/plugins/workflow-engine/src/main/java/org/polypheny/db/workflow/dag/edges/DataEdge.java
@@ -69,6 +69,7 @@ public String toString() {
                 ", toPort=" + toPort +
                 ", from=" + from +
                 ", to=" + to +
+                ", edgeState=" + getState() +
                 '}';
     }
 

diff --git a/...ow-engine/src/main/java/org/polypheny/db/workflow/engine/scheduler/WorkflowScheduler.java b/...ow-engine/src/main/java/org/polypheny/db/workflow/engine/scheduler/WorkflowScheduler.java
@@ -301,7 +301,7 @@ private void updateGraph( boolean isSuccess, Set<UUID> activities, UUID rootId,
                 Edge edge = workflow.getEdge( execEdge );
                 if ( activities.contains( execEdge.getTarget() ) ) {
                     edge.setState( isSuccess ? EdgeState.ACTIVE : EdgeState.INACTIVE );
-                } else {
+                } else if ( !(isInitialUpdate && edge.getTo().getState() == ActivityState.SAVED) ) { // already saved target activities do not have to be updated again
                     assert edge.isIgnored() || !edge.getTo().getState().isExecuted() :
                             "Encountered an activity that was executed before its predecessors: " + edge.getTo();
 

diff --git a/...ngine/src/main/java/org/polypheny/db/workflow/engine/storage/reader/CheckpointReader.java b/...ngine/src/main/java/org/polypheny/db/workflow/engine/storage/reader/CheckpointReader.java
@@ -22,7 +22,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import org.jetbrains.annotations.NotNull;
 import org.polypheny.db.algebra.AlgNode;
 import org.polypheny.db.algebra.AlgRoot;
 import org.polypheny.db.algebra.type.AlgDataType;
@@ -83,13 +82,7 @@ public final Iterator<List<PolyValue>> getIterator() {
      * @return An iterable that yields tuples as mutable lists.
      */
     public final Iterable<List<PolyValue>> getIterable() {
-        return new Iterable<>() {
-            @NotNull
-            @Override
-            public Iterator<List<PolyValue>> iterator() {
-                return getIterator();
-            }
-        };
+        return this::getIterator;
     }
 
 
@@ -126,14 +119,7 @@ public Pair<AlgDataType, Iterator<List<PolyValue>>> getIteratorFromQuery( Checkp
      */
     public Pair<AlgDataType, Iterable<List<PolyValue>>> getIterableFromQuery( CheckpointQuery query ) {
         Pair<AlgDataType, Iterator<List<PolyValue>>> pair = getIteratorFromQuery( query, List.of( this ) );
-        return Pair.of( pair.left,
-                new Iterable<>() {
-                    @NotNull
-                    @Override
-                    public Iterator<List<PolyValue>> iterator() {
-                        return pair.right;
-                    }
-                } );
+        return Pair.of( pair.left, () -> pair.right );
     }
 
 
@@ -204,6 +190,7 @@ public Pair<AlgDataType, Iterator<List<PolyValue>>> getIteratorFromQuery( Checkp
                 .query( queryStr )
                 .language( QueryLanguage.from( query.getQueryLanguage() ) )
                 .isAnalysed( false )
+                .batch( 100 ) // TODO: ensure this has the desired effect, then change to suitable value
                 .origin( StorageManager.ORIGIN )
                 .namespaceId( entity.getNamespaceId() )
                 .transactionManager( transaction.getTransactionManager() )
@@ -241,13 +228,7 @@ public Pair<AlgDataType, Iterator<List<PolyValue>>> getIteratorFromQuery( Checkp
     public Pair<AlgDataType, Iterable<List<PolyValue>>> getIterableFromQuery( CheckpointQuery query, List<CheckpointReader> inputs ) {
         Pair<AlgDataType, Iterator<List<PolyValue>>> pair = getIteratorFromQuery( query, inputs );
         return Pair.of( pair.left,
-                new Iterable<>() {
-                    @NotNull
-                    @Override
-                    public Iterator<List<PolyValue>> iterator() {
-                        return pair.right;
-                    }
-                } );
+                () -> pair.right );
     }
 
 

diff --git a/...-engine/src/test/java/org/polypheny/db/workflow/engine/scheduler/GlobalSchedulerTest.java b/...-engine/src/test/java/org/polypheny/db/workflow/engine/scheduler/GlobalSchedulerTest.java
@@ -132,7 +132,6 @@ void executeWorkflowInStepsTest() throws Exception {
 
 
     @Test
-    @Disabled
     void simpleFusionTest() throws Exception {
         Workflow workflow = WorkflowUtils.getSimpleFusion();
         List<UUID> ids = WorkflowUtils.getTopologicalActivityIds( workflow );
@@ -161,7 +160,6 @@ void advancedFusionTest() throws Exception {
 
 
     @Test
-    @Disabled
     void RelValuesFusionTest() throws Exception {
         Workflow workflow = WorkflowUtils.getRelValuesFusion();
         List<UUID> ids = WorkflowUtils.getTopologicalActivityIds( workflow );