Merge branch 'upstream-main'

Author: tae898

engine/src/main/java/com/arcadedb/database/DatabaseContext.java

@@ -53,7 +53,6 @@ public DatabaseContextTL init(final DatabaseInternal database, final Transaction
     if (map == null) {
       map = new HashMap<>();
       set(map);
-      CONTEXTS.put(Thread.currentThread().threadId(), map);
       current = new DatabaseContextTL();
       map.put(key, current);
     } else {
@@ -76,6 +75,9 @@ public DatabaseContextTL init(final DatabaseInternal database, final Transaction
       }
     }
 
+    // ALWAYS ENSURE THE MAP IS REGISTERED IN CONTEXTS (may have been removed by removeAllContexts)
+    CONTEXTS.put(Thread.currentThread().threadId(), map);
+
     if (current.transactions.isEmpty())
       current.transactions.add(
           firstTransaction != null ? firstTransaction : new TransactionContext(database.getWrappedDatabaseInstance()));
@@ -132,13 +134,42 @@ public List<DatabaseContextTL> removeAllContexts(final String databaseName) {
    */
   public Database getActiveDatabase() {
     final Map<String, DatabaseContextTL> map = get();
-    if (map != null && map.size() == 1) {
+    if (map == null || map.isEmpty())
+      return null;
+
+    if (map.size() == 1) {
       final DatabaseContextTL tl = map.values().iterator().next();
       if (tl != null) {
         final TransactionContext tx = tl.getLastTransaction();
         if (tx != null)
           return tx.getDatabase();
       }
+      return null;
+    }
+
+    // MULTIPLE DATABASES: RETURN THE ONE WITH AN ACTIVE TRANSACTION
+    Database candidate = null;
+    for (final DatabaseContextTL tl : map.values()) {
+      if (tl != null) {
+        final TransactionContext tx = tl.getLastTransaction();
+        if (tx != null && tx.isActive()) {
+          if (candidate != null)
+            return null; // AMBIGUOUS: MULTIPLE ACTIVE TRANSACTIONS
+          candidate = tx.getDatabase();
+        }
+      }
+    }
+
+    if (candidate != null)
+      return candidate;
+
+    // FALLBACK: IF NO ACTIVE TRANSACTION, RETURN ANY DATABASE THAT HAS A TRANSACTION CONTEXT
+    for (final DatabaseContextTL tl : map.values()) {
+      if (tl != null) {
+        final TransactionContext tx = tl.getLastTransaction();
+        if (tx != null)
+          return tx.getDatabase();
+      }
     }
     return null;
   }

engine/src/main/java/com/arcadedb/database/RID.java

@@ -18,9 +18,9 @@
  */
 package com.arcadedb.database;
 
-import com.arcadedb.database.Record;
 import com.arcadedb.engine.LocalBucket;
 import com.arcadedb.engine.PageId;
+import com.arcadedb.exception.DatabaseOperationException;
 import com.arcadedb.exception.RecordNotFoundException;
 import com.arcadedb.graph.Edge;
 import com.arcadedb.graph.Vertex;
@@ -34,50 +34,36 @@
  * It represents the logical address of a record in the database. The record id is composed by the bucket id (the bucket containing the record) and the offset
  * as the absolute position of the record in the bucket.
  * <br>
- * Immutable class.
+ * Immutable class. The database is resolved from the thread-local context on demand, keeping this object lightweight (only bucketId + offset).
  */
 public class RID implements Identifiable, Comparable<Object>, Serializable {
-  private transient final BasicDatabase database;
-  protected final         int           bucketId;
-  protected final         long          offset;
-  private                 int           cachedHashCode = 0; // BOOST PERFORMANCE BECAUSE RID.HASHCODE() IS ONE OF THE HOTSPOTS FOR ANY USE CASES
+  protected final int  bucketId;
+  protected final long offset;
 
   public RID(final int bucketId, final long offset) {
-    this(null, bucketId, offset);
+    this.bucketId = bucketId;
+    this.offset = offset;
   }
 
   public RID(final BasicDatabase database, final int bucketId, final long offset) {
-    if (database == null)
-      // RETRIEVE THE DATABASE FROM THE THREAD LOCAL
-      this.database = DatabaseContext.INSTANCE.getActiveDatabase();
-    else
-      this.database = database;
-
     this.bucketId = bucketId;
     this.offset = offset;
   }
 
   public RID(final String value) {
-    this(null, value);
-  }
-
-  public RID(final BasicDatabase database, String value) {
-    if (database == null)
-      // RETRIEVE THE DATABASE FROM THE THREAD LOCAL
-      this.database = DatabaseContext.INSTANCE.getActiveDatabase();
-    else
-      this.database = database;
-
     if (!value.startsWith("#"))
       throw new IllegalArgumentException("The RID '" + value + "' is not valid");
 
-    value = value.substring(1);
-
-    final List<String> parts = CodeUtils.split(value, ':', 2);
+    final String stripped = value.substring(1);
+    final List<String> parts = CodeUtils.split(stripped, ':', 2);
     this.bucketId = Integer.parseInt(parts.getFirst());
     this.offset = Long.parseLong(parts.get(1));
   }
 
+  public RID(final BasicDatabase database, final String value) {
+    this(value);
+  }
+
   public static boolean is(final Object value) {
     if (value instanceof RID)
       return true;
@@ -124,15 +110,15 @@ public Record getRecord() {
 
   @Override
   public Record getRecord(final boolean loadContent) {
-    return database.lookupByRID(this, loadContent);
+    return requireDatabase().lookupByRID(this, loadContent);
   }
 
   public Document asDocument() {
     return asDocument(true);
   }
 
   public Document asDocument(final boolean loadContent) {
-    return (Document) database.lookupByRID(this, loadContent);
+    return (Document) requireDatabase().lookupByRID(this, loadContent);
   }
 
   public Vertex asVertex() {
@@ -141,7 +127,9 @@ public Vertex asVertex() {
 
   public Vertex asVertex(final boolean loadContent) {
     try {
-      return (Vertex) database.lookupByRID(this, loadContent);
+      return (Vertex) requireDatabase().lookupByRID(this, loadContent);
+    } catch (final RecordNotFoundException e) {
+      throw e;
     } catch (final Exception e) {
       throw new RecordNotFoundException("Record " + this + " not found", this, e);
     }
@@ -152,7 +140,7 @@ public Edge asEdge() {
   }
 
   public Edge asEdge(final boolean loadContent) {
-    return (Edge) database.lookupByRID(this, loadContent);
+    return (Edge) requireDatabase().lookupByRID(this, loadContent);
   }
 
   @Override
@@ -164,14 +152,12 @@ public boolean equals(final Object obj) {
       return false;
 
     final RID o = ((Identifiable) obj).getIdentity();
-    return bucketId == o.bucketId && offset == o.offset && Objects.equals(database, o.getDatabase());
+    return bucketId == o.bucketId && offset == o.offset;
   }
 
   @Override
   public int hashCode() {
-    if (cachedHashCode == 0)
-      cachedHashCode = Objects.hash(database, bucketId, offset);
-    return cachedHashCode;
+    return bucketId * 31 + Long.hashCode(offset);
   }
 
   @Override
@@ -180,21 +166,10 @@ public int compareTo(final Object o) {
     if (o instanceof RID iD)
       otherRID = iD;
     else if (o instanceof String string)
-      otherRID = new RID(database, string);
+      otherRID = new RID(string);
     else
       return -1;
 
-    final BasicDatabase otherDb = otherRID.getDatabase();
-    if (database != null) {
-      if (otherDb != null) {
-        final int res = database.getName().compareTo(otherDb.getName());
-        if (res != 0)
-          return res;
-      } else
-        return -1;
-    } else if (otherDb != null)
-      return 1;
-
     if (bucketId > otherRID.bucketId)
       return 1;
     else if (bucketId < otherRID.bucketId)
@@ -208,16 +183,21 @@ else if (offset < otherRID.offset)
     return 0;
   }
 
-  public BasicDatabase getDatabase() {
-    return database;
-  }
-
   public boolean isValid() {
     return bucketId > -1 && offset > -1;
   }
 
   public PageId getPageId() {
-    return new PageId(database, bucketId,
-        (int) (getPosition() / ((LocalBucket) database.getSchema().getBucketById(bucketId)).getMaxRecordsInPage()));
+    final BasicDatabase db = requireDatabase();
+    return new PageId(db, bucketId,
+        (int) (getPosition() / ((LocalBucket) db.getSchema().getBucketById(bucketId)).getMaxRecordsInPage()));
+  }
+
+  private BasicDatabase requireDatabase() {
+    final BasicDatabase db = DatabaseContext.INSTANCE.getActiveDatabase();
+    if (db == null)
+      throw new DatabaseOperationException(
+          "No active database context for RID " + this + ". Use database.lookupByRID() instead or ensure a database context is active on the current thread");
+    return db;
   }
 }

engine/src/main/java/com/arcadedb/database/TransactionContext.java

@@ -38,6 +38,7 @@
 import com.arcadedb.index.lsm.LSMTreeIndexAbstract;
 import com.arcadedb.log.LogManager;
 import com.arcadedb.schema.LocalSchema;
+import com.arcadedb.utility.RidHashSet;
 
 import java.io.*;
 import java.util.*;
@@ -64,7 +65,7 @@ public class TransactionContext implements Transaction {
   private final Map<RID, Record>                     modifiedRecordsCache  = new HashMap<>(1024);
   private final TransactionIndexContext              indexChanges;
   private final Map<PageId, ImmutablePage>           immutablePages        = new HashMap<>(64);
-  private final Set<RID>                             deletedRecordsInTx    = new HashSet<>();
+  private final RidHashSet                            deletedRecordsInTx    = new RidHashSet();
   private       Map<PageId, MutablePage>             modifiedPages;
   private       Map<PageId, MutablePage>             newPages;
   private       boolean                              useWAL;

engine/src/main/java/com/arcadedb/engine/BucketIterator.java

@@ -151,7 +151,7 @@ private void fetchNext() {
               if (!bucket.existsRecord(rid))
                 continue;
 
-              nextBatch[writeIndex++] = rid.getRecord(false);
+              nextBatch[writeIndex++] = database.lookupByRID(rid, false);
 
             } else if (recordSize[0] == LocalBucket.RECORD_PLACEHOLDER_POINTER) {
               // PLACEHOLDER

engine/src/main/java/com/arcadedb/function/sql/graph/SQLFunctionDuanSSSP.java

@@ -29,6 +29,8 @@
 import com.arcadedb.query.sql.executor.Result;
 import com.arcadedb.function.sql.math.SQLFunctionMathAbstract;
 
+import com.arcadedb.utility.RidHashSet;
+
 import java.util.*;
 
 /**
@@ -105,7 +107,7 @@ private List<RID> executeDuanSSSP(final Vertex source, final Vertex dest, final
     final Map<RID, Double> distances = new HashMap<>();
     final Map<RID, RID> predecessors = new HashMap<>();
     final PriorityQueue<VertexDistance> pq = new PriorityQueue<>();
-    final Set<RID> visited = new HashSet<>();
+    final RidHashSet visited = new RidHashSet();
 
     distances.put(source.getIdentity(), 0.0);
     pq.offer(new VertexDistance(source.getIdentity(), 0.0));

engine/src/main/java/com/arcadedb/function/sql/graph/SQLFunctionMoveFiltered.java

@@ -27,6 +27,8 @@
 import com.arcadedb.query.sql.executor.SQLFunctionFiltered;
 import com.arcadedb.utility.FileUtils;
 
+import com.arcadedb.utility.RidHashSet;
+
 import java.util.*;
 
 /**
@@ -47,7 +49,7 @@ public Object execute(final Object self, final Identifiable currentRecord, final
     else
       labels = null;
 
-    final Set<RID> possibleRIDs = buildRIDSet(iPossibleResults);
+    final RidHashSet possibleRIDs = buildRIDSet(iPossibleResults);
 
     return SQLQueryEngine.foreachRecord(iArgument -> {
       if (possibleRIDs != null && possibleRIDs.isEmpty())
@@ -61,10 +63,10 @@ public Object execute(final Object self, final Identifiable currentRecord, final
     }, self, context);
   }
 
-  private static Set<RID> buildRIDSet(final Iterable<?> iPossibleResults) {
+  private static RidHashSet buildRIDSet(final Iterable<?> iPossibleResults) {
     if (iPossibleResults == null)
       return null;
-    final Set<RID> rids = new HashSet<>();
+    final RidHashSet rids = new RidHashSet();
     for (final Object item : iPossibleResults) {
       if (item instanceof Identifiable id)
         rids.add(id.getIdentity());
@@ -76,7 +78,7 @@ else if (item instanceof Result r) {
     return rids;
   }
 
-  private static Object filterByRIDs(final Object result, final Set<RID> possibleRIDs) {
+  private static Object filterByRIDs(final Object result, final RidHashSet possibleRIDs) {
     if (result instanceof Iterable<?> iterable) {
       final List<Object> filtered = new ArrayList<>();
       for (final Object item : iterable) {

engine/src/main/java/com/arcadedb/function/sql/graph/SQLFunctionShortestPath.java

@@ -36,15 +36,15 @@
 import com.arcadedb.utility.MultiIterator;
 import com.arcadedb.utility.Pair;
 
+import com.arcadedb.utility.RidHashSet;
+
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Shortest path algorithm to find the shortest path from one node to another node in a directed graph.
@@ -71,8 +71,8 @@ private static class ShortestPathContext {
     ArrayDeque<Vertex> queueLeft  = new ArrayDeque<>();
     ArrayDeque<Vertex> queueRight = new ArrayDeque<>();
 
-    final Set<RID>      leftVisited  = new HashSet<>();
-    final Set<RID>      rightVisited = new HashSet<>();
+    final RidHashSet    leftVisited  = new RidHashSet();
+    final RidHashSet    rightVisited = new RidHashSet();
     final Map<RID, RID> previouses   = new HashMap<>();
     final Map<RID, RID> nexts        = new HashMap<>();
 

engine/src/main/java/com/arcadedb/graph/EdgeIterator.java

@@ -84,7 +84,7 @@ public Edge next() {
 
       try {
         // LAZY LOAD THE CONTENT TO IMPROVE PERFORMANCE WITH TRAVERSAL. NOTE: THE RECORD NOT FOUND WILL NEVER BE TRIGGERED HERE ANYMORE
-        return nextEdgeRID.asEdge(false);
+        return (Edge) currentContainer.getDatabase().lookupByRID(nextEdgeRID, false);
       } catch (final RecordNotFoundException e) {
         // SKIP
       }
@@ -106,15 +106,15 @@ public void remove() {
         else
           new ImmutableLightEdge(currentContainer.getDatabase(), edgeType, nextEdgeRID, nextVertexRID, vertex).delete();
       } else
-        nextEdgeRID.asEdge().delete();
+        ((Edge) currentContainer.getDatabase().lookupByRID(nextEdgeRID, false)).delete();
     } catch (final RecordNotFoundException e) {
       // IGNORE IT
     } catch (final Exception e) {
       LogManager.instance().log(this, Level.WARNING, "Error on deleting edge record %s", e, nextEdgeRID);
     }
 
     currentContainer.removeEntry(lastElementPosition, currentPosition.get());
-    ((DatabaseInternal) vertex.getDatabase()).updateRecord(currentContainer);
+    ((DatabaseInternal) currentContainer.getDatabase()).updateRecord(currentContainer);
 
     currentPosition.set(lastElementPosition);
   }

engine/src/main/java/com/arcadedb/graph/EdgeVertexIterator.java

@@ -94,7 +94,7 @@ public void remove() {
     }
 
     currentContainer.removeEntry(lastElementPosition, currentPosition.get());
-    ((DatabaseInternal) vertex.getDatabase()).updateRecord(currentContainer);
+    ((DatabaseInternal) currentContainer.getDatabase()).updateRecord(currentContainer);
 
     currentPosition.set(lastElementPosition);
   }