PullRequest: 71 fix(flow): the flow will report an error when empty db initialization

ungreat · LioRoger · commit 17a8bd1057f6 · 2025-07-08T18:48:13.000+08:00
Merge branch yiang_fix_upgrate_flow_may_failed of git@code.alipay.com:oceanbase-cloud-platform/odc-mirror.git into dev/4.4.x https://code.alipay.com/oceanbase-cloud-platform/odc-mirror/pull_requests/71 Reviewed-by: 龙玄 <longpeng.zlp@oceanbase.com> * If it is an empty metadb initialization, the flow will report an error. * change version
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "client"]
 	path = client
 	url = https://github.com/oceanbase/odc-client.git
-	branch = dev-4.3.4
+	branch = dev-4.4.0-SNAPSHOT
 [submodule "build-resource"]
 	path = build-resource
 	url = https://github.com/oceanbase/odc-build-resource.git
diff --git a/distribution/odc-server-VER.txt b/distribution/odc-server-VER.txt
@@ -1 +1 @@
-4.3.4
+4.4.0
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     <packaging>pom</packaging>
     <name>OceanBase Developer Center</name>
     <url>https://github.com/oceanbase/odc</url>
-    <version>4.3.4-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
     <modules>
         <module>server/3rd-party/Libinjection</module>
         <module>server/odc-test</module>
diff --git a/server/3rd-party/Libinjection/pom.xml b/server/3rd-party/Libinjection/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>Libinjection</artifactId>
diff --git a/server/integration-test/pom.xml b/server/integration-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>integration-test</artifactId>
diff --git a/server/modules/pom.xml b/server/modules/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/server/modules/sample-module/pom.xml b/server/modules/sample-module/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>module-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-module</artifactId>
diff --git a/server/odc-common/pom.xml b/server/odc-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>odc-common</artifactId>
diff --git a/server/odc-core/pom.xml b/server/odc-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>odc-core</artifactId>
diff --git a/server/odc-migrate/pom.xml b/server/odc-migrate/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>odc-migrate</artifactId>
diff --git a/server/odc-migrate/src/main/resources/migrate/oceanbase/V_4_4_0_3__flowable_update_to_7102.sql b/server/odc-migrate/src/main/resources/migrate/oceanbase/V_4_4_0_3__flowable_update_to_7102.sql
@@ -460,3 +460,24 @@ update ACT_GE_PROPERTY set VALUE_ = '7.1.0.2' where NAME_ = 'schema.version';
 CALL AddColumnIfNotExists('ACT_ID_USER', 'DISPLAY_NAME_', 'varchar(255) DEFAULT ""');
 
 update ACT_ID_PROPERTY set VALUE_ = '7.1.0.2' where NAME_ = 'schema.version';
+
+
+-- flowable.mysql.create.eventregistry.sql
+CREATE TABLE if not exists FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime(3) NULL, TENANT_ID_ VARCHAR(255) NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE if not exists FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE if not exists FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, VERSION_ INT NULL, KEY_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(255) NULL, DESCRIPTION_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX if not exists ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE if not exists FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, VERSION_ INT NULL, KEY_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, CREATE_TIME_ datetime(3) NULL, TENANT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(255) NULL, DESCRIPTION_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX if not exists ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CALL AddColumnIfNotExists('FLW_CHANNEL_DEFINITION','TYPE_', 'VARCHAR(255) NULL');
+
+CALL AddColumnIfNotExists('FLW_CHANNEL_DEFINITION','IMPLEMENTATION_', 'VARCHAR(255) NULL');
+
+insert into ACT_GE_PROPERTY
+values ('eventregistry.schema.version', '7.1.0.2', 1);
diff --git a/server/odc-server/pom.xml b/server/odc-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>odc-server</artifactId>
diff --git a/server/odc-service/pom.xml b/server/odc-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>odc-service</artifactId>
diff --git a/server/odc-test/pom.xml b/server/odc-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>odc-test</artifactId>
diff --git a/server/plugins/connect-plugin-api/pom.xml b/server/plugins/connect-plugin-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/plugins/connect-plugin-doris/pom.xml b/server/plugins/connect-plugin-doris/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/connect-plugin-mysql/pom.xml b/server/plugins/connect-plugin-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/connect-plugin-ob-mysql/pom.xml b/server/plugins/connect-plugin-ob-mysql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/plugins/connect-plugin-ob-oracle/pom.xml b/server/plugins/connect-plugin-ob-oracle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/plugins/connect-plugin-oracle/pom.xml b/server/plugins/connect-plugin-oracle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/plugins/connect-plugin-postgres/pom.xml b/server/plugins/connect-plugin-postgres/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>connect-plugin-postgres</artifactId>
diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/server/plugins/sample-plugin-api/pom.xml b/server/plugins/sample-plugin-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-plugin-api</artifactId>
diff --git a/server/plugins/sample-plugin/pom.xml b/server/plugins/sample-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>sample-plugin</artifactId>
diff --git a/server/plugins/schema-plugin-api/pom.xml b/server/plugins/schema-plugin-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/schema-plugin-doris/pom.xml b/server/plugins/schema-plugin-doris/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/schema-plugin-mysql/pom.xml b/server/plugins/schema-plugin-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/schema-plugin-ob-mysql/pom.xml b/server/plugins/schema-plugin-ob-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>schema-plugin-ob-mysql</artifactId>
diff --git a/server/plugins/schema-plugin-ob-oracle/pom.xml b/server/plugins/schema-plugin-ob-oracle/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/schema-plugin-odp-sharding-ob-mysql/pom.xml b/server/plugins/schema-plugin-odp-sharding-ob-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/schema-plugin-oracle/pom.xml b/server/plugins/schema-plugin-oracle/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/schema-plugin-postgres/pom.xml b/server/plugins/schema-plugin-postgres/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/plugins/task-plugin-api/pom.xml b/server/plugins/task-plugin-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/plugins/task-plugin-doris/pom.xml b/server/plugins/task-plugin-doris/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/plugins/task-plugin-mysql/pom.xml b/server/plugins/task-plugin-mysql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/plugins/task-plugin-ob-mysql/pom.xml b/server/plugins/task-plugin-ob-mysql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/plugins/task-plugin-ob-oracle/pom.xml b/server/plugins/task-plugin-ob-oracle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/plugins/task-plugin-oracle/pom.xml b/server/plugins/task-plugin-oracle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>plugin-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/starters/desktop-starter/pom.xml b/server/starters/desktop-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>starter-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>desktop-starter</artifactId>
diff --git a/server/starters/pom.xml b/server/starters/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.oceanbase</groupId>
         <artifactId>odc-parent</artifactId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/server/starters/web-starter/pom.xml b/server/starters/web-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>starter-parent</artifactId>
         <groupId>com.oceanbase</groupId>
-        <version>4.3.4-SNAPSHOT</version>
+        <version>4.4.0-SNAPSHOT-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>web-starter</artifactId>
