#3810: Prevent default alert group from binding alert plugin instances with id 1 and 2 automatically (#13114)

commit.ref

@@ -1 +1 @@
-Subproject commit 8a152aebc70f57cc400c1cd8b16991817bed0d0e
+Subproject commit d9f43adafdc6a0db3d17777fa8432122bd2acc9e

commit.yml

@@ -2,163 +2,31 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-api:
-    newFile: !uuid '01e1c6e85ce1fe74835cfe61ea3baa74ac51b62e'
-    oldFile: !uuid 'ec65b4029be4774be3317058b4beafa080d71831'
-  /dolphinscheduler-api/src:
-    newFile: !uuid 'b209144efa26d722cdb4f303e1ecc33f38bd6c00'
-    oldFile: !uuid 'f241b60fe75983265781fc645276f5faea9a87dc'
-  /dolphinscheduler-api/src/main:
-    newFile: !uuid 'b1b16eb3c516852ec5532fa62f71b33f7526691e'
-    oldFile: !uuid '6a4295827756241efd0994a7fd43bcdd06153456'
-  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '3570ab5fb983f507ba2870c68fee84e99b6ef992'
-    oldFile: !uuid 'd991ccbf8d01be05367e73857579f5a1a7efd8c3'
-  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid 'dfa1576ce45dc8444324ac42bd4d294f4b76cdf4'
-    oldFile: !uuid 'f58a24abae9707de908c47174e515d05d80cee24'
-  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid '2fee59c0ad6d2c007bb6db962442fc0bc33209f1'
-    oldFile: !uuid '56054f352f17a251aec63c12e283f3e0d94c382b'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '91db2cf4c9fe6559ea055a23736aa499a063a3c6'
-    oldFile: !uuid 'ffb15ec86025e2f0aaa6e5bfbd0de2217ebfbdec'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '966f7e9f52cd1b3883d1d9b881714dd9c90e0c71'
-    oldFile: !uuid '5200c5823d5f67a27f6d471100d7ea4170211739'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid 'c402159e9b4b7f18fa5081d2dce705f0a0a44af3'
-    oldFile: !uuid '563635d133976a7b19251a6c5124ceb6f25cbc47'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
-    newFile: !uuid 'df4c53c674e44c0b53158c442be51180482554c2'
-    oldFile: !uuid '12087934fb18705ae79c3a7fdf4bc40d8d77e431'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java:
-    newFile: !uuid 'be1ff200dd2897284e62e2d0d8e4e992ce2d6d86'
-    oldFile: !uuid '5f46c761acbac135cd0241df71f0697bec5deab6'
   /dolphinscheduler-dao:
-    newFile: !uuid 'a44c68a70618cf80444e08ec920904e506b69383'
-    oldFile: !uuid '607f10ae284956e3ed2c3d6be422061bc7285a35'
+    newFile: !uuid '9351cd63645dfce0f555a6b18c81639a976c8a8b'
+    oldFile: !uuid 'a44c68a70618cf80444e08ec920904e506b69383'
   /dolphinscheduler-dao/src:
-    newFile: !uuid 'b680ed8fd650363c335abcb907e57ef0d3b4a5d5'
-    oldFile: !uuid 'f03d2d98dbc5764ef6db15e79d0de6a33c1960c9'
+    newFile: !uuid '014344b55327a79dd1015e39490a2dba1ecd0815'
+    oldFile: !uuid 'b680ed8fd650363c335abcb907e57ef0d3b4a5d5'
   /dolphinscheduler-dao/src/main:
-    newFile: !uuid '31722f7e7a82743e6c5e639cf59ef4608df393a6'
-    oldFile: !uuid 'a181331186c9d202836bb3ac6ef654c83d1aa2e4'
-  /dolphinscheduler-dao/src/main/java:
-    newFile: !uuid 'a9a897bfeee82a9f0478783df550e023aba798eb'
-    oldFile: !uuid 'f9265c39db83836c7bc8270835a3643f33e68811'
-  /dolphinscheduler-dao/src/main/java/org:
-    newFile: !uuid 'f0360ddfa217e452f51a0aac3efe25295ae257f0'
-    oldFile: !uuid 'd6d217f5c47247dbe276657f3e6c807f3327e24d'
-  /dolphinscheduler-dao/src/main/java/org/apache:
-    newFile: !uuid '0c37e7fa3c2e946bda1b22b992a999e4d7d0aecb'
-    oldFile: !uuid 'accc98f79580f9abd97bc0e3920e03acaf32ceb7'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '1977b2c534dfe6a0624df208cff547fca6a0da63'
-    oldFile: !uuid '1336637339a2a7c4570a1a20439ea7e9e91b257d'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '7709305a78336e55e7649e782353435f9ca99cb7'
-    oldFile: !uuid 'dd9553440f9935104749f1b00e0d980f05ef38bc'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid 'bb1feb304be7f5004d0e79c041ae7f80f2721430'
-    oldFile: !uuid '39d2d01a0864d18b8018e3f36a34d2fef1ec5de9'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java:
-    newFile: !uuid 'faa481e29439bbdfc74510458e39c6e4959cbb35'
-    oldFile: !uuid 'cd27167bfe63df45c3dcaf1cf60605cdd9245c55'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository:
-    newFile: !uuid '070fd2d96cdf6b7a0d83feaf2840d3ea2e718a7a'
-    oldFile: !uuid '00b812ad746608762731afc47c4d541c13a9efba'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/TaskInstanceDao.java:
-    newFile: !uuid '4c16a56322f6e7b12ee33b134b079997a78fd374'
-    oldFile: !uuid 'f132bbca641303bd6777608a7519884b5fcbb879'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl:
-    newFile: !uuid '6ba51692919de86fe0a7f12509ffd1e85c0086ba'
-    oldFile: !uuid 'e08a3d93b8e67e2998dd45c23feac437e064f021'
-  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/TaskInstanceDaoImpl.java:
-    newFile: !uuid 'aca18171b704639fae03a663a27d9d77ad391e76'
-    oldFile: !uuid '21058b6d953cb6d92a85b1287e2dd45b096e1ccf'
+    newFile: !uuid '196c3614b617adf6c720b8a58eb9aa3440c83c9e'
+    oldFile: !uuid '31722f7e7a82743e6c5e639cf59ef4608df393a6'
   /dolphinscheduler-dao/src/main/resources:
-    newFile: !uuid 'bb78951a7f7fb4e3635223a62faaff18a30aa288'
-    oldFile: !uuid 'bf6bd31bd703a19f15256bd450434de9db6844d1'
-  /dolphinscheduler-dao/src/main/resources/org:
-    newFile: !uuid '89de71232f9bc18976503fa5bb40d481f6f1a14d'
-    oldFile: !uuid '432d81778470b7a11868a073554fe2352a84ebf2'
-  /dolphinscheduler-dao/src/main/resources/org/apache:
-    newFile: !uuid '88ea0586b4d92a5fff7e76bced29de9dee02f4ee'
-    oldFile: !uuid '61722c0a07249a92b612b485249b68ecd5e46b33'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
-    newFile: !uuid '5fb984e92e0294790510f28f16e958b5427bc271'
-    oldFile: !uuid '303f2b57f6ebe6e628f91d2cf2880f49d1d1dd0e'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
-    newFile: !uuid '97395c897726f9c2e42af286cf22d10555a97108'
-    oldFile: !uuid '86eb2173802f9e94ea2c0f30bfa7aefe6b766daa'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
-    newFile: !uuid 'c44b9c8cfa2e5c1bb22a746760a4a7227f2a93de'
-    oldFile: !uuid 'fb617650497c534c5aa0548c36e9f516f363ddd5'
-  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml:
-    newFile: !uuid 'd3726ebf956e6daefa1f48440f64d623239c4516'
-    oldFile: !uuid '3d988683ff14fe2834996cf89377994b45051a2d'
-  /dolphinscheduler-service:
-    newFile: !uuid '6b0675cf7274f6460c08776e06b420f0fac0feca'
-    oldFile: !uuid '6b58939da98a3c8245d59d6cd897e6d4cb7a9c7c'
-  /dolphinscheduler-service/src:
-    newFile: !uuid '1cf8594c5fd05bd2e002d63e199da0e226f7820f'
-    oldFile: !uuid 'c4e8ccffaf00fd9a37559c7a4e8bbc303e47c38d'
-  /dolphinscheduler-service/src/main:
-    newFile: !uuid 'd03d6195b0007a093a7ffe40d2ff864697b70f1b'
-    oldFile: !uuid '756d67d1c190769e678ddf590a3d6b1c66002bb6'
-  /dolphinscheduler-service/src/main/java:
-    newFile: !uuid '0f98f9a4ccd2bbdc6246b71ac98ccb66c960e476'
-    oldFile: !uuid '97b3fdcde0c1ccfe0e992f96194108d32a95228f'
-  /dolphinscheduler-service/src/main/java/org:
-    newFile: !uuid '32f46d4d2cd8577ea465cf7cac03e473ae6c9213'
-    oldFile: !uuid '1873a53831d206bc6897a11647ea74bd0c7fc894'
-  /dolphinscheduler-service/src/main/java/org/apache:
-    newFile: !uuid '4dcc018f814001bf1e71bf12104074158008d7f6'
-    oldFile: !uuid 'd27d0acd33974bd33e97f618775f608c07f8c0ba'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '480862f0c732681fefcb8d3f41963851459eb82f'
-    oldFile: !uuid '6be436c2036d38535a1e5763d12bb54beb06cbf9'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service:
-    newFile: !uuid '229803a7cdfc99376ebc66a23a95be9cd11cfd85'
-    oldFile: !uuid 'd38a1d6318f02e4fa294af13743839badcf7f042'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log:
-    newFile: !uuid '74c7bf3915d25959f6656cb85a67ead84afc6b7d'
-    oldFile: !uuid 'edf0caf6f82536f99f9ef1d6d6b8817a4927f6c1'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/log/LogClient.java:
-    newFile: !uuid 'f1f1e54a5fdf7e1872984f3f67abd9262db088e5'
-    oldFile: !uuid '5eac21452d87ef58ffe76d2af6209b162c0b7623'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process:
-    newFile: !uuid '86caf6ddd71436b0e6411b572917ca730aa790f3'
-    oldFile: !uuid '4ac46b9a4a5f1d2fbd0156201bd1e8190ed1bf64'
-  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java:
-    newFile: !uuid 'cc40fadcf75b293d465365ae81a7ba18c5c4cbaa'
-    oldFile: !uuid '226050dcb5761dae3796477b83911d43f4024a9f'
-  /dolphinscheduler-service/src/test:
-    newFile: !uuid 'ca6381e22a6564ab550676e47671e53dab8e202d'
-    oldFile: !uuid '27c929e479af94d61ec1a90fca0f601c3a15862f'
-  /dolphinscheduler-service/src/test/java:
-    newFile: !uuid '6de6f8c014acbaf4e350caadc8e3106e641cdab0'
-    oldFile: !uuid 'd9d10a6cbb0e880363fc1ab2ea0f4bcaff33c839'
-  /dolphinscheduler-service/src/test/java/org:
-    newFile: !uuid 'ba1bc51c0857820da2e8467cc83c4f8242cc9f3f'
-    oldFile: !uuid 'd1c3bebe124eaf4a7697b65401967ccf3a71e6ec'
-  /dolphinscheduler-service/src/test/java/org/apache:
-    newFile: !uuid 'b75feb0a8be185e7553dade77f3235ec9df3b3de'
-    oldFile: !uuid 'ce33ec605bf0d9ee755ef0ea32f2e10596f0e1c0'
-  /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '69060bc6910d0ea9478d73439ecf55408b373187'
-    oldFile: !uuid 'c3fc69f1aaf82d25317714337726af0d674e799b'
-  /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service:
-    newFile: !uuid 'e2e290951137fda2dffeaea03bfdd13f5248facb'
-    oldFile: !uuid 'ad4eb0d4a2a65c4d8875cc86a20501bdb3e5459e'
-  /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/log:
-    newFile: !uuid '45e5e8d474aeba2f51868214fb601ceb385689a5'
-    oldFile: !uuid 'f38e75587e77ef23c351fcdb2f99efb03a65d63f'
-  /dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/log/LogClientTest.java:
-    newFile: !uuid 'faaad4fd7e8c31b3bed0efb6f41f134128db3583'
-    oldFile: !uuid '9ccfadd49d2145ce9beab1b34d03b0cf0db736ca'
-gitCommitId: !uuid '8a152aebc70f57cc400c1cd8b16991817bed0d0e'
+    newFile: !uuid '71ffa838bd2c6f577f1a452bf45b629a1adb752f'
+    oldFile: !uuid 'bb78951a7f7fb4e3635223a62faaff18a30aa288'
+  /dolphinscheduler-dao/src/main/resources/sql:
+    newFile: !uuid '1839c1c40f55c10f4a57ea833164a56dd81e6b42'
+    oldFile: !uuid '88e75f26f2647815d3cc7ed9fde17154fa7be481'
+  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql:
+    newFile: !uuid 'e4b767d6c52f55c24db23ef7c070f1ea7e93d356'
+    oldFile: !uuid 'b1511c2511f1375a390101bf710123a810dd670c'
+  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql:
+    newFile: !uuid 'eeb15e7dbb50bba62d869293a6474ef4d18f7f4a'
+    oldFile: !uuid 'e7a0c8ce0d11d2a6e4328407fd803206d7ef8021'
+  /dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql:
+    newFile: !uuid '32a57342d4df566d36953dad169b88e4bf5ccd24'
+    oldFile: !uuid 'e97da2c29b34de61dcdc79ea1cce49fa31cc33bd'
+gitCommitId: !uuid 'd9f43adafdc6a0db3d17777fa8432122bd2acc9e'
 renames: {
   }
-revisionId: 3809
+revisionId: 3810