#3914: Split the upgrade code (#13436)

1. Split the upgrade code into different version
2. Log the dml/ddl sql in origin friendly format
3. Fix ddl of 3.0.0 and 3.1.0
4. Fix search resource regular expression injection

commit.ref

@@ -1 +1 @@
-Subproject commit 3b54de0c90083aaf0857362e7c237fb85ba3976c
+Subproject commit 713fdbc444fc0dbaf68c34277f9afa4561449336

commit.yml

@@ -3,39 +3,225 @@ branches: {
   }
 fileChange:
   /dolphinscheduler-api:
-    newFile: !uuid '691d45ae1e500b61ab0ce6c8101d5dd5ef39abb4'
-    oldFile: !uuid 'ca27bf26427b70f092eb36735802fdc1fc52906b'
+    newFile: !uuid '106394b7962e0d766e18d234aa28e8bf2ae2347e'
+    oldFile: !uuid '691d45ae1e500b61ab0ce6c8101d5dd5ef39abb4'
   /dolphinscheduler-api/src:
-    newFile: !uuid 'd05e66767175c8bdceb914fa9c3156591e4bcbff'
-    oldFile: !uuid '60a9625733deaa341c1b8bc3969f3b213f770504'
+    newFile: !uuid '694f56740ba22d2ec186db0f15c370d8ed77fbe3'
+    oldFile: !uuid 'd05e66767175c8bdceb914fa9c3156591e4bcbff'
   /dolphinscheduler-api/src/main:
-    newFile: !uuid '099d46bc3cf4348734d3472c38ec28a72c74feac'
-    oldFile: !uuid '3d59057bbc4c7fd53e2d4c736cc939a70de0a4c0'
+    newFile: !uuid '431f93764b9bcece5cd092a278412e89ae8da549'
+    oldFile: !uuid '099d46bc3cf4348734d3472c38ec28a72c74feac'
   /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '4d207a74d4822e0f9a0866164d5082e531b3efd1'
-    oldFile: !uuid 'f134502791fe0c74b2a3301ba2fa6ade29aca000'
+    newFile: !uuid '7e9422b10c553767308e7e97a72bd6282947c500'
+    oldFile: !uuid '4d207a74d4822e0f9a0866164d5082e531b3efd1'
   /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid 'aafccb23ea97f1653997110de554db381aa9c39e'
-    oldFile: !uuid 'b828e2700e81c349ed05268d3b3dedea7cc764d9'
+    newFile: !uuid '0ca4ec8988357810883690d64fdd877c950b1a1a'
+    oldFile: !uuid 'aafccb23ea97f1653997110de554db381aa9c39e'
   /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid 'd9d0f4a6552d229d5196138c224e0701932b50c6'
-    oldFile: !uuid 'b4f42d76d1f1789517503a6fa6528b7fde1f84ee'
+    newFile: !uuid 'ba34613b182b5131f135dd051d947f47b33a1fa5'
+    oldFile: !uuid 'd9d0f4a6552d229d5196138c224e0701932b50c6'
   /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid 'bfae464d48ea0ca2bca5920936f1a50a81df6f3a'
-    oldFile: !uuid '710d7eb0ab386109a73c3627f39e41fff6c1307b'
+    newFile: !uuid '4ea52781e2b10d4fed30e15457c45b75a26a37f4'
+    oldFile: !uuid 'bfae464d48ea0ca2bca5920936f1a50a81df6f3a'
   /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid 'f5eecf95cacb02aa37e66e876498383daa5a8f31'
-    oldFile: !uuid '2ab990f6336ec915366710bb8ba93f2d130c1289'
+    newFile: !uuid '10ac2b89f69cd31b798f33576aa92132a109d4ec'
+    oldFile: !uuid 'f5eecf95cacb02aa37e66e876498383daa5a8f31'
   /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '40eb25fe6503cfdbf4f835f104fa6d42f385c210'
-    oldFile: !uuid 'c70fcbbfd4f4a084ab0a93271d1df86dd38f6f81'
+    newFile: !uuid '16802e4acb376c9e94397982e573388b815ad953'
+    oldFile: !uuid '40eb25fe6503cfdbf4f835f104fa6d42f385c210'
   /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid '81bfeb7416d0d476a906f9c79c126bd134d86ead'
-    oldFile: !uuid 'd6aaf45ee0a58095a6edd41bcc7347e45697a5c4'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java:
-    newFile: !uuid 'ab71e9445c1d3c44baf9dab282b48377bba3a3b1'
-    oldFile: !uuid 'e79507c6b5a19b77a467a1f1e34032358e4a6320'
-gitCommitId: !uuid '3b54de0c90083aaf0857362e7c237fb85ba3976c'
+    newFile: !uuid '5beb8c239b52c9d15c3385010e1009edd1f39474'
+    oldFile: !uuid '81bfeb7416d0d476a906f9c79c126bd134d86ead'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java:
+    newFile: !uuid '430e84077ffcf5342e876b4fb8c5926f231c92e6'
+    oldFile: !uuid 'f1821fcb63972a823af6511322b826d9a176595f'
+  /dolphinscheduler-common:
+    newFile: !uuid '73f5faf4ea23c4915e9f1447444963dcd8ba1298'
+    oldFile: !uuid '3f3bcd13e5a98d2ec476391b851aa6e0148b77f1'
+  /dolphinscheduler-common/src:
+    newFile: !uuid '0e70785969a3187202855b4ed627784bb503ef57'
+    oldFile: !uuid 'a88c5d441f4012c0c5c55c41104c83bb34e2e8df'
+  /dolphinscheduler-common/src/main:
+    newFile: !uuid '209df684269f648d7fa542ef13b69f86fc9898a7'
+    oldFile: !uuid 'f27761e0cb04bd90a859e535595ee462feab31cf'
+  /dolphinscheduler-common/src/main/java:
+    newFile: !uuid 'f369968312bbe7d3bfde1c4dd8bf7a78287aa04e'
+    oldFile: !uuid 'b15d2787d8a1358fb43d11a6510efae71d8fe468'
+  /dolphinscheduler-common/src/main/java/org:
+    newFile: !uuid 'a5ae3db724ce33e0ad3adf21667b259764c13b96'
+    oldFile: !uuid 'b833e23a2adcbcbaaca1025bd1ac98b6ebca2aaf'
+  /dolphinscheduler-common/src/main/java/org/apache:
+    newFile: !uuid '652b43a0080f9693e923ffc1e3c48779f7083119'
+    oldFile: !uuid '71f560f1a6b3325d44525061a2ad01e505061f33'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '6e10a7c1defe621aa8dfca14cca45c38823d275f'
+    oldFile: !uuid '6a419abbc5b9e2796ef20fa0820d57051f98eac8'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common:
+    newFile: !uuid '2ab429f76703a30c3375f2d8d80136e11881a518'
+    oldFile: !uuid '9c2eda8673aac4f8fe4b0a293c02c17cab704a15'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils:
+    newFile: !uuid 'a2e3bb92789296f9e27025b43f1d203cd7a9bf14'
+    oldFile: !uuid '0af006b0ec8361a82116834efff92e10107e8ef9'
+  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java:
+    newFile: !uuid 'e3212931f2a1fcde7e5b53c2864d997bf6f74552'
+    oldFile: !uuid '33c632b8d6c49a57f61c61dbd2f9735735c896cb'
+  /dolphinscheduler-dao:
+    newFile: !uuid '46dacaec87b03ba1978f2c992dfc14d1e4ee9758'
+    oldFile: !uuid 'd6e6cab87a56b57fd70fd492318f29fe7c090645'
+  /dolphinscheduler-dao/src:
+    newFile: !uuid 'ab8e8f128fa6ed9216f061458607c2531942586d'
+    oldFile: !uuid '4ee076193eedfa0f545c54c9c25b4646f161afef'
+  /dolphinscheduler-dao/src/main:
+    newFile: !uuid '2121634ee561a0293eaaf85a848f03976bbfc30b'
+    oldFile: !uuid 'fe079d2c31628e5b6fe8f3618038e0d6fdbb3bfe'
+  /dolphinscheduler-dao/src/main/java:
+    newFile: !uuid '624185ae22b51ee3b170b98bb32cae0a0fd58c61'
+    oldFile: !uuid '642c25906d4790b7d5b709d8a219f3f6003249c5'
+  /dolphinscheduler-dao/src/main/java/org:
+    newFile: !uuid 'dfad59f1305e94d8f03e973d9b430b5210b8d888'
+    oldFile: !uuid '8989e86ea9aa2188e80d7042487fc3316d0dbb18'
+  /dolphinscheduler-dao/src/main/java/org/apache:
+    newFile: !uuid 'e61ca21eec30f59ff841b4e01690bcb511bde7a2'
+    oldFile: !uuid '837134bda0749acf8e14508eb2211860ce176844'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '06ac0d608de67c7a00e5d40f24445f310413f2fd'
+    oldFile: !uuid '7d5333365f0e68c0db157aff373877da51e097a1'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
+    newFile: !uuid '0d5abfd708f9c66cde1b639595813ab18558fd3f'
+    oldFile: !uuid 'f143d37e7d71c3607dffa9dfea651cc816facd13'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade:
+    newFile: !uuid '2413713d3c564fbe12c3b5ff29ee54ee9b6d88b4'
+    oldFile: !uuid '7abaee86f0ab451f47c6ae9d1f3e2fd1329130cf'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/JsonSplitDao.java:
+    newFile: !uuid '25bdb8b3cc9a7cd46f20b89a0ad916f5e9a6865c'
+    oldFile: !uuid 'f2cb65877f1b0da7ce246739e39204a89e8f0015'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/ProcessDefinitionDao.java:
+    newFile: !uuid '61fbf81900ff856c64cf80e4e10894b4db854c30'
+    oldFile: !uuid '75a66a5e2fb29e9e8e2db06711b1e1ea47aef790'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/ProjectDao.java:
+    newFile: !uuid 'e8e3f9ad2ced1e5b0923ff65fa95c4b6ef4f26fc'
+    oldFile: !uuid '2906902f5a71926a469abfa3fd60cbb6b5e5e90b'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/ScheduleDao.java:
+    newFile: !uuid '3717df0a6b697dddd03f7abc733115316f50d2da'
+    oldFile: !uuid '9d486d00779e9e49521422dd16f24a0c5b7202ed'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/WorkerGroupDao.java:
+    newFile: !uuid '797e4b94ea63aa60f03be5abae5b69d9bb84939d'
+    oldFile: !uuid 'e8a9fc7d8226c2bc25689e557462af65c13aa127'
+  /dolphinscheduler-dao/src/main/resources:
+    newFile: !uuid '413edc0e7608917689651f754450ce0f5e51644b'
+    oldFile: !uuid '9024c7905bf6f6625ebfda9a8d605955e7f2acac'
+  /dolphinscheduler-dao/src/main/resources/sql:
+    newFile: !uuid 'a5fbb83e043de687737ed2a6c1d47875e7444bc3'
+    oldFile: !uuid 'eb84ee7b37f075041516e0c841e44f4081bdac88'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade:
+    newFile: !uuid '09e6dbf5935492d8cb23c52cc41b5bcaaca12c04'
+    oldFile: !uuid '360570ff29a760ca12bb1c6914f15f02d7304dd2'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.0_schema:
+    newFile: !uuid '34aa4b75c4717c0fd571c88a316d90dec6ef96b2'
+    oldFile: !uuid '9c56eeb3fe630506a44417e861c79655e2526b48'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.0_schema/mysql:
+    newFile: !uuid 'bca6bfe185de2e1bf81ee6675968304a75926940'
+    oldFile: !uuid 'ea99fb3bddd4931c69e1d8c20910bda0131c169c'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.0_schema/mysql/dolphinscheduler_ddl.sql:
+    newFile: !uuid '72acb0205130e5896dd333abc74d6a7023895252'
+    oldFile: !uuid '630984e3b00a635556682c691e8de9f2e8954e6b'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema:
+    newFile: !uuid '51bdea8c3db95d5b8fc15b57139344d916899b7b'
+    oldFile: !uuid '53b3f7831870daf96d7d38ba8c5e01520a4d21da'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/mysql:
+    newFile: !uuid '02fb74cc3a3b24b4b9224fae93ac545b15959ca0'
+    oldFile: !uuid 'fdc343d3b2eec1693183b58092c46821f18f2d51'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.0_schema/mysql/dolphinscheduler_ddl.sql:
+    newFile: !uuid '85fe7390e8d4b40bcb3fd9b52b5e1d1d3b76c31c'
+    oldFile: !uuid '059f0d27ef1ac0803de8f223ee8af33f98bbddc1'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema:
+    newFile: !uuid 'e319d39ad8ee4ad69798ee51d3bcebfee58c41a2'
+    oldFile: !uuid '1c4ff8b2b9ac96d692fcd987ed64a24b30649b4f'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql:
+    newFile: !uuid '36de25a168b084f02e382e38e9d0e35cb7f3ca79'
+    oldFile: !uuid 'f93c477ad47072d3d98ca97642feaacd93167780'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql/dolphinscheduler_ddl.sql:
+    newFile: !uuid '989c9b51abcddddb0aba2130fdaed9f94f2b66b3'
+    oldFile: !uuid '978f1bf39f64b812210f96e4a159722779c621a8'
+  /dolphinscheduler-tools:
+    newFile: !uuid '5a35dddf12e4db33dd1e0c9b30ae86937c8a3ee1'
+    oldFile: !uuid 'f5d37972b8ea66748d6403754f1ccf582b0c787a'
+  /dolphinscheduler-tools/src:
+    newFile: !uuid '159c748c3c14cbfb21c08d5ff70e458f06d33644'
+    oldFile: !uuid 'f48be438b306b3372fecf9b19eeea1f7ad328d60'
+  /dolphinscheduler-tools/src/main:
+    newFile: !uuid '8c743aeb49f25e64e700a60ee7e379207d5ad0a3'
+    oldFile: !uuid '507bb4a511d75e23a012e67bc00252088d268188'
+  /dolphinscheduler-tools/src/main/java:
+    newFile: !uuid '11917b1f1f1a691dbb1cfa28845d76f386b852f9'
+    oldFile: !uuid '8e5c1f1083673f1423ea361e148463502370e3b0'
+  /dolphinscheduler-tools/src/main/java/org:
+    newFile: !uuid '6040aea1c0cdcc3d02ade3243c0aa92c5643a1b1'
+    oldFile: !uuid '8b8636ad449a12ae6a954497a6a0a7c94e4ba5bc'
+  /dolphinscheduler-tools/src/main/java/org/apache:
+    newFile: !uuid '8ba8f08a11066c7b6f105faf0a93b651d4b42b31'
+    oldFile: !uuid '6fc13c93791cd08a4b3d633f4db2c74b6999873a'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '94a23f358e6a557bf37d53bc0ccec337c7839c2e'
+    oldFile: !uuid '8f326461c2ef7b24d4b1f5870061234553359e6a'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools:
+    newFile: !uuid '70c06d1664cb38f084550c972ae52b0cc4e1ad1a'
+    oldFile: !uuid '9623d55e5a9163447c405b39064a33762ee39d9a'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource:
+    newFile: !uuid '7d9e3c01a44f33a704fe3bac2a778d88d5ad6689'
+    oldFile: !uuid 'ded67d4dc70e90a38407aa0059b6d02bf6d59a27'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/DolphinSchedulerManager.java:
+    newFile: !uuid '74cf4476210cd84bcd594e50a287da0513212c57'
+    oldFile: !uuid '3fe4d0c2762b34f8e5d756c8ad1f3b84869ce336'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao:
+    newFile: !uuid '5f99f7a1dbca2eb1cd59c2884020ad10355d9313'
+    oldFile: !uuid 'd4f8efb001d0bc8ebf3bb41ce89c2fcb85ccdda4'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/MySQLUpgradeDao.java:
+    newFile: !uuid '20651213ec14e97b0def7dd4e27648bc59cc156e'
+    oldFile: !uuid '73619320349fd6a3227c2e565f57d2408df4cc05'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/PostgreSQLUpgradeDao.java:
+    newFile: !uuid 'd854a6ef7abe645fdb05b96609cfbaf183020371'
+    oldFile: !uuid '43761ba56438f7f2c3e5bdfe4e77be494a78de84'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/ResourceDao.java:
+    newFile: !uuid 'd542428a115e929966d32c8dc44146e79517462a'
+    oldFile: !uuid '6bfe47baca68ad48c213517be3c328cb46b46c31'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/UpgradeDao.java:
+    newFile: !uuid '201dd5dfba824b3724b1c72959a7db3e62dd3fb5'
+    oldFile: !uuid '7b4bb6b646f8794370371116cc90dec12dfeb936'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader:
+    newFile: !uuid '158f1082dd948f19e802ff0eb0cbe426f31b505c'
+    oldFile: !uuid '76062ff3dd93c1ac7a2d2c2cd4df27aac24b69d6'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/DolphinSchedulerUpgrader.java:
+    newFile: !uuid '006a7438df403c8b485cc21132a89e731a693077'
+    oldFile: !uuid 'b9d7d0edcfb10147b26ba3c04bf4e68fdcbe8831'
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/DolphinSchedulerVersion.java:
+    newFile: !uuid 'e28d04fe306df070ae158fa22f6ae09538da891b'
+    oldFile: null
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v130:
+    newFile: !uuid 'd15d7e36ad5a8816db68fb5c52b4c7ed75c04e91'
+    oldFile: null
+  ? /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v130/V130DolphinSchedulerUpgrader.java
+  : newFile: !uuid '27871277bf02f804cde999a3bd5eda43a31467f1'
+    oldFile: null
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v132:
+    newFile: !uuid 'f9c31def928971eb8b514706bbbb11e11c34ccbc'
+    oldFile: null
+  ? /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v132/V132DolphinSchedulerUpgrader.java
+  : newFile: !uuid 'abb7045e348d31961e6d9d71af69e0d06e50cdd4'
+    oldFile: null
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v200:
+    newFile: !uuid '029057c393bdcb4ece55a85e4f062f1015d3dd9c'
+    oldFile: null
+  ? /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v200/V200DolphinSchedulerUpgrader.java
+  : newFile: !uuid 'c986119d8c037c3645a4750298eda00aaddb72cd'
+    oldFile: null
+  /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v320:
+    newFile: !uuid '97bc484844c9549a13d011fc1e9f848e254a97cb'
+    oldFile: !uuid 'ce59a7bffd25f4568411ea624690338080bfbd91'
+  ? /dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v320/V320DolphinSchedulerUpgrader.java
+  : newFile: !uuid '32e6b011d64b8bbe7217fb5a4bc9f2ff548fd9c5'
+    oldFile: !uuid '293ec2a61a40e615d24824af931f6221ae978986'
+gitCommitId: !uuid '713fdbc444fc0dbaf68c34277f9afa4561449336'
 renames: {
   }
-revisionId: 3913
+revisionId: 3914