refactor:make sure that when a command context is created it receive …

…a database
orientechnologies · Jul 11, 2024 · d36e284 · d36e284
1 parent 2d06f8d
commit d36e284
Show file tree

Hide file tree

Showing 53 changed files with 121 additions and 170 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/command/OCommandExecutorAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/command/OCommandExecutorAbstract.java
@@ -105,7 +105,9 @@ public String getFetchPlan() {
   }
 
   public OCommandContext getContext() {
-    if (context == null) context = new OBasicCommandContext();
+    if (context == null) {
+      context = new OBasicCommandContext(ODatabaseRecordThreadLocal.instance().getIfDefined());
+    }
     return context;
   }
 

diff --git a/core/src/main/java/com/orientechnologies/orient/core/command/OCommandRequestAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/command/OCommandRequestAbstract.java
@@ -22,6 +22,7 @@
 import com.orientechnologies.common.listener.OProgressListener;
 import com.orientechnologies.orient.core.command.OCommandContext.TIMEOUT_STRATEGY;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
+import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.replication.OAsyncReplicationError;
 import com.orientechnologies.orient.core.replication.OAsyncReplicationOk;
@@ -183,7 +184,8 @@ public void setCacheableResult(final boolean iValue) {
 
   @Override
   public OCommandContext getContext() {
-    if (context == null) context = new OBasicCommandContext();
+    if (context == null)
+      context = new OBasicCommandContext(ODatabaseRecordThreadLocal.instance().getIfDefined());
     return context;
   }
 

diff --git a/core/src/main/java/com/orientechnologies/orient/core/command/OSqlScriptExecutor.java b/core/src/main/java/com/orientechnologies/orient/core/command/OSqlScriptExecutor.java
@@ -40,8 +40,7 @@ public OResultSet execute(ODatabaseDocumentInternal database, String script, Obj
     }
     List<OStatement> statements = OSQLEngine.parseScript(script, database);
 
-    OCommandContext scriptContext = new OBasicCommandContext();
-    ((OBasicCommandContext) scriptContext).setDatabase(database);
+    OCommandContext scriptContext = new OBasicCommandContext(database);
     Map<Object, Object> params = new HashMap<>();
     if (args != null) {
       for (int i = 0; i < args.length; i++) {
@@ -60,8 +59,7 @@ public OResultSet execute(ODatabaseDocumentInternal database, String script, Map
     }
     List<OStatement> statements = OSQLEngine.parseScript(script, database);
 
-    OCommandContext scriptContext = new OBasicCommandContext();
-    ((OBasicCommandContext) scriptContext).setDatabase(database);
+    OCommandContext scriptContext = new OBasicCommandContext(database);
 
     scriptContext.setInputParameters(params);
 

diff --git a/...rc/main/java/com/orientechnologies/orient/core/command/script/OCommandExecutorScript.java b/...rc/main/java/com/orientechnologies/orient/core/command/script/OCommandExecutorScript.java
@@ -104,7 +104,7 @@ public OCommandExecutorScript parse(final OCommandRequest iRequest) {
   }
 
   public Object execute(final Map<Object, Object> iArgs) {
-    if (context == null) context = new OBasicCommandContext();
+    if (context == null) context = new OBasicCommandContext(getDatabase());
     return executeInContext(context, iArgs);
   }
 

diff --git a/...rc/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentEmbedded.java b/...rc/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentEmbedded.java
@@ -782,8 +782,7 @@ public OLocalResultSetLifecycleDecorator query(OExecutionPlan plan, Map<Object,
     getSharedContext().getOrientDB().startCommand(Optional.empty());
     try {
       preQueryStart();
-      OBasicCommandContext ctx = new OBasicCommandContext();
-      ctx.setDatabase(this);
+      OBasicCommandContext ctx = new OBasicCommandContext(this);
       ctx.setInputParameters(params);
 
       OLocalResultSet result = new OLocalResultSet((OInternalExecutionPlan) plan);

diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/viewmanager/ViewManager.java b/core/src/main/java/com/orientechnologies/orient/core/db/viewmanager/ViewManager.java
@@ -662,7 +662,7 @@ private void updateViewRow(
           }
         } else {
           for (OProjectionItem oProjectionItem : projection.getItems()) {
-            Object value = oProjectionItem.execute(origin, new OBasicCommandContext());
+            Object value = oProjectionItem.execute(origin, new OBasicCommandContext(db));
             viewRow.setProperty(oProjectionItem.getProjectionAliasAsString(), value);
           }
         }

diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityEngine.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/security/OSecurityEngine.java
@@ -424,8 +424,7 @@ static boolean evaluateSecuirtyPolicyPredicate(
           .executeNoAuthorization(
               session.getName(),
               (db -> {
-                OBasicCommandContext ctx = new OBasicCommandContext();
-                ctx.setDatabase(db);
+                OBasicCommandContext ctx = new OBasicCommandContext(db);
                 ctx.setDynamicVariable(
                     "$currentUser",
                     (inContext) -> {
@@ -458,8 +457,7 @@ static boolean evaluateSecuirtyPolicyPredicate(
           .executeNoAuthorization(
               session.getName(),
               (db -> {
-                OBasicCommandContext ctx = new OBasicCommandContext();
-                ctx.setDatabase(db);
+                OBasicCommandContext ctx = new OBasicCommandContext(db);
                 ctx.setDynamicVariable(
                     "$currentUser",
                     (inContext) -> {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelect.java b/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelect.java
@@ -1662,7 +1662,7 @@ private OSQLFilterCondition convertToBetweenClause(final OSQLFilterCondition con
 
   public void initContext() {
     if (context == null) {
-      context = new OBasicCommandContext();
+      context = new OBasicCommandContext(getDatabase());
     }
     if (context.getDatabase() == null) {
       ((OBasicCommandContext) context).setDatabase(getDatabase());

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/ForEachStep.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/ForEachStep.java
@@ -55,7 +55,7 @@ protected Iterator<Object> init(OCommandContext ctx) {
   }
 
   public OScriptExecutionPlan initPlan(OCommandContext ctx) {
-    OBasicCommandContext subCtx1 = new OBasicCommandContext();
+    OBasicCommandContext subCtx1 = new OBasicCommandContext(ctx.getDatabase());
     subCtx1.setParent(ctx);
     OScriptExecutionPlan plan = new OScriptExecutionPlan(subCtx1);
     for (OStatement stm : body) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/GlobalLetQueryStep.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/GlobalLetQueryStep.java
@@ -26,11 +26,10 @@ public GlobalLetQueryStep(
     super(ctx, profilingEnabled);
     this.varName = varName;
 
-    OBasicCommandContext subCtx = new OBasicCommandContext();
+    OBasicCommandContext subCtx = new OBasicCommandContext(ctx.getDatabase());
     if (scriptVars != null) {
       scriptVars.forEach(x -> subCtx.declareScriptVariable(x));
     }
-    subCtx.setDatabase(ctx.getDatabase());
     subCtx.setParent(ctx);
     if (query.toString().contains("?")) {
       // with positional parameters, you cannot know if a parameter has the same ordinal as the one

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/IfStep.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/IfStep.java
@@ -44,7 +44,7 @@ public OScriptExecutionPlan producePlan(OCommandContext ctx) {
   }
 
   public OScriptExecutionPlan initPositivePlan(OCommandContext ctx) {
-    OBasicCommandContext subCtx1 = new OBasicCommandContext();
+    OBasicCommandContext subCtx1 = new OBasicCommandContext(ctx.getDatabase());
     subCtx1.setParent(ctx);
     OScriptExecutionPlan positivePlan = new OScriptExecutionPlan(subCtx1);
     for (OStatement stm : positiveStatements) {
@@ -56,7 +56,7 @@ public OScriptExecutionPlan initPositivePlan(OCommandContext ctx) {
   public OScriptExecutionPlan initNegativePlan(OCommandContext ctx) {
     if (negativeStatements != null) {
       if (negativeStatements.size() > 0) {
-        OBasicCommandContext subCtx2 = new OBasicCommandContext();
+        OBasicCommandContext subCtx2 = new OBasicCommandContext(ctx.getDatabase());
         subCtx2.setParent(ctx);
         OScriptExecutionPlan negativePlan = new OScriptExecutionPlan(subCtx2);
         for (OStatement stm : negativeStatements) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/LetQueryStep.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/LetQueryStep.java
@@ -25,8 +25,7 @@ public LetQueryStep(
   }
 
   private OResultInternal calculate(OResultInternal result, OCommandContext ctx) {
-    OBasicCommandContext subCtx = new OBasicCommandContext();
-    subCtx.setDatabase(ctx.getDatabase());
+    OBasicCommandContext subCtx = new OBasicCommandContext(ctx.getDatabase());
     subCtx.setParentWithoutOverridingChild(ctx);
     OInternalExecutionPlan subExecutionPlan;
     if (query.toString().contains("?")) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/LiveQueryListenerImpl.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/LiveQueryListenerImpl.java
@@ -72,7 +72,10 @@ public LiveQueryListenerImpl(
     } else if (statement.getTarget().getItem().getRids() != null) {
       this.rids =
           statement.getTarget().getItem().getRids().stream()
-              .map(x -> x.toRecordId(new OResultInternal(), new OBasicCommandContext()))
+              .map(
+                  x ->
+                      x.toRecordId(
+                          new OResultInternal(), new OBasicCommandContext((ODatabaseSession) db)))
               .collect(Collectors.toList());
     }
     execInSeparateDatabase(
@@ -146,16 +149,19 @@ record = copy(iRecord.before);
         switch (iRecord.type) {
           case ORecordOperation.DELETED:
             record.setMetadata(BEFORE_METADATA_KEY, null);
-            clientListener.onDelete(execDb, applyProjections(record));
+            clientListener.onDelete(execDb, applyProjections((ODatabaseSession) execDb, record));
             break;
           case ORecordOperation.UPDATED:
             OResult before =
-                applyProjections((OResultInternal) record.getMetadata(BEFORE_METADATA_KEY));
+                applyProjections(
+                    (ODatabaseSession) execDb,
+                    (OResultInternal) record.getMetadata(BEFORE_METADATA_KEY));
             record.setMetadata(BEFORE_METADATA_KEY, null);
-            clientListener.onUpdate(execDb, before, applyProjections(record));
+            clientListener.onUpdate(
+                execDb, before, applyProjections((ODatabaseSession) execDb, record));
             break;
           case ORecordOperation.CREATED:
-            clientListener.onCreate(execDb, applyProjections(record));
+            clientListener.onCreate(execDb, applyProjections((ODatabaseSession) execDb, record));
             break;
         }
       }
@@ -165,11 +171,11 @@ record = copy(iRecord.before);
     }
   }
 
-  private OResultInternal applyProjections(OResultInternal record) {
+  private OResultInternal applyProjections(ODatabaseSession session, OResultInternal record) {
     if (statement.getProjection() != null) {
       OResultInternal result =
           (OResultInternal)
-              statement.getProjection().calculateSingle(new OBasicCommandContext(), record);
+              statement.getProjection().calculateSingle(new OBasicCommandContext(session), record);
       return result;
     }
     return record;
@@ -218,7 +224,7 @@ private boolean filter(OResult record) {
     if (where == null) {
       return true;
     }
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext((ODatabaseSession) this.execDb);
     ctx.setInputParameters(params);
     return where.matchesFilters(record, ctx);
   }

diff --git a/...src/main/java/com/orientechnologies/orient/core/sql/executor/OSelectExecutionPlanner.java b/...src/main/java/com/orientechnologies/orient/core/sql/executor/OSelectExecutionPlanner.java
@@ -3043,8 +3043,7 @@ private void handleSubqueryAsTarget(
       OStatement subQuery,
       OCommandContext ctx,
       boolean profilingEnabled) {
-    OBasicCommandContext subCtx = new OBasicCommandContext();
-    subCtx.setDatabase(ctx.getDatabase());
+    OBasicCommandContext subCtx = new OBasicCommandContext(ctx.getDatabase());
     subCtx.setParent(ctx);
     OInternalExecutionPlan subExecutionPlan =
         subQuery.createExecutionPlan(subCtx, profilingEnabled);

diff --git a/...c/main/java/com/orientechnologies/orient/core/sql/executor/OTraverseExecutionPlanner.java b/...c/main/java/com/orientechnologies/orient/core/sql/executor/OTraverseExecutionPlanner.java
@@ -335,8 +335,7 @@ private void handleSubqueryAsTarget(
       OStatement subQuery,
       OCommandContext ctx,
       boolean profilingEnabled) {
-    OBasicCommandContext subCtx = new OBasicCommandContext();
-    subCtx.setDatabase(ctx.getDatabase());
+    OBasicCommandContext subCtx = new OBasicCommandContext(ctx.getDatabase());
     subCtx.setParent(ctx);
     OInternalExecutionPlan subExecutionPlan =
         subQuery.createExecutionPlan(subCtx, profilingEnabled);

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/executor/RetryStep.java b/core/src/main/java/com/orientechnologies/orient/core/sql/executor/RetryStep.java
@@ -73,7 +73,7 @@ public OExecutionStream internalStart(OCommandContext ctx) throws OTimeoutExcept
   }
 
   public OScriptExecutionPlan initPlan(List<OStatement> body, OCommandContext ctx) {
-    OBasicCommandContext subCtx1 = new OBasicCommandContext();
+    OBasicCommandContext subCtx1 = new OBasicCommandContext(ctx.getDatabase());
     subCtx1.setParent(ctx);
     OScriptExecutionPlan plan = new OScriptExecutionPlan(subCtx1);
     for (OStatement stm : body) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OCreateEdgeStatement.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OCreateEdgeStatement.java
@@ -38,11 +38,10 @@ public OCreateEdgeStatement(OrientSql p, int id) {
   @Override
   public OResultSet execute(
       ODatabaseSession db, Object[] args, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     Map<Object, Object> params = new HashMap<>();
     if (args != null) {
       for (int i = 0; i < args.length; i++) {
@@ -63,11 +62,10 @@ public OResultSet execute(
   @Override
   public OResultSet execute(
       ODatabaseSession db, Map params, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     ctx.setInputParameters(params);
     OInsertExecutionPlan executionPlan;
     if (usePlanCache) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OCreateVertexStatement.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OCreateVertexStatement.java
@@ -31,11 +31,10 @@ public OCreateVertexStatement(OrientSql p, int id) {
   @Override
   public OResultSet execute(
       ODatabaseSession db, Map params, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     ctx.setInputParameters(params);
     OInsertExecutionPlan executionPlan;
     if (usePlanCache) {
@@ -50,11 +49,10 @@ public OResultSet execute(
   @Override
   public OResultSet execute(
       ODatabaseSession db, Object[] args, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     Map<Object, Object> params = new HashMap<>();
     if (args != null) {
       for (int i = 0; i < args.length; i++) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODDLStatement.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODDLStatement.java
@@ -26,11 +26,10 @@ public ODDLStatement(OrientSql p, int id) {
 
   public OResultSet execute(
       ODatabaseSession db, Object[] args, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     Map<Object, Object> params = new HashMap<>();
     if (args != null) {
       for (int i = 0; i < args.length; i++) {
@@ -44,11 +43,10 @@ public OResultSet execute(
 
   public OResultSet execute(
       ODatabaseSession db, Map params, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     ctx.setInputParameters(params);
     ODDLExecutionPlan executionPlan = (ODDLExecutionPlan) createExecutionPlan(ctx, false);
     return new OExecutionResultSet(executionPlan.executeInternal(ctx), ctx, executionPlan);

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODatabaseUserData.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODatabaseUserData.java
@@ -125,9 +125,8 @@ public ODatabaseUserData copy() {
   }
 
   public void executeCreate(ODatabaseDocumentInternal db, OCommandContext parentCtx) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     ctx.setInputParameters(parentCtx.getInputParameters());
-    ctx.setDatabase(db);
     OCreateUserStatement stm = new OCreateUserStatement(-1);
     if (name != null) {
       stm.name = name.copy();

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODeleteEdgeStatement.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODeleteEdgeStatement.java
@@ -43,11 +43,10 @@ public ODeleteEdgeStatement(OrientSql p, int id) {
   @Override
   public OResultSet execute(
       ODatabaseSession db, Map params, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     ctx.setInputParameters(params);
     ODeleteExecutionPlan executionPlan;
     if (usePlanCache) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODeleteStatement.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODeleteStatement.java
@@ -105,11 +105,10 @@ public int hashCode() {
   @Override
   public OResultSet execute(
       ODatabaseSession db, Map params, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     ctx.setInputParameters(params);
     ODeleteExecutionPlan executionPlan;
     if (usePlanCache) {
@@ -124,11 +123,10 @@ public OResultSet execute(
   @Override
   public OResultSet execute(
       ODatabaseSession db, Object[] args, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     Map<Object, Object> params = new HashMap<>();
     if (args != null) {
       for (int i = 0; i < args.length; i++) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODeleteVertexStatement.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/ODeleteVertexStatement.java
@@ -31,11 +31,10 @@ public ODeleteVertexStatement(OrientSql p, int id) {
   @Override
   public OResultSet execute(
       ODatabaseSession db, Map params, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     ctx.setInputParameters(params);
     ODeleteExecutionPlan executionPlan;
     if (usePlanCache) {
@@ -50,11 +49,10 @@ public OResultSet execute(
   @Override
   public OResultSet execute(
       ODatabaseSession db, Object[] args, OCommandContext parentCtx, boolean usePlanCache) {
-    OBasicCommandContext ctx = new OBasicCommandContext();
+    OBasicCommandContext ctx = new OBasicCommandContext(db);
     if (parentCtx != null) {
       ctx.setParentWithoutOverridingChild(parentCtx);
     }
-    ctx.setDatabase(db);
     Map<Object, Object> params = new HashMap<>();
     if (args != null) {
       for (int i = 0; i < args.length; i++) {