Revert CalciteToolsHelper comment to sync with main

Signed-off-by: Kai Huang <ahkcs@amazon.com>

Author: ahkcs

core/src/main/java/org/opensearch/sql/calcite/utils/CalciteToolsHelper.java

@@ -422,8 +422,7 @@ public RelNode visit(TableScan scan) {
             }
           };
       rel = rel.accept(shuttle);
-      // Context classloader is set by callers (QueryService.executeWithCalcite/explainWithCalcite)
-      // to support patched Calcite (CALCITE-3745) Janino compilation.
+      // the line we changed here
       try (Connection connection = context.connection) {
         final RelRunner runner = connection.unwrap(RelRunner.class);
         PreparedStatement preparedStatement = runner.prepareStatement(rel);

core/src/main/java/org/opensearch/sql/executor/QueryService.java

@@ -13,7 +13,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.calcite.jdbc.CalciteSchema;
-import org.opensearch.sql.calcite.utils.CalciteClassLoaderHelper;
 import org.apache.calcite.plan.RelTraitDef;
 import org.apache.calcite.rel.RelCollation;
 import org.apache.calcite.rel.RelCollations;
@@ -36,6 +35,7 @@
 import org.opensearch.sql.calcite.SysLimit;
 import org.opensearch.sql.calcite.plan.rel.LogicalSystemLimit;
 import org.opensearch.sql.calcite.plan.rel.LogicalSystemLimit.SystemLimitType;
+import org.opensearch.sql.calcite.utils.CalciteClassLoaderHelper;
 import org.opensearch.sql.common.response.ResponseListener;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.common.utils.QueryContext;

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/CalciteScriptEngine.java

@@ -69,7 +69,6 @@
 import org.apache.calcite.util.Util;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.opensearch.index.fielddata.ScriptDocValues;
-import org.opensearch.sql.calcite.utils.CalciteClassLoaderHelper;
 import org.opensearch.script.AggregationScript;
 import org.opensearch.script.FieldScript;
 import org.opensearch.script.FilterScript;
@@ -78,6 +77,7 @@
 import org.opensearch.script.ScriptEngine;
 import org.opensearch.script.StringSortScript;
 import org.opensearch.search.lookup.SourceLookup;
+import org.opensearch.sql.calcite.utils.CalciteClassLoaderHelper;
 import org.opensearch.sql.data.model.ExprTimestampValue;
 import org.opensearch.sql.opensearch.storage.script.aggregation.CalciteAggregationScriptFactory;
 import org.opensearch.sql.opensearch.storage.script.field.CalciteFieldScriptFactory;