#3486: Fix alert_send_status may throw duplicate key exception and add limit for query alert (#11953)

commit.ref

@@ -1 +1 @@
-Subproject commit 5b6bebf7d522dcfa95521b64a80d291b77d813f0
+Subproject commit 4ad34483a50362a3d5e279d41cf716919afbaa1d

commit.yml

@@ -2,37 +2,130 @@
 branches: {
   }
 fileChange:
-  /docs:
+  /dolphinscheduler-alert:
-    newFile: !uuid '55ddf6a82a72bfa968f2670de068806aca110959'
+    newFile: !uuid 'd99afb4ae19d12aa8a2a1e7a6d256470a01a547d'
-    oldFile: !uuid '624dc0e2aff1ca33d301ab37b5c272a624ff5bbf'
+    oldFile: !uuid '68cd8d1166f6fe954e44e133562d4f8ed272608f'
-  /docs/docs:
+  /dolphinscheduler-alert/dolphinscheduler-alert-server:
-    newFile: !uuid '10cf85e53d3adda3763fc76bc5213facd84ab1f2'
+    newFile: !uuid '512c8c444b1c67c58cbac5197c0339e1401b7de1'
-    oldFile: !uuid '725bded7678f7f5b1b5ee83d64e8490ec8a02bff'
+    oldFile: !uuid 'c1348d7cb500083da6cec6f18308000c61f771f3'
-  /docs/docs/en:
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src:
-    newFile: !uuid '5aaadc2b805782db4a2c116ca5b83d229917a1d2'
+    newFile: !uuid '2e8681e58fd3746474033f6db58c21e29966141b'
-    oldFile: !uuid 'f73fbeb2bdabd99e12130b7b505e203210ffffe8'
+    oldFile: !uuid 'fc4fc9f40e6cdd638563d42f9c1299e2c14a5cda'
-  /docs/docs/en/guide:
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main:
-    newFile: !uuid '93ec0aa8fe96fb05105a05136c8d3d02d16efbd3'
+    newFile: !uuid '6b4dd0d80d2d62a638280a10e59b1230ab1a4cbd'
-    oldFile: !uuid '8c635bf8b237fe0365a31df856b7cf8163612d62'
+    oldFile: !uuid '8e8f9d436d7cbc30bbbab4b6da596048b22d1b00'
-  /docs/docs/en/guide/installation:
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java:
-    newFile: !uuid 'aaa26fc31dcba49b39cb9f96db89b8b73c84fb1d'
+    newFile: !uuid '51cd168930228794c5c14641a8fab9c153e79d69'
-    oldFile: !uuid 'e87e5a1c24b500ca49d62e0f21a13a9101259b6e'
+    oldFile: !uuid 'c52407758b6cc4e4d8b76e82023fea4eff3a945f'
-  /docs/docs/en/guide/installation/kubernetes.md:
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org:
-    newFile: !uuid 'd93a243c0d360b9d6d2bdfc8567361feddf11d89'
+    newFile: !uuid '0a35b334130aae8fa2a14b4c6fb57b78fc5112b4'
-    oldFile: !uuid '6656df36454e86b6774e6698035c7a11901904f0'
+    oldFile: !uuid '63ebf764a9224ed152b423308a7c5681ff11c5cf'
-  /docs/docs/zh:
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache:
-    newFile: !uuid 'd8d5acd12fb01f8ba640bc2ddc8acc62b6891d44'
+    newFile: !uuid '3a18531fe6d369c0ce43fa2575b517c71d90538d'
-    oldFile: !uuid '1382324d4900fd85c4703bd2f2da167cb006c09c'
+    oldFile: !uuid 'df91110c6ad7667e7124817e09c4bf664c295942'
-  /docs/docs/zh/guide:
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid 'd106434a016a99ff92e8310063db1f308ff37c7d'
+    newFile: !uuid 'd3d089731bd972f1ae55b17fd5561ff1fb209484'
-    oldFile: !uuid '986aa32ed7ccc608fcf3d8a51a615d3cfd40ff1b'
+    oldFile: !uuid '792414e5c2f927c9d9c3ea6b07337f4876a28851'
-  /docs/docs/zh/guide/installation:
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert:
-    newFile: !uuid '4389ace8993471ae6d12b2aa1103e911c4d06578'
+    newFile: !uuid 'b85587da6980cbf374b43bac54c0c565fbdd82b2'
-    oldFile: !uuid '3217033efbd5eb17682b27db6dbf13b8bf15ec63'
+    oldFile: !uuid '88c0b6da983594a50efd78009285cab270de0209'
-  /docs/docs/zh/guide/installation/kubernetes.md:
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSenderService.java
-    newFile: !uuid '3de1c51b09e9f28005caf3b55246e03b8d2ad652'
+  : newFile: !uuid 'dcd83995efc3a747abfa72eb5630ad578d2c0847'
-    oldFile: !uuid '053b38babe0498674aade0c65c934f200f25482c'
+    oldFile: !uuid '92b3cea45be2e40bbf936149a1c292d1f8fc663e'
-gitCommitId: !uuid '5b6bebf7d522dcfa95521b64a80d291b77d813f0'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test:
+    newFile: !uuid 'f8180cca4a7203d4c60477ea5c22f0e9fdf3d221'
+    oldFile: !uuid '54c35f111ed04af1371298c05f5415eaf4a8cabb'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java:
+    newFile: !uuid '57f16b91d1d96666bf7253998a7cde002ceb88a8'
+    oldFile: !uuid '6010de712a8e4d682fd2ed37eb06e63e37f2f22c'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org:
+    newFile: !uuid '42f1f79e9dd84dcfb94122a4121ad1a4433781fd'
+    oldFile: !uuid '0745d06ea1a059cffdf787362837985efb668fb8'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache:
+    newFile: !uuid '3b8234bbbfd6c01496da342722b9c640b1a5d8a5'
+    oldFile: !uuid 'c9f70e8cbe66c011fa741769eb1bb2d798768c78'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid '72d6ca0d74bdb9339399c4d44b6e920eadb9ce1e'
+    oldFile: !uuid '018f866def2ec53579db58271a7eb5fac303026c'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert:
+    newFile: !uuid '2498efeb6cc0b37df38c009b4c59a35b3f04f529'
+    oldFile: !uuid 'b3cabb3cf9b5ec3b9b5a8793748286d244c4b08e'
+  /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner:
+    newFile: !uuid '36bbb69139011e9421462835e8e38f3c8ffd7cd9'
+    oldFile: !uuid '41ef90f3209504c36c6527c0cf92626296afc46f'
+  ? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderServiceTest.java
+  : newFile: !uuid '095cf2f758b21fb803b67dec7d37b868dab6f52d'
+    oldFile: !uuid '0dcea24b311b2866a035b524503aaab501b1c2f5'
+  /dolphinscheduler-dao:
+    newFile: !uuid '69de67a7c36782a52f12b38c68a77fec2dba3f37'
+    oldFile: !uuid '4254dcbf906b11abe456a36e860408458bce5967'
+  /dolphinscheduler-dao/src:
+    newFile: !uuid 'ffab5c8fdef04624061ea4c2b69a3c8cf85775c5'
+    oldFile: !uuid 'ae98a43cb3f2117e124e6942e10f45374fd247fc'
+  /dolphinscheduler-dao/src/main:
+    newFile: !uuid 'cf70cef06a8218eb8a6e6a1e22b4d274cc40a375'
+    oldFile: !uuid '9e041fe6d4cf7cf79311853d15fac43cb96ef899'
+  /dolphinscheduler-dao/src/main/java:
+    newFile: !uuid '9234122299dd70c44474d3e5d4107ec446634509'
+    oldFile: !uuid '6a94e3ba36916348d5588823398c6054be7e46f9'
+  /dolphinscheduler-dao/src/main/java/org:
+    newFile: !uuid 'b57b6d8f718285e7dea6dab90b4bd99b39d1e763'
+    oldFile: !uuid '2de118330507da96f22c826e7aafc8f59b4a8249'
+  /dolphinscheduler-dao/src/main/java/org/apache:
+    newFile: !uuid '0789d8e53e609fdac58bbcad4cf3a8051cbb6889'
+    oldFile: !uuid '01a44fd7992d1422dabe54c318797cfa84549327'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '221db438a9c3129b3ef7340be5ab8fad8b7bc75b'
+    oldFile: !uuid 'd0a7873829026911acec6a42e6f80e06a2630455'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
+    newFile: !uuid 'f0069352471a35e4561f284b3e38caba912d4285'
+    oldFile: !uuid '026a11b195559f5c3e0caaa948a2f83913a1fc01'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java:
+    newFile: !uuid '169aa7aab98a4bfbff6ea13eaf46b9a3990f7117'
+    oldFile: !uuid 'd8a6730fb6557b2123078febd2b31f2a9068fc82'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity:
+    newFile: !uuid 'c8f9a7e77897bab621fd9a0faab7bd862b5436c5'
+    oldFile: !uuid 'f725fe14083410517a2e631792eb5c1c7b4d7a66'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java:
+    newFile: !uuid '421f3f76b700ce49ca191cd48815d71139eeda4f'
+    oldFile: !uuid '4b27a55b5a4a3d76345babbcc67a9a2fdf782dfd'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertSendStatus.java:
+    newFile: !uuid '77418030258ffcb001cde44a7e9de9b3db39667b'
+    oldFile: !uuid '32a291104a0a4b33e1a9d1eaff69cac838a9df47'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper:
+    newFile: !uuid '54f867c499b569c6b30ea191d8ebf155e3c2ca6a'
+    oldFile: !uuid 'd17052572b7de8eea1ab09d855ae77ec9c499447'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertMapper.java:
+    newFile: !uuid 'd5563be5187e093ee96e10e2b5f8e47b180a1a23'
+    oldFile: !uuid '1b6f29d43cbee7f0ae4a6f5b0089d38202058aed'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertSendStatusMapper.java:
+    newFile: !uuid 'b1a5fea153ffa3aa55c0494867eb40fdde2927b5'
+    oldFile: !uuid '62be65642383e6b04d3362977ab3bc3f1731d6fc'
+  /dolphinscheduler-dao/src/main/resources:
+    newFile: !uuid 'eff5c0a7439ccfa61522a710b9eaa587faa30f40'
+    oldFile: !uuid 'edc9036466afde4a6816f05fa6ed4bef2e929d8e'
+  /dolphinscheduler-dao/src/main/resources/org:
+    newFile: !uuid '337dd4c2b280cb8af0c9a0124b33211fc5181e23'
+    oldFile: !uuid '13e53d369ab55087c6096d72269297ce25ac7135'
+  /dolphinscheduler-dao/src/main/resources/org/apache:
+    newFile: !uuid 'e9fd5bbb14645389adac74c7fe1f31d7e0be4126'
+    oldFile: !uuid '6601155864888c5c12f19654b0398c066515580f'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler:
+    newFile: !uuid '4a6e6fc6beb5bdf273e6c42e467c9e6d3b3b0fc8'
+    oldFile: !uuid 'c9c9c92f6ad71aaa75d06e647f29bd3d3029d087'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao:
+    newFile: !uuid 'b7485b448c94749ae2b8f3dc8b4f51b06df65b15'
+    oldFile: !uuid 'c6eabc2b5332c69ab3d34d2258c90fb7ec46d48f'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper:
+    newFile: !uuid 'a012a38ff5e29e6a89c43de227a5b5273a59db2f'
+    oldFile: !uuid 'c3693075085dd30f673a0a035f64f489fbd48c68'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertMapper.xml:
+    newFile: !uuid '274c88cf02b02962840d64578e7ea891f827cf04'
+    oldFile: !uuid '1e83b4965b78f76f7eeedc31dfe47a47ec9dc549'
+  /dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AlertSendStatusMapper.xml:
+    newFile: !uuid '248d7b05731f5c097c5b2920c6b9c68048065d86'
+    oldFile: null
+gitCommitId: !uuid '4ad34483a50362a3d5e279d41cf716919afbaa1d'
 renames: {
   }
-revisionId: 3485
+revisionId: 3486