#3588 fix: address code review feedback

robfrank · claude · robfrank · commit 2ca180b302bc · 2026-03-07T18:01:07.000+01:00
- Guard streamPaged against non-SQL languages (falls back to CURSOR mode)
- Use langOrDefault() in client query/queryStream to prevent NPE on null language
- Extract langOrDefault() helper on server side to deduplicate language defaulting
- Add streaming query e2e tests for SQL and OpenCypher

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/e2e/src/test/java/com/arcadedb/e2e/RemoteGrpcDatabaseTest.java b/e2e/src/test/java/com/arcadedb/e2e/RemoteGrpcDatabaseTest.java
@@ -75,4 +75,16 @@ void simpleOpenCypherQuery() {
     }, false, 10);
   }
 
+  @Test
+  void streamQueryWithSQL() {
+    final ResultSet result = database.queryStream("sql", "select * from Beer limit 10");
+    assertThat(CollectionUtils.countEntries(result)).isEqualTo(10);
+  }
+
+  @Test
+  void streamQueryWithOpenCypher() {
+    final ResultSet result = database.queryStream("opencypher", "MATCH(p:Beer) RETURN p LIMIT 10");
+    assertThat(CollectionUtils.countEntries(result)).isEqualTo(10);
+  }
+
 }
diff --git a/grpc-client/src/main/java/com/arcadedb/remote/grpc/RemoteGrpcDatabase.java b/grpc-client/src/main/java/com/arcadedb/remote/grpc/RemoteGrpcDatabase.java
@@ -556,7 +556,7 @@ public ResultSet query(final String language, final String query, RemoteGrpcConf
     ExecuteQueryRequest.Builder requestBuilder = ExecuteQueryRequest.newBuilder()
         .setDatabase(getName())
         .setQuery(query)
-        .setLanguage(language)
+        .setLanguage(langOrDefault(language))
         .setCredentials(buildCredentials());
 
     if (transactionId != null) {
@@ -779,7 +779,7 @@ public ResultSet queryStream(final String language, final String query, final Re
     stats.queries.incrementAndGet();
 
     StreamQueryRequest.Builder b = StreamQueryRequest.newBuilder().setDatabase(getName()).setQuery(query)
-        .setLanguage(language)
+        .setLanguage(langOrDefault(language))
         .setCredentials(buildCredentials())
         .setBatchSize(batchSize > 0 ? batchSize : 100).setRetrievalMode(mode);
 
diff --git a/grpcw/src/main/java/com/arcadedb/server/grpc/ArcadeDbGrpcService.java b/grpcw/src/main/java/com/arcadedb/server/grpc/ArcadeDbGrpcService.java
@@ -252,8 +252,7 @@ private ExecuteCommandResponse executeCommandInternal(ExecuteCommandRequest req,
     try {
       final Map<String, Object> params = GrpcTypeConverter.convertParameters(req.getParametersMap());
 
-      // Language defaults to "sql" when empty
-      final String language = (req.getLanguage() == null || req.getLanguage().isEmpty()) ? "sql" : req.getLanguage();
+      final String language = langOrDefault(req.getLanguage());
 
       // Transaction: begin if requested
       final boolean hasTx = req.hasTransaction();
@@ -818,7 +817,7 @@ public void executeQuery(ExecuteQueryRequest request, StreamObserver<ExecuteQuer
       // Execute the query
       long startTime = System.currentTimeMillis();
 
-      final String language = (request.getLanguage() == null || request.getLanguage().isEmpty()) ? "sql" : request.getLanguage();
+      final String language = langOrDefault(request.getLanguage());
 
       LogManager.instance().log(this, Level.FINE, "executeQuery(): language = %s query = %s", language, request.getQuery());
 
@@ -1107,12 +1106,18 @@ public void streamQuery(StreamQueryRequest request, StreamObserver<QueryResult>
         beganHere = true;
       }
 
-      final String language = (request.getLanguage() == null || request.getLanguage().isEmpty()) ? "sql" : request.getLanguage();
+      final String language = langOrDefault(request.getLanguage());
 
       // --- Dispatch on mode (helpers do NOT manage transactions) ---
+      // PAGED mode uses SQL-specific SKIP/LIMIT wrapping, so fall back to CURSOR for non-SQL languages
       switch (request.getRetrievalMode()) {
         case MATERIALIZE_ALL -> streamMaterialized(db, request, batchSize, scso, cancelled, projectionConfig, language);
-        case PAGED -> streamPaged(db, request, batchSize, scso, cancelled, projectionConfig, language);
+        case PAGED -> {
+          if (!"sql".equalsIgnoreCase(language))
+            streamCursor(db, request, batchSize, scso, cancelled, projectionConfig, language);
+          else
+            streamPaged(db, request, batchSize, scso, cancelled, projectionConfig, language);
+        }
         case CURSOR -> streamCursor(db, request, batchSize, scso, cancelled, projectionConfig, language);
         default -> streamCursor(db, request, batchSize, scso, cancelled, projectionConfig, language);
       }
@@ -3067,6 +3072,10 @@ private String generateTransactionId() {
     return "tx_" + System.nanoTime();
   }
 
+  private static String langOrDefault(String language) {
+    return (language == null || language.isEmpty()) ? "sql" : language;
+  }
+
   // ---- Debug helpers ----
   private static String summarizeJava(Object o) {
     if (o == null)
