Handle missing build string with more resilience

SAP · Sep 20, 2023 · 7f55f78 · 7f55f78
1 parent 6abcf64
commit 7f55f78
Showing 1 changed file with 28 additions and 4 deletions.
diff --git a/src/main/java/org/sap/cytoscape/internal/hdb/HanaConnectionManager.java b/src/main/java/org/sap/cytoscape/internal/hdb/HanaConnectionManager.java
@@ -299,17 +299,41 @@ public List<HanaDbObject> listGraphWorkspaces() throws SQLException {
      */
     private void loadWorkspaceMetadata(HanaGraphWorkspace graphWorkspace) throws SQLException, HanaConnectionManagerException {
 
-        String propName="LOAD_WORKSPACE_METADATA_HANA_" +
-                (isCloudEdition(this.buildVersion)? "CLOUD":"ONPREM");
+        Boolean isCloud = isCloudEdition(this.buildVersion);
+        String propName="LOAD_WORKSPACE_METADATA_HANA_" + (isCloud ? "CLOUD":"ONPREM");
 
-        debug("Reading graph metadata with "+propName);
-        HanaQueryResult wsMetadata = this.executeQueryList(
+        debug("Reading graph metadata with " + propName);
+        HanaQueryResult wsMetadata = null;
+
+        try{
+            wsMetadata = this.executeQueryList(
+                    this.sqlStrings.getProperty(propName),
+                    new HanaSqlParameter[]{
+                            new HanaSqlParameter(graphWorkspace.getWorkspaceDbObject().schema, Types.VARCHAR),
+                            new HanaSqlParameter(graphWorkspace.getWorkspaceDbObject().name, Types.VARCHAR)
+                    }
+            );
+        } catch (Exception e) {
+            // some rare systems (pre-releases!?) do not return build strings. To act more resilient in those cases,
+            // we try both workspace structures and only fail if the graph could not be loaded with both available
+            // approaches.
+
+            // Show warning to notify user:
+            warn("Could not load graph workspace after assuming " + (isCloud ? "Cloud" : "On-Premise") + " Edition of SAP HANA.");
+            warn("Re-trying operation with " + (isCloud ? "On-Premise" : "Cloud") + " Edition.");
+
+            // Swap on-prem to cloud and vice versa:
+            propName="LOAD_WORKSPACE_METADATA_HANA_" + (isCloud ? "ONPREM":"CLOUD");
+
+            // Try again:
+            wsMetadata = this.executeQueryList(
                     this.sqlStrings.getProperty(propName),
                     new HanaSqlParameter[]{
                             new HanaSqlParameter(graphWorkspace.getWorkspaceDbObject().schema, Types.VARCHAR),
                             new HanaSqlParameter(graphWorkspace.getWorkspaceDbObject().name, Types.VARCHAR)
                     }
             );
+        }
 
         for(Object[] row : wsMetadata.getRecordList()){
             // Types will be set when retrieving actual data