Browse Source

#4043: Fix schedule time data primary key conflict when importing workflow definition (#13926)

git-as-svn/v1/dev
Kerwin 2 years ago committed by GitHub
parent
commit
0ef9730f15
  1. 2
      commit.ref
  2. 277
      commit.yml

2
commit.ref

@ -1 +1 @@
Subproject commit 61a689aa5aaea5cbb29235dfaaa629804f4b4464
Subproject commit 51afbfe159260216b806f0c3c3c20648cf01c0ac

277
commit.yml

@ -2,247 +2,40 @@
branches: {
}
fileChange:
/deploy:
newFile: !uuid '89ee493a88c7748461e3b0534e9eb6d51ba2934d'
oldFile: !uuid 'a8988801e835b34570a9d4bde58eb26492b9bbf8'
/deploy/kubernetes:
newFile: !uuid 'd10c640730c8da40ee012c0a474dff01f434c484'
oldFile: !uuid '2168c17fc0415785e41ec07d9664e8fe023cae3d'
/deploy/kubernetes/dolphinscheduler:
newFile: !uuid '67ef227bad659410a45a5a541908e4d7cf47dabb'
oldFile: !uuid 'af91a7c7e6fcd58574e726e6d9afdca808f2f3eb'
/deploy/kubernetes/dolphinscheduler/values.yaml:
newFile: !uuid '6f163b589b2383d75984406767478884f9a6aa63'
oldFile: !uuid '73d739adc23f51fcb4a3d6449cbdc6d93021371e'
/docs:
newFile: !uuid '37a0b160374f68aaeb25f18c4a4ba6cc52539f01'
oldFile: !uuid '4df2ba0c9e938013c47f0657680d535d6b4b234a'
/docs/docs:
newFile: !uuid '6f26620a3d2ad20950028133fcf3640f4bb1f493'
oldFile: !uuid '138473cdbbe11fad3bffb663ce8ca68e0a020c23'
/docs/docs/en:
newFile: !uuid '61e952ed229af177df65e09a828be6a8916f1f30'
oldFile: !uuid '3c4ea9b4d08dd4332a7e9cbaed0c686c193b3786'
/docs/docs/en/architecture:
newFile: !uuid 'e64c086b660a3116a63e3a6f39f1945c832da779'
oldFile: !uuid 'a1ee52485b9869108f8fb27a1d7d997fe0e2f805'
/docs/docs/en/architecture/configuration.md:
newFile: !uuid '4a03a58139b2096652a82066631b429123ab2f6d'
oldFile: !uuid 'a03e7d6b8ba61988d09502e94373a96cf321b76b'
/docs/docs/zh:
newFile: !uuid 'bd3122039886d0e5b68cd29c2bb6e9166dde44ad'
oldFile: !uuid '20b4bfc9ac6ada95bbb09123ce9609a4c4487eac'
/docs/docs/zh/architecture:
newFile: !uuid '6c3faaeceef9790cd19f9bbd57f5e2eefb6dd439'
oldFile: !uuid 'd39df2606eecce1bfc2c74b8a7a8f1bdb6147ffa'
/docs/docs/zh/architecture/configuration.md:
newFile: !uuid '9ae5e7bfab753aa064899cedc33f9bd497677f86'
oldFile: !uuid 'd61f3a1834fb8d4e163790c3bb36c2f0bc33ad61'
/dolphinscheduler-alert:
newFile: !uuid '9cb3e25deed0052788adb73bd5e0081e465ab9c2'
oldFile: !uuid '44a1300c5a01b52cb64729375606cbddd1bddb28'
/dolphinscheduler-alert/dolphinscheduler-alert-server:
newFile: !uuid '140d966e5fc224f0a6cca5d9d9e3e0155d8f7493'
oldFile: !uuid '13acac4b56d261d7886efdcab3f2bbe09f0fe72c'
/dolphinscheduler-alert/dolphinscheduler-alert-server/src:
newFile: !uuid '6851d48e5fcc3902735a791f3d5116aa7918dc25'
oldFile: !uuid 'ae503e712cee683b76881152a997092e7a8e6467'
/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main:
newFile: !uuid '201c0e414e5569bea08ffffe7b00505ceec6a09a'
oldFile: !uuid '0240922d582fb69d0adfb215652a3c2ec2b16039'
/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java:
newFile: !uuid '5b88edeb91bc677ceeac614c1dd1f17f96342ff9'
oldFile: !uuid '50ead842e4844747364d9f37ae1e5f10d0a6ca30'
/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org:
newFile: !uuid '32535808b70ef23817a9b6c620e12df9d3468517'
oldFile: !uuid '2b4c699b513cb07d8a03b9511ce229d2c99187d7'
/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache:
newFile: !uuid '66bece9ff81dacd445d288335e78e0200c97b9ad'
oldFile: !uuid 'bf07f8e57f0e079b2a2360c24216d9bf293f6003'
/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '5375f48c1ebc6c52ca157acd003348f91fa7e23b'
oldFile: !uuid '097907ab0793e2dd3b9080746c3c8ac22abe1f83'
/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert:
newFile: !uuid '5bd9bb67cf1bf2ac5c752df7f79ce3437aa3d3c5'
oldFile: !uuid '6366f78e9d2a420178395df1cbf6d86a0ff8267c'
/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/registry:
newFile: !uuid '67ebf32a943ee5a7fbe230e7a78a238b4541d663'
oldFile: !uuid 'a27dd9b7a17ae4250b25d92f10e1242158530564'
? /dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/registry/AlertHeartbeatTask.java
: newFile: !uuid '31b30ae42bef2ddefd79d0093a8585fd7bfe2568'
oldFile: !uuid 'a5a0056d84c00606c162cbf29ddc0ed4008931b3'
/dolphinscheduler-common:
newFile: !uuid '53036fdc16375fa2af148c7670fa96cfa581bbb4'
oldFile: !uuid 'b2b14281c381774782b54572fb81fb578259f97c'
/dolphinscheduler-common/src:
newFile: !uuid 'e3a22eb9edd781fb5a8fc92b36a4fcd5e68b87c0'
oldFile: !uuid '58596e3a0376ead46259ddb7c6dda52ba531638e'
/dolphinscheduler-common/src/main:
newFile: !uuid 'b639f4f9c43a84a7d662dd3df5384868f081a530'
oldFile: !uuid '9125d25d73b649334bdcf0330f710e9c3bea87ce'
/dolphinscheduler-common/src/main/java:
newFile: !uuid '8e02418311efd21397be2e05be5f93d2124d2b65'
oldFile: !uuid '6999a133cb3a5caf3c717fd66972e6193d00f60a'
/dolphinscheduler-common/src/main/java/org:
newFile: !uuid '05368ac08969a6da6f37c01197c5ed178a497e0e'
oldFile: !uuid '712b6bcfd037b2aadcd078e538a149e3377c0342'
/dolphinscheduler-common/src/main/java/org/apache:
newFile: !uuid '90cbc414ac665502275b3f9a7d124fd0d1a1e9a2'
oldFile: !uuid 'ea0da09cffa65e7e70a2435b1423c0b5963ca74f'
/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '3c86d1bdcde2aa0f704342245058685dfe04a0b6'
oldFile: !uuid '490e969210b5e0a426c719384067c74dba96b98a'
/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common:
newFile: !uuid '2b6519616283b0e774c7d1e0e429f826bd34d2bf'
oldFile: !uuid 'dd4611c1e81baeb51426dae7346a299711377d8d'
/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model:
newFile: !uuid 'ba03702898b809ac900f8a31f87063bb29ff9546'
oldFile: !uuid '3ac147c2379d68b3ffa9a37372c912b577260173'
/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/AlertServerHeartBeat.java:
newFile: !uuid '4d3610b7fe1b7aacef6d460b3af78f3327cb5550'
oldFile: !uuid 'a89c9031872d22fbe8e8562c860772f3d26d40b6'
/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/MasterHeartBeat.java:
newFile: !uuid 'b6086b9bbe35a4be52bfed2b5dc10b8ff6f8ad2b'
oldFile: !uuid 'e9552f507df6d1e645c034fdaf82226026202563'
/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerHeartBeat.java:
newFile: !uuid 'dcacd75c6c044c361d93673a11940ae23d530341'
oldFile: !uuid '4bc5c044bc60b41a15a19db6603cdbced107fff1'
/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils:
newFile: !uuid 'ea8199109733b2de625a5ccdb734f5bcea15d5bb'
oldFile: !uuid 'ff3485542e62f1d5a8160507958427567bb6683f'
/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java:
newFile: !uuid '678abff0c6c396474852b9aa83f5c92deece652a'
oldFile: !uuid 'e95886ba486f29e766469e3cd27808e061e45396'
/dolphinscheduler-common/src/test:
newFile: !uuid '7ee4206d1013faaa07fb9446ee9b53d29fde2a1c'
oldFile: !uuid 'ddf9d1482c64ff3a268e03728ecca7e0902c4988'
/dolphinscheduler-common/src/test/java:
newFile: !uuid '421c669d19246cc8c74bb154ffef075d9f68d932'
oldFile: !uuid '3e75720d57a2b31bd93a4986d665c9dd3e522c8b'
/dolphinscheduler-common/src/test/java/org:
newFile: !uuid 'f73f745facc7dfe53cc9a87593a093b168dea617'
oldFile: !uuid 'f676cb71e03dda1ac9feba7ccc67f12e1bc5ae38'
/dolphinscheduler-common/src/test/java/org/apache:
newFile: !uuid '8c31dfbde0fbcc99addc973b10b5db14a60b8bc9'
oldFile: !uuid '77268f94e2ede5351288c31e89ac146d55112417'
/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler:
newFile: !uuid '33205ab83126392b097f71a2543f2c3adf9f62dd'
oldFile: !uuid '440350be211197cee78d62312559ba4110b5bc8d'
/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common:
newFile: !uuid '3715c3c1edac2f6019757bfc7441a5bb2ab7757a'
oldFile: !uuid '6a0a112ec7eef7f73c73f4b20e24eb12a89573a2'
/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os:
newFile: !uuid '8841241e55581c9445b9fbbe5042498b91c07c60'
oldFile: !uuid '01fe4422a26dbe0d430911767ce5718205ce145f'
/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OSUtilsTest.java:
newFile: !uuid '4c37e99dc1cd44b7eac0c40a2ffa174db4fdf21d'
oldFile: !uuid '561f2a73f2f7c3cb73f7ce862c71d8d8c7d9c446'
/dolphinscheduler-master:
newFile: !uuid '9d6cda82324e4f40e96dff8d0e2ae35054bb4586'
oldFile: !uuid 'd6c4ebc8b2da085d86e29e15b57c403ad7b2f8bc'
/dolphinscheduler-master/src:
newFile: !uuid 'e27a671ca1df65961f51fa05312423de2a537d9d'
oldFile: !uuid '8932c11ba07c13135d36b00239831a628f5368fd'
/dolphinscheduler-master/src/main:
newFile: !uuid 'f22797c427fa909097c6d7c3b955e13fc98c037b'
oldFile: !uuid '193b162890a6920ec8a2a9786815b9a411374001'
/dolphinscheduler-master/src/main/java:
newFile: !uuid '966dceb8354623b27e281d11d18fc33a51db0bc9'
oldFile: !uuid 'c1f5017f3a5bd19298b19d32eb422c96da81f83e'
/dolphinscheduler-master/src/main/java/org:
newFile: !uuid '6ea06ea7e66d08db1f99177af44f848a06a6e1c8'
oldFile: !uuid '5607e7cc20e695a9311fe8d5feca5241805266a0'
/dolphinscheduler-master/src/main/java/org/apache:
newFile: !uuid '174deecf9eebc6685c028cfff24706a9a1c5ab75'
oldFile: !uuid 'd5b5f43475162e831390c384c6ccaba670b61cd9'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '5236fc87f4370a224be21be2c751667f506f2d23'
oldFile: !uuid 'b6d74cdb2135e32f04c9e54c93fc94b6932cf028'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
newFile: !uuid 'c801caa2498cad0647f29a0ee8fd8532c7abd25a'
oldFile: !uuid '7af9580585ba84c0674b0387542d94c022a53d72'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
newFile: !uuid '7d922ba660cd1ef9b53c0fc1c83ad172e2257c90'
oldFile: !uuid '2b050741450e98b16b72c7970533d28750e18369'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/config:
newFile: !uuid '435469ce518427fa0668afb733339b6c2d2634d5'
oldFile: !uuid '8718dfb70e6fa7368223e8770aa29a89cc2d41c3'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/config/MasterConfig.java:
newFile: !uuid 'b878b2a4febb479849fea815f98acc54edb44fa4'
oldFile: !uuid '5cbdd4d310bc1323629b97109655e44eb9af3c8b'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/task:
newFile: !uuid '18b6844ec288d22944982226f3f79aa5202a5d8d'
oldFile: !uuid 'bf40d8721fd4016a8fc382f63cadebc955913704'
/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/task/MasterHeartBeatTask.java:
newFile: !uuid 'a28b0261926441a8fea4ed3287da701d37dfcdae'
oldFile: !uuid 'cacad78c3baea19401d38e051851a3e669bacc59'
/dolphinscheduler-master/src/main/resources:
newFile: !uuid 'a060056e3c7b7700623e1989f6d73650f7475b48'
oldFile: !uuid 'd9b70a4d2002b5fe6375f5baa64b9fb883d6fc09'
/dolphinscheduler-master/src/main/resources/application.yaml:
newFile: !uuid 'bab902fb59639ff08bdc64b111e8d3877d61c3ce'
oldFile: !uuid 'e333b566b6ea6209dc983ef585bbe0d91043d783'
/dolphinscheduler-standalone-server:
newFile: !uuid 'c0143681e45d641c107e27763f6c5c212804d791'
oldFile: !uuid '3ffd7f22125a42efde836bd1caee62085ac0c435'
/dolphinscheduler-standalone-server/src:
newFile: !uuid '9ce00ef3d6758c3cc48f71d85aee79e89697dec4'
oldFile: !uuid 'b387b8057c089d09302bc99ca83da81a618e5244'
/dolphinscheduler-standalone-server/src/main:
newFile: !uuid 'd7e45ea7bea80555ccdf4c396d7c655e3e467ee1'
oldFile: !uuid '2a8ec0e1dbe9e4dd0715669f2146ef4978bbb448'
/dolphinscheduler-standalone-server/src/main/resources:
newFile: !uuid 'd2fd39b9b72cac7b4fe2f3b4a13aabd06a449e46'
oldFile: !uuid 'ed0c9aea49e362e3fb8ce65516fb645f022e39be'
/dolphinscheduler-standalone-server/src/main/resources/application.yaml:
newFile: !uuid '02666512b583fc4e6f45ce1446c8fe322d8d7586'
oldFile: !uuid '404b30ad69d4490b3a09348018bcfe915f112e45'
/dolphinscheduler-worker:
newFile: !uuid 'd9a2186cbde7c93f375b027708442c134f604e35'
oldFile: !uuid 'c26c62ee6aac81d05bedba4ece900cf7ebc4940e'
/dolphinscheduler-worker/src:
newFile: !uuid 'ded3793e179d3a9d179195424951c2f44b149762'
oldFile: !uuid '6f6774ddf758600e8d7e19712fe2ae37240c14dc'
/dolphinscheduler-worker/src/main:
newFile: !uuid 'd31bd2a1fcc27dec4b96f455c8cfd7c91ae5f664'
oldFile: !uuid 'f56b1a235a0a89d4b88bcce95129f45ac3fea105'
/dolphinscheduler-worker/src/main/java:
newFile: !uuid 'af3533e72a063121691811e2dda72bba9331c302'
oldFile: !uuid 'b1c271e2686a96aab67c98bf842712312986643e'
/dolphinscheduler-worker/src/main/java/org:
newFile: !uuid '9f0511536f6ff3d6758d8f452e27d936cb803a4a'
oldFile: !uuid '67e7957341101df0febcc9cf097244be8d908215'
/dolphinscheduler-worker/src/main/java/org/apache:
newFile: !uuid 'febeb2d0bd960ea94be1246e5dd4aeed04272c04'
oldFile: !uuid 'cb5d071dd1af49270838d2e7271e5e0cb89fcdd4'
/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '2c2866b89fc724e11b7356edae00814f53787c05'
oldFile: !uuid '237a609a27f966b5352286befc7bd47399069dd5'
/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server:
newFile: !uuid '3530179b6c83fba6d5032923b12d7bf5fc044184'
oldFile: !uuid 'f8c4ad69131a539517f5d0c55fcf02bb5e2c2e98'
/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker:
newFile: !uuid 'f01ea08a8f092e7b457321f4f4ef640c412ee5fc'
oldFile: !uuid '8315accfe4a211723a46d3ecf791fe6b0971b84f'
/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/config:
newFile: !uuid '8b1ab82d76397160e63cb481e1ca7babd8f71287'
oldFile: !uuid 'c2c0b0bba88ec073470b3a474627de4646b9ec4d'
/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/config/WorkerConfig.java:
newFile: !uuid '211c4691b42c5576dd5f550a18743d2d573786fc'
oldFile: !uuid '7154dc3878e0a1ede0e9b1c4a3da0b59cc45c901'
/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task:
newFile: !uuid '7490f0d16fca58ee855773a82c913796ac89cdee'
oldFile: !uuid '9f33df09b6645268724a8b9ab81e8945fd953b5d'
/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java:
newFile: !uuid '3a52ea5ff9772602bc8d1e3009650423957c98bc'
oldFile: !uuid 'd1a732f0e1d5cb485f327342c57618f96a77a75d'
/dolphinscheduler-worker/src/main/resources:
newFile: !uuid 'cf1568259d63a8c17647db588701d458f53f7a81'
oldFile: !uuid '378707b06eeb3710509e6614b84c17863571793d'
/dolphinscheduler-worker/src/main/resources/application.yaml:
newFile: !uuid 'd8587d48f058ebe23e6188f27c4aa8fa084c74d6'
oldFile: !uuid '21fbf4c293435271341eb25119127d026fcc8b87'
gitCommitId: !uuid '61a689aa5aaea5cbb29235dfaaa629804f4b4464'
/dolphinscheduler-api:
newFile: !uuid '104150420aa8bbdc7874714d928f0fc3e4c5246f'
oldFile: !uuid '5a65bbbd94f9b66677f1be49a83f2da805164ad4'
/dolphinscheduler-api/src:
newFile: !uuid 'bff517f19583ec52512f80471b0e26143049d1be'
oldFile: !uuid '11ef0587b066058d6842662b3e566f3bf77dc44c'
/dolphinscheduler-api/src/main:
newFile: !uuid '901a111e36738ccf1ef430ddbf5d1236557fa769'
oldFile: !uuid 'e5cd8e63c70b8d1b6bed34bd59bd4466093a29c5'
/dolphinscheduler-api/src/main/java:
newFile: !uuid 'd4f2320179108c30dd8f0462d3af79475f175e96'
oldFile: !uuid '351938bcaa6487e68cbc11631372cad4b472dff6'
/dolphinscheduler-api/src/main/java/org:
newFile: !uuid 'e02c86cce99d1fa53c0be77603e8d8caa825c904'
oldFile: !uuid '5df5bdc16ce2cc8c657c2053e8b19319b20d7181'
/dolphinscheduler-api/src/main/java/org/apache:
newFile: !uuid '6103aeb637876d725a4db6746729ce38602665cc'
oldFile: !uuid '3b458e219d213d7ec97d64f7ee348a9cbce8b62c'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
newFile: !uuid '2c7e23912a7f9552d6990f70ab3bf7a5c16d358d'
oldFile: !uuid '5da7ad2bc8c372ca62a68d371e3e92e85b484221'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
newFile: !uuid '75a5b0afbbd31d648f9aeb086d78affe576fbb9d'
oldFile: !uuid 'b9b662f0d8b7ae5c461bbd7ec4e602b4f19f5d62'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
newFile: !uuid '6172299918bd4799257809b1767574a14aa54918'
oldFile: !uuid 'c7f9e8a1a74f2dff3b6c16fd8a68c4775803893b'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
newFile: !uuid '9a35724ec3f38fdeae78c2e4572964466666ba46'
oldFile: !uuid '7693c53ec88ae11a821c7ef86cecd42894a7862e'
/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java:
newFile: !uuid '1af41bcfcfb5644016a79488354b6c0e238df005'
oldFile: !uuid 'a3c08b21ad4da750e6c2d91a8cdcc83e0086f576'
gitCommitId: !uuid '51afbfe159260216b806f0c3c3c20648cf01c0ac'
renames: {
}
revisionId: 4042
revisionId: 4043

Loading…
Cancel
Save