#4106: [Fix-13381][plugin] fix error while parsing hive load sql (#13378)

* [fix][task plugin][task sql] fix parsing error while using variables sometimes parsing exception happened if task sql contains a variable followed by \" or \' . for example: input sql: load inpath '/tmp/test_table/dt=${dt}' into table test_table partition(dt=${dt}) after replace: preparing : load inpath '/tmp/test_table/dt=? into table test_table partition(dt=?)
2 years ago · 2bc37a5e41
2 changed files with 102 additions and 93 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit 05df0269f6c16c8865e69284d231698e920fe422
+Subproject commit 606b56403eadc77a46972c51f23365cc227edd38
--- a/commit.yml
+++ b/commit.yml
@ -2,97 +2,106 @@
 branches: {
  }
 fileChange:
-  /dolphinscheduler-master:
-    newFile: !uuid 'd09e764f4f5d162f0733e2944cd05719b56444f3'
-    oldFile: !uuid '608a4be49573f990edea3c103281724dc9238297'
-  /dolphinscheduler-master/src:
-    newFile: !uuid '98eaffabf22d910c7eee5d209c1e22ae1dfbccf4'
-    oldFile: !uuid '90ad8a6e587ce13e3213b1fc4ce16426fd5fc735'
-  /dolphinscheduler-master/src/main:
-    newFile: !uuid 'a59c9758054d0286fa74cb836eef81dd2023608e'
-    oldFile: !uuid '9fab53721d154831e1ef270cbd19b08f3f52a77e'
-  /dolphinscheduler-master/src/main/java:
-    newFile: !uuid 'dd439cd85dff803d575db7acbfcb1f1b4fd64b44'
-    oldFile: !uuid 'b02af05bce837d182f1b286341a773e089aa1c60'
-  /dolphinscheduler-master/src/main/java/org:
-    newFile: !uuid '7de102898356237d59349124266af1d78d90fc86'
-    oldFile: !uuid '74c06781859818194c7a9ffd2d4133a95118d525'
-  /dolphinscheduler-master/src/main/java/org/apache:
-    newFile: !uuid '68488d06de29b25268e43ffc3a0ab2eb3bb056a3'
-    oldFile: !uuid 'a5efecdf20b2f14a9188e8f0e7260a87b19db8f4'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid 'f49b5122bf3f4145aabb5c4add93e627de8fe055'
-    oldFile: !uuid 'f4843a2d1046b926f805a9091a2b67f5859de0ba'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
-    newFile: !uuid '568479421820efa88a432d8e06ba3b52130c7255'
-    oldFile: !uuid '50c6edc21cfb361b99c2aef7ca89169073806996'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
-    newFile: !uuid '033e48cc8dc256e56ef988c3b4b37897effa9eb7'
-    oldFile: !uuid '14a019caf31bd56e47fe37eae8150217f5214a09'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor:
-    newFile: !uuid '560a1f6861946b38ddac07de3fe442fe2d1eec0b'
-    oldFile: !uuid '5f19a8a650a96a4f4cccf0fcebbc17e065052b76'
-  ? /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/MasterTaskDispatchProcessor.java
-  : newFile: !uuid '009a684e9288edcaaffe614e8858cee827cb1f1f'
-    oldFile: !uuid '34c8a15d520a3d32213453b21922f8a4604dbfb5'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/MasterTaskPauseProcessor.java:
-    newFile: !uuid '5b7176c18f6948fd71bb45796854013e42ba0f2f'
-    oldFile: !uuid '8e53b26396c84af923c537e1ba05676a2c89a217'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
-    newFile: !uuid '2b23edbe9d7d234a26fea25a7199acc288560622'
-    oldFile: !uuid '14891a4e496a99f44e15b75c960620a851e73ff5'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java:
-    newFile: !uuid '7f77a5c99f7ce304d22c70db9b42830a11bab9c7'
-    oldFile: !uuid '28374041026ecc8042c5f6bf059f741d35adcae2'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/execute:
-    newFile: !uuid '87aac87e14edcd23d77d9bd03d2f41a1ca46e9cb'
-    oldFile: !uuid '3ccc0ff939ca02fa8bdd15544a5ace1f5e0d77e1'
-  ? /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/execute/AsyncMasterTaskDelayQueueLooper.java
-  : newFile: !uuid 'afdab35eb1b88c3d2a0a18481e20f1a14cfa1511'
-    oldFile: !uuid 'd71a116f91822c708f5313fe35510c5d0c86b6b3'
-  ? /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/execute/MasterTaskExecuteRunnable.java
-  : newFile: !uuid '973baf978ed5c173d2ad3a5d9718328825d99637'
-    oldFile: !uuid '4dbdcfce9deaf0eb865e8685e7195a2c7d993cd3'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service:
-    newFile: !uuid '47588914b585f1e6445157606c5bfd6205cf0971'
-    oldFile: !uuid '58b157071441923566f6e7783e4a586f6502b360'
-  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/WorkerFailoverService.java:
-    newFile: !uuid '144eaa3d26cfb85af43fc294c1cc461ea3b8ef3e'
-    oldFile: !uuid 'e75d19d7a8fb94fb73de994f51ccec8271a63787'
-  /dolphinscheduler-worker:
-    newFile: !uuid '9528c46e77a1d42e4a2b62141e50b2170a965bcd'
-    oldFile: !uuid 'd1f7b9bf764283cb0ddbb3ae2bab90e4bb11cad7'
-  /dolphinscheduler-worker/src:
-    newFile: !uuid '351f55404060a05f8f345072f531aec6c4607588'
-    oldFile: !uuid '7ce0dada4a6804a390f5ad88991a9b721ce5ed77'
-  /dolphinscheduler-worker/src/main:
-    newFile: !uuid '3bec9cadd08d0d527960a392ad47d23812040612'
-    oldFile: !uuid '3eb6f89e8a03f2de6c8966028e0a2557213dc684'
-  /dolphinscheduler-worker/src/main/java:
-    newFile: !uuid '9cccc2801cbe1aca5f980ad7208a8ab324fa22b7'
-    oldFile: !uuid '8747786b898dc8e9f4595127089f180d62c8513a'
-  /dolphinscheduler-worker/src/main/java/org:
-    newFile: !uuid '9fa98ff31015c2a89c915885adec986b93d36040'
-    oldFile: !uuid 'd1f8f9064e661b168dbb66adaff82f446f888d95'
-  /dolphinscheduler-worker/src/main/java/org/apache:
-    newFile: !uuid '7b8d2c8f70730d2ece2eeb2dfd210abc8d17366f'
-    oldFile: !uuid '8e07cb96e6a4a0867d9bc6e0737269fe61b53347'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '83ca094faa9e253211e069b7abb6e91e9274c4e1'
-    oldFile: !uuid 'aab57609b5ccb136c8a770dd7e32153ec6897be4'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server:
-    newFile: !uuid '5362946e4651630fe729ca125572479b9630da96'
-    oldFile: !uuid 'dd9c3675de8c6700b129f12625a0936e52920358'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker:
-    newFile: !uuid '1a92f1281622705d91836f076180ee295c398c44'
-    oldFile: !uuid '43a208818a0127241e6ec9fc8dc2d5f817e24ab9'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner:
-    newFile: !uuid 'e5aba75f10a654ba4d2e146225c40f849e84c826'
-    oldFile: !uuid 'dac965897050294cc5800e13bd5582e7a6fc28fe'
-  /dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerTaskExecuteRunnable.java:
-    newFile: !uuid '46629f3634a4e2ae5f764252b9a2625a20911e0a'
-    oldFile: !uuid '598fc6cfc98e5ce31d8c45e325f000e3b0451688'
-gitCommitId: !uuid '05df0269f6c16c8865e69284d231698e920fe422'
+  /docs:
+    newFile: !uuid '2b5f0ec66e549041b15392867254b32cf57583d6'
+    oldFile: !uuid 'db3afa56804c26ff69b5449efdfa244680460ed2'
+  /docs/docs:
+    newFile: !uuid '215ce36b388bc03a3e0e68b520969b6a80ab6baf'
+    oldFile: !uuid '6aa27d2bcc0b0b942d34c09ea1b43dff51cefaad'
+  /docs/docs/en:
+    newFile: !uuid '09fda065f2ead4255cb995923fe8a12601e45fe0'
+    oldFile: !uuid 'e14847ce346b03a9d590c5a2e0dd28b8b37816a9'
+  /docs/docs/en/guide:
+    newFile: !uuid 'b479fc7343f7408382f5a41856747a82d4719a98'
+    oldFile: !uuid '441200b64178b4818dff72128c778d0ee0ffd84a'
+  /docs/docs/en/guide/upgrade:
+    newFile: !uuid '4178f465c818128b63961014b34d587c05a93734'
+    oldFile: !uuid 'b05f946c4b845a1834e4947a5c487c3e0ac4dca3'
+  /docs/docs/en/guide/upgrade/incompatible.md:
+    newFile: !uuid 'c3106631af248a97aa81287c9b71d914588cf5c6'
+    oldFile: !uuid 'ba1af107ce2be6b2d6b47265fe8b017050ef73c8'
+  /docs/docs/zh:
+    newFile: !uuid 'f0164a467bfde22573c211bf330d2c652726d491'
+    oldFile: !uuid '4521615076765b472b786382523e864ceebb481e'
+  /docs/docs/zh/guide:
+    newFile: !uuid 'b29657270e10d5a29c9926b2aeae6fd356ce2d34'
+    oldFile: !uuid '47d58b3e748a2fb2d469789587198729b175bdf1'
+  /docs/docs/zh/guide/upgrade:
+    newFile: !uuid '5291ca705188a233bb9a02bfda5ba3de5e939358'
+    oldFile: !uuid '813d47ee45e9bc68e309b1d9560a858aea1d1371'
+  /docs/docs/zh/guide/upgrade/incompatible.md:
+    newFile: !uuid '119f77e2ef7f2b97959457e441542d7fac739cd5'
+    oldFile: !uuid '4e294f954d10440a499b5aac74270e662f06f11c'
+  /dolphinscheduler-task-plugin:
+    newFile: !uuid 'bd2bc8f110d6bd1e5600f24ddb1b8529db9e70bb'
+    oldFile: !uuid '20b298a928e84191fe4006987e60a15a689967c2'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api:
+    newFile: !uuid 'ba67c6520b74cc46b171cd1c9269f503b0245a57'
+    oldFile: !uuid '43abae6f8dabbfd9c6c4fdc3c73b2d2c4370568e'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src:
+    newFile: !uuid 'd14e54899b3d5eb1c7c116f82540c3d3a163e4a0'
+    oldFile: !uuid '542f9e88059facdb65a28738315d2ffb33f89104'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main:
+    newFile: !uuid '725d1aadc18e6fc839e6d2211216a7bf2c45d394'
+    oldFile: !uuid '10c9713ef3ba6a55829ede2b5f50dec9fe71ea78'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java:
+    newFile: !uuid '5a0c964bc66f1cc53375a94bc0c8cb74368046be'
+    oldFile: !uuid 'd85d4fbd45abd7e505260283a658ca901905d414'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org:
+    newFile: !uuid 'bc54c4e533ac7acf47bbdf1f1219595c3c8b8aa3'
+    oldFile: !uuid '5319abb18ed93f4be837f04bc268662d36000ce3'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache:
+    newFile: !uuid '96dbe6ffdcf4f4ed0b7431a2c5996a1e3b99fcd8'
+    oldFile: !uuid '76fc689efac6d8563ff169d0240f9fc48dd1bb14'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '1272e6293b8f5b4ebb821a2ce5eb5485501848ed'
+    oldFile: !uuid '6dfda0b7f786fd29b5ad8d4a468972d52cb9597d'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid 'fb526f65898402e56a4fe108201be4c377ac3241'
+    oldFile: !uuid '3a5feb04b2d487bd31242a12ca929a66701aaea7'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid 'abe234b576e4c4347052334337d03cc247d03ba3'
+    oldFile: !uuid '3150f75afa978a955a312ab9fca41c9752aad950'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api:
+    newFile: !uuid 'adb27034fec387fee47f22aa3420d2a0ae13d254'
+    oldFile: !uuid '64c2fd5d07d6904ad036803d31e43a8a3262727d'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractTask.java
+  : newFile: !uuid '10f24b7845c8977c16e4b372d90609b43d47672c'
+    oldFile: !uuid '30f5b7d30f5da90bcd1288c63e683f26276fb676'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql:
+    newFile: !uuid '008439198682d6901bc58826bb0729e9307789db'
+    oldFile: !uuid '30cab73dd6dc717cf909ec60d2e78803bec78d77'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src:
+    newFile: !uuid 'b686697dfb204ab6c18882082459a1fe8abba694'
+    oldFile: !uuid '39d6bef43cfdf736f2efbbcc5a3518b185e253e6'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test:
+    newFile: !uuid '66035a00ddb507034a80f4605250fef8801b0022'
+    oldFile: null
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test/java:
+    newFile: !uuid '277518e4cff9b772b18b38a7e3a048a7631e39cb'
+    oldFile: null
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test/java/org:
+    newFile: !uuid '596b45ed594e113e6d83b596c70c8b3a7e1b68b7'
+    oldFile: null
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test/java/org/apache:
+    newFile: !uuid 'a398ecf2f06d6321aa8f6bcad469e1d80ae7f836'
+    oldFile: null
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'f2004026615927a3e9d31397ee97736a591a09be'
+    oldFile: null
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid '18ce8d2fc151a38e75b5b53528fe4ef9bf4e1f75'
+    oldFile: null
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test/java/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid 'e43aef7514772db4fe4340f8457c12b746530c00'
+    oldFile: null
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test/java/org/apache/dolphinscheduler/plugin/task/sql:
+    newFile: !uuid '170ebe2973662b65c5fc2b17c6d056e8b9494eca'
+    oldFile: null
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/test/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTaskTest.java
+  : newFile: !uuid 'a13ef4ecc1931e4247be8b366b963bf3d93b8d1a'
+    oldFile: null
+gitCommitId: !uuid '606b56403eadc77a46972c51f23365cc227edd38'
 renames: {
  }
-revisionId: 4105
+revisionId: 4106