fix: supported SQL size() on records #1855 (#1856)

ArcadeData · Dec 7, 2024 · e8314a3 · e8314a3
1 parent a6eaaf7
commit e8314a3
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/engine/src/main/java/com/arcadedb/database/BaseRecord.java b/engine/src/main/java/com/arcadedb/database/BaseRecord.java
@@ -50,6 +50,13 @@ public Record getRecord(final boolean loadContent) {
     return this;
   }
 
+  @Override
+  public int size() {
+    if (buffer == null)
+      reload();
+    return buffer != null ? buffer.size() : -1;
+  }
+
   @Override
   public void reload() {
     if (rid != null && buffer == null && database.isOpen()) {

diff --git a/engine/src/main/java/com/arcadedb/database/Record.java b/engine/src/main/java/com/arcadedb/database/Record.java
@@ -36,9 +36,14 @@ public interface Record extends Identifiable {
 
   void delete();
 
-  default JSONObject toJSON(){
+  default JSONObject toJSON() {
     return toJSON(true);
   }
 
   JSONObject toJSON(boolean includeMetadata);
+
+  /**
+   * Returns the binary record size if known, otherwise -1
+   */
+  int size();
 }
diff --git a/engine/src/main/java/com/arcadedb/query/sql/method/collection/SQLMethodSize.java b/engine/src/main/java/com/arcadedb/query/sql/method/collection/SQLMethodSize.java
@@ -21,6 +21,7 @@
 import com.arcadedb.database.Identifiable;
 import com.arcadedb.query.sql.executor.CommandContext;
 import com.arcadedb.query.sql.executor.MultiValue;
+import com.arcadedb.query.sql.executor.Result;
 import com.arcadedb.query.sql.method.AbstractSQLMethod;
 
 /**
@@ -36,17 +37,20 @@ public SQLMethodSize() {
   }
 
   @Override
-  public Object execute(final Object value, final Identifiable iCurrentRecord, final CommandContext iContext, final Object[] iParams) {
+  public Object execute(final Object value, final Identifiable iCurrentRecord, final CommandContext iContext,
+      final Object[] iParams) {
 
     final Number size;
     if (value != null) {
-      if (value instanceof Identifiable) {
-        size = 1;
-      } else if (value instanceof String) {
+      if (value instanceof Result result)
+        size = result.getRecord().isPresent() ? result.getRecord().get().size() : -1;
+      else if (value instanceof Identifiable record)
+        size = record.getRecord(true).size();
+      else if (value instanceof String)
         size = value.toString().length();
-      } else {
+      else
         size = MultiValue.getSize(value);
-      }
+
     } else {
       size = 0;
     }

diff --git a/engine/src/test/java/com/arcadedb/query/sql/function/sql/SQLFunctionsTest.java b/engine/src/test/java/com/arcadedb/query/sql/function/sql/SQLFunctionsTest.java
@@ -71,6 +71,17 @@ public void queryMax() {
     }
   }
 
+  @Test
+  public void testSelectSize() {
+    final ResultSet result = database.query("sql", "select @this.size() as size from Account");
+    assertThat(result.hasNext()).isTrue();
+    for (final ResultSet it = result; it.hasNext(); ) {
+      final Result d = it.next();
+      assertThat(d.<Integer>getProperty("size")).isNotNull();
+      assertThat(d.<Integer>getProperty("size")).isGreaterThan(0);
+    }
+  }
+
   @Test
   public void queryMaxInline() {
     final ResultSet result = database.command("sql", "select max(1,2,7,0,-2,3) as max");