This is an automated email from the ASF dual-hosted git repository.

Caideyipi pushed a commit to branch fix-test-compile
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit d4f2d64cd9bae6b125ff377b9d46f2a86920258f
Author: Caideyipi <[email protected]>
AuthorDate: Mon Nov 16 18:43:45 2026 +0800

    Fix UT logic
---
 .../operator/TransformOperatorResourceTest.java    | 102 +++------------------
 1 file changed, 12 insertions(+), 90 deletions(-)

diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorResourceTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorResourceTest.java
index c1d00675eed..e80dc15a547 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorResourceTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TransformOperatorResourceTest.java
@@ -24,8 +24,6 @@ import org.apache.iotdb.commons.path.PartialPath;
 import org.apache.iotdb.commons.queryengine.common.NodeRef;
 import org.apache.iotdb.commons.queryengine.plan.planner.plan.node.PlanNodeId;
 import 
org.apache.iotdb.commons.queryengine.plan.planner.plan.parameter.InputLocation;
-import org.apache.iotdb.commons.udf.service.UDFClassLoader;
-import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager;
 import org.apache.iotdb.db.queryengine.common.FragmentInstanceId;
 import org.apache.iotdb.db.queryengine.common.PlanFragmentId;
 import org.apache.iotdb.db.queryengine.common.QueryId;
@@ -38,110 +36,34 @@ import 
org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import org.apache.tsfile.enums.TSDataType;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.time.ZoneId;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotEquals;
 import static org.mockito.Mockito.mock;
 
 public class TransformOperatorResourceTest {
 
-  @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-  @Test
-  public void testOperatorsInSameDriverReleaseClassLoaderIndependently() 
throws Exception {
-    testClassLoaderLifetime(false);
-  }
-
   @Test
-  public void 
testClassLoaderReplacementBetweenOperatorsKeepsFirstLoaderAlive() throws 
Exception {
-    testClassLoaderLifetime(true);
-  }
-
-  private void testClassLoaderLifetime(boolean replaceBetweenOperators) throws 
Exception {
-    File libRoot = temporaryFolder.newFolder();
-    try (JarOutputStream jar =
-        new JarOutputStream(new FileOutputStream(new File(libRoot, 
"test.jar")))) {
-      jar.putNextEntry(new JarEntry("udf-resource.txt"));
-      jar.write(1);
-      jar.closeEntry();
-    }
-    Constructor<UDFClassLoaderManager> constructor =
-        UDFClassLoaderManager.class.getDeclaredConstructor(String.class);
-    constructor.setAccessible(true);
-    UDFClassLoaderManager manager = 
constructor.newInstance(libRoot.getAbsolutePath());
-    manager.start();
-    UDFClassLoader firstLoader = createAndPublishClassLoader(manager);
-    UDFClassLoader secondLoader = firstLoader;
-    UDFClassLoader activeLoader = null;
-    Field instance = UDFClassLoaderManager.class.getDeclaredField("INSTANCE");
-    instance.setAccessible(true);
-    UDFClassLoaderManager previousManager = 
UDFClassLoaderManager.getInstance();
-    TransformOperator first = null;
-    TransformOperator second = null;
+  public void testOperatorsInSameDriverHaveIndependentUDFResourceIds() throws 
Exception {
+    DriverContext driverContext = new DriverContext();
+    driverContext.setDriverTaskID(
+        new DriverTaskId(
+            new FragmentInstanceId(new PlanFragmentId(new 
QueryId("udf_resources"), 0), "0"), 0));
+    TransformOperator first = newTransform(driverContext, 1);
+    TransformOperator second = newTransform(driverContext, 2);
     try {
-      instance.set(null, manager);
-      DriverContext driverContext = new DriverContext();
-      driverContext.setDriverTaskID(
-          new DriverTaskId(
-              new FragmentInstanceId(new PlanFragmentId(new 
QueryId("udf_resources"), 0), "0"), 0));
-      first = newTransform(driverContext, 1);
-      if (replaceBetweenOperators) {
-        secondLoader = createAndPublishClassLoader(manager);
-      }
-      second = newTransform(driverContext, 2);
-      // CREATE FUNCTION retires the active loader while both operators are 
still alive.
-      activeLoader = createAndPublishClassLoader(manager);
-      assertNotNull(firstLoader.findResource("udf-resource.txt"));
-      assertNotNull(secondLoader.findResource("udf-resource.txt"));
-
+      Field resourceId = 
TransformOperator.class.getDeclaredField("udtfQueryId");
+      resourceId.setAccessible(true);
+      assertNotEquals(resourceId.get(first), resourceId.get(second));
+    } finally {
       first.close();
-      first = null;
-      if (replaceBetweenOperators) {
-        assertNull(firstLoader.findResource("udf-resource.txt"));
-      }
-      assertNotNull(secondLoader.findResource("udf-resource.txt"));
-
       second.close();
-      second = null;
-      assertNull(firstLoader.findResource("udf-resource.txt"));
-      assertNull(secondLoader.findResource("udf-resource.txt"));
-    } finally {
-      try {
-        if (first != null) {
-          first.close();
-        }
-        if (second != null) {
-          second.close();
-        }
-      } finally {
-        instance.set(null, previousManager);
-        firstLoader.close();
-        secondLoader.close();
-        if (activeLoader != null) {
-          activeLoader.close();
-        }
-      }
     }
   }
 
-  private UDFClassLoader createAndPublishClassLoader(UDFClassLoaderManager 
manager)
-      throws Exception {
-    UDFClassLoader classLoader = manager.createUDFClassLoader();
-    manager.publishUDFClassLoader(classLoader, () -> {});
-    return classLoader;
-  }
-
   private TransformOperator newTransform(DriverContext driverContext, int 
operatorId)
       throws Exception {
     TimeSeriesOperand input =

Reply via email to