added some exceptions for textual alg representation

polypheny · Dec 11, 2024 · 6238f74 · 6238f74
1 parent 4e1f61b
commit 6238f74
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/dbms/src/main/java/org/polypheny/db/processing/AbstractQueryProcessor.java b/dbms/src/main/java/org/polypheny/db/processing/AbstractQueryProcessor.java
@@ -277,7 +277,11 @@ private void attachPolyAlgPlan( AlgNode alg ) {
             InformationPolyAlg infoPolyAlg = new InformationPolyAlg( group, jsonString, PlanType.LOGICAL );
             if ( shouldAttachTextualPolyAlg() ) {
                 // when testing, we want to access the human-readable form
-                infoPolyAlg.setTextualPolyAlg( alg.buildPolyAlgebra( (String) null ) );
+                String serialized = alg.buildPolyAlgebra( (String) null );
+                if ( serialized == null ) {
+                    throw new GenericRuntimeException( "Could not serialize PolyAlgebra" );
+                }
+                infoPolyAlg.setTextualPolyAlg( serialized );
             }
 
             queryAnalyzer.registerInformation( infoPolyAlg );

diff --git a/dbms/src/main/java/org/polypheny/db/routing/UiRoutingPageUtil.java b/dbms/src/main/java/org/polypheny/db/routing/UiRoutingPageUtil.java
@@ -125,7 +125,11 @@ private static void addRoutedPolyPlanPage( AlgNode routedNode, InformationManage
         queryAnalyzer.addGroup( group );
         InformationPolyAlg infoPolyAlg = new InformationPolyAlg( group, jsonString, isPhysical ? PlanType.PHYSICAL : PlanType.ALLOCATION );
         if ( attachTextualPlan ) {
-            infoPolyAlg.setTextualPolyAlg( routedNode.buildPolyAlgebra( (String) null ) );
+            String serialized = routedNode.buildPolyAlgebra( (String) null );
+            if ( serialized == null ) {
+                throw new GenericRuntimeException( "Unable to serialize routing plan" );
+            }
+            infoPolyAlg.setTextualPolyAlg( serialized );
         }
         queryAnalyzer.registerInformation( infoPolyAlg );
     }

diff --git a/dbms/src/test/java/org/polypheny/db/polyalg/PolyAlgParsingTest.java b/dbms/src/test/java/org/polypheny/db/polyalg/PolyAlgParsingTest.java
@@ -79,12 +79,12 @@ public class PolyAlgParsingTest {
     private static final String GRAPH_NAME = "polyAlgGraph";
     private static final String DOC_NAME = MqlTestTemplate.namespace;
     private static final String DOC_COLL = "polyalgdocs";
-    private static TestHelper testHelper;
 
 
     @BeforeAll
     public static void start() throws SQLException {
-        testHelper = TestHelper.getInstance();
+        //noinspection ResultOfMethodCallIgnored
+        TestHelper.getInstance();
         addTestData();
 
     }
@@ -197,7 +197,7 @@ private static void testQueryRoundTrip( String query, QueryLanguage ql, String n
             }
 
             for ( Information info : transaction.getQueryAnalyzer().getInformationArray() ) {
-                if ( info instanceof InformationPolyAlg polyInfo ) {
+                if ( info instanceof InformationPolyAlg polyInfo && polyInfo.getTextualPolyAlg() != null ) {
                     switch ( PlanType.valueOf( polyInfo.planType ) ) {
                         case LOGICAL -> logical = polyInfo.getTextualPolyAlg();
                         case ALLOCATION -> allocation = polyInfo.getTextualPolyAlg();