You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/10/30 04:07:45 UTC

[iotdb] branch master updated: remove Ignore of UDFManagementIT

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

jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 093ae53c23 remove Ignore of UDFManagementIT
093ae53c23 is described below

commit 093ae53c23a6804ec0f9da79338a4296c52a83a4
Author: Weihao Li <60...@users.noreply.github.com>
AuthorDate: Sun Oct 30 12:07:38 2022 +0800

    remove Ignore of UDFManagementIT
---
 .../org/apache/iotdb/db/it/IoTDBNestedQueryIT.java   |  3 +--
 .../db/it/IoTDBSyntaxConventionIdentifierIT.java     |  3 ---
 .../db/it/IoTDBSyntaxConventionStringLiteralIT.java  |  5 -----
 .../apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java | 20 +++++---------------
 .../iotdb/db/it/udf/IoTDBUDFOtherWindowQueryIT.java  |  3 ---
 .../iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java       |  2 --
 .../iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java |  3 ---
 .../iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java  |  3 ---
 .../iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java      |  2 --
 .../iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java    |  2 --
 10 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBNestedQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBNestedQueryIT.java
index fc76dbc18e..479dec2c45 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBNestedQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBNestedQueryIT.java
@@ -68,8 +68,7 @@ public class IoTDBNestedQueryIT {
     EnvFactory.getEnv().initBeforeClass();
     createTimeSeries();
     generateData();
-    // todo : add back when finishes new udf management
-    // registerUDF();
+    registerUDF();
   }
 
   @AfterClass
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
index df2961a78f..167a4caee8 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
@@ -26,7 +26,6 @@ import org.apache.iotdb.itbase.category.LocalStandaloneIT;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -531,8 +530,6 @@ public class IoTDBSyntaxConventionIdentifierIT {
   }
 
   @Test
-  // todo : add back when finishes new udf management
-  @Ignore
   public void testUDFName() {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
index 08b0519bd6..0104ad8d4e 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
@@ -28,7 +28,6 @@ import org.apache.iotdb.itbase.constant.TestConstant;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -299,8 +298,6 @@ public class IoTDBSyntaxConventionStringLiteralIT {
   }
 
   @Test
-  // todo : add back when finishes new udf management
-  @Ignore
   public void testUDFClassName() {
     String errorMsg =
         "401: Error occurred while parsing SQL to physical plan: "
@@ -352,8 +349,6 @@ public class IoTDBSyntaxConventionStringLiteralIT {
   }
 
   @Test
-  // todo : add back when finishes new udf management
-  @Ignore
   public void testUDFAttribute() {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java
index 13c1ee1d7c..ee52fb35ff 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java
@@ -28,7 +28,6 @@ import org.apache.iotdb.itbase.constant.BuiltinTimeSeriesGeneratingFunctionEnum;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -44,8 +43,6 @@ import static org.junit.Assert.fail;
 
 @RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-// todo : add back when finishes new udf management
-@Ignore
 public class IoTDBUDFManagementIT {
 
   private static final int NATIVE_FUNCTIONS_COUNT =
@@ -191,7 +188,7 @@ public class IoTDBUDFManagementIT {
         statement.execute("create function udf as 'org.apache.iotdb.db.query.udf.example.Adder'");
         fail();
       } catch (SQLException throwable) {
-        assertTrue(throwable.getMessage().contains("Failed to register"));
+        assertTrue(throwable.getMessage().contains("Failed to create"));
       }
     }
   }
@@ -206,11 +203,7 @@ public class IoTDBUDFManagementIT {
         statement.execute("create function udf as 'org.apache.iotdb.db.query.udf.example.Adder'");
         fail();
       } catch (SQLException throwable) {
-        assertTrue(
-            throwable
-                .getMessage()
-                .contains(
-                    "with the same function name and the class name has already been registered"));
+        assertTrue(throwable.getMessage().contains("the same name UDF has been created"));
       }
     }
   }
@@ -226,7 +219,7 @@ public class IoTDBUDFManagementIT {
         // drop UDF that does not exist will not throw exception now.
         statement.execute("drop function udf");
       } catch (SQLException throwable) {
-        fail();
+        assertTrue(throwable.getMessage().contains("this UDF has not been created"));
       }
     }
   }
@@ -238,7 +231,7 @@ public class IoTDBUDFManagementIT {
       // drop UDF that does not exist will not throw exception now.
       statement.execute("drop function udf");
     } catch (SQLException throwable) {
-      fail();
+      assertTrue(throwable.getMessage().contains("this UDF has not been created"));
     }
   }
 
@@ -282,10 +275,7 @@ public class IoTDBUDFManagementIT {
       statement.execute("create function sin as 'org.apache.iotdb.db.query.udf.example.Adder'");
       fail();
     } catch (SQLException throwable) {
-      assertTrue(
-          throwable
-              .getMessage()
-              .contains("the given function name is the same as a built-in UDF function name"));
+      assertTrue(throwable.getMessage().contains("the same name UDF has been created"));
     }
   }
 
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFOtherWindowQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFOtherWindowQueryIT.java
index 62976d0e20..07744152a6 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFOtherWindowQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFOtherWindowQueryIT.java
@@ -28,7 +28,6 @@ import org.apache.iotdb.itbase.constant.UDFTestConstant;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -45,8 +44,6 @@ import static org.junit.Assert.fail;
 /** Test for SessionWindow, StateWindow and UserDefinedWindow. */
 @RunWith(IoTDBTestRunner.class)
 @Category({ClusterIT.class})
-// todo : add back when finishes new udf management
-@Ignore
 public class IoTDBUDFOtherWindowQueryIT {
 
   protected static final int ITERATION_TIMES = 1000;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java
index fb7b10714e..c654f71c72 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java
@@ -43,8 +43,6 @@ import static org.junit.Assert.fail;
 
 @RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-// todo : add back when finishes new udf management
-@Ignore
 public class IoTDBUDFWindowQueryIT {
 
   protected static final int ITERATION_TIMES = 10000;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java
index 4528d3cb5b..0ae65de1e6 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java
@@ -27,7 +27,6 @@ import org.apache.iotdb.itbase.category.LocalStandaloneIT;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -48,8 +47,6 @@ import static org.junit.Assert.fail;
 
 @RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-// todo : add back when finishes new udf management
-@Ignore
 public class IoTDBUDTFAlignByTimeQueryIT {
 
   protected static final int ITERATION_TIMES = 100;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java
index 5a321ebef1..8ef47e56f1 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java
@@ -26,7 +26,6 @@ import org.apache.iotdb.itbase.category.LocalStandaloneIT;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -45,8 +44,6 @@ import static org.junit.Assert.fail;
 
 @RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-// todo : add back when finishes new udf management
-@Ignore
 public class IoTDBUDTFBuiltinFunctionIT {
 
   private static final String[] INSERTION_SQLS = {
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
index 4a553170a9..0907fc51a9 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
@@ -43,8 +43,6 @@ import static org.junit.Assert.fail;
 
 @RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-// todo : add back when finishes new udf management
-@Ignore
 public class IoTDBUDTFHybridQueryIT {
 
   @BeforeClass
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java
index 9beb016a3d..149551fc91 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java
@@ -46,8 +46,6 @@ import static org.junit.Assert.fail;
 // todo: refactor after redesign of non align?
 @RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
-// todo : add back when finishes new udf management
-@Ignore
 public class IoTDBUDTFNonAlignQueryIT {
 
   protected static final int ITERATION_TIMES = 10;