#3464: [Bug] [spark-sql] In spark-sql, select both SPARK1 and SPARK2 versions and execute ${SPARK_HOME2}/bin/spark-sql (#11721)

select different versions of spark-sql to execute different versions of spark-sql

commit.ref

@@ -1 +1 @@
-Subproject commit 147e0ae8d74c39ed82ca36f068b96c941fcdcf50
+Subproject commit 25b78a80037c4a7edb551dd04328276ebdc7efc1

commit.yml

@@ -2,82 +2,91 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-api:
-    newFile: !uuid '1ac26045ca601304a965629c692df4199eeda1aa'
-    oldFile: !uuid '15906b0d6fa3e481514d7bac9e7d9c6f52a08be1'
-  /dolphinscheduler-api/pom.xml:
-    newFile: !uuid '6b8fc764f061a3a35478cef8b07d739fcc352af4'
-    oldFile: !uuid '1ded902ced69c78efca9fbef1cd22a2561c24c5f'
-  /dolphinscheduler-api/src:
-    newFile: !uuid 'df801e0fc34ed7505103d534ca662983c837bc4e'
-    oldFile: !uuid '39c4f42a6b786a582e1772a4f641acd8266a68ae'
-  /dolphinscheduler-api/src/main:
-    newFile: !uuid '030927de928c4d72906131cb6eeba3598c2af3c1'
-    oldFile: !uuid 'f1e362322906d7fb4a2ff98ff8c61de94e266ef6'
-  /dolphinscheduler-api/src/main/java:
-    newFile: !uuid '0c489815334e8c6855382c403c4dcaf081eb78d4'
-    oldFile: !uuid 'c78648c03998e20d2fcc7c7e256db6c38de12c60'
-  /dolphinscheduler-api/src/main/java/org:
-    newFile: !uuid '0845bafc5b6d2efe3db6bcdd986bbf1e8c7d6a54'
-    oldFile: !uuid 'be1fc211b3e1141d18d8b7e0ec5cefe386116a5b'
-  /dolphinscheduler-api/src/main/java/org/apache:
-    newFile: !uuid 'a5b05050c1acd802ca9268587b77cd2e724bce90'
-    oldFile: !uuid '9d7462c54a3b7f9769136e1987f5b09eb6dff0e8'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '4d2d0c5e01827ab36d267d4dfcd1c17c9c39cd72'
-    oldFile: !uuid '0eb3d5160a5911d52d372c427a5845bcc5075eb7'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '3d385fcbbb7a258764a929837a1a2c23fdfbdc91'
-    oldFile: !uuid 'd693c9556ccb01843db5684434f5b45f135e4400'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security:
-    newFile: !uuid 'c0947dda4aabf0f7430d7863595a0156e1cca967'
-    oldFile: !uuid '897e43c5486c12cae06635a4252615447f40d960'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl:
-    newFile: !uuid '4b6aec499571da052eed287669946192feba50e7'
-    oldFile: !uuid 'c43f4ecc2d404ae5dd0a11b7c5cda523ba1f97bd'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap:
-    newFile: !uuid '479323568f134e0552dee187e39476fc596d85c0'
-    oldFile: !uuid 'eb1628a56a6ae07b9f3ba356fe4cbc7209b405c9'
-  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java:
-    newFile: !uuid '236b5fe45eb507b0d2546ed438e88bc6818cf23a'
-    oldFile: !uuid '1cca542aab39d264bfee6e8e18f0223d9eca5aa1'
-  /dolphinscheduler-bom:
-    newFile: !uuid '0f75133af3ebe0610cc0076de22da75c928a2937'
-    oldFile: !uuid '9bce9cd0a043f3a8a9f940e187f284d63d07cf0e'
-  /dolphinscheduler-bom/pom.xml:
-    newFile: !uuid '7fce8bb4a234b23e305604efe70795fdfa44fed7'
-    oldFile: !uuid '4ce1938b3d9072f9d0d76afc27a3a71f4e3f0644'
-  /dolphinscheduler-dist:
-    newFile: !uuid '7e941a870eb3fe90559752ec63cd0ee68cc77adc'
-    oldFile: !uuid '745a5f63602183433db3d889e842aed416b2f245'
-  /dolphinscheduler-dist/release-docs:
-    newFile: !uuid 'b0690441cd1424b885e1e9c0223c95cd155901f9'
-    oldFile: !uuid '126d0dd5f741083b46349f3c1abb6a8221e976dd'
-  /dolphinscheduler-dist/release-docs/LICENSE:
-    newFile: !uuid '88dc8871d07f54b8e44797e80307f900915e3b39'
-    oldFile: !uuid 'bfb41a08fee608c52ef6b3d2a0b504d388f1d5fd'
-  /dolphinscheduler-dist/release-docs/NOTICE:
-    newFile: !uuid '904f9098df22e0121e4d495fd13ac194476b3b7a'
-    oldFile: !uuid '18a684fb873b1bb7b495c3c317e91dbd3efdee55'
   /dolphinscheduler-task-plugin:
-    newFile: !uuid '34b4c706328afb8b35302a4611af30747ea7513c'
-    oldFile: !uuid 'aa81de14036e4e5bd9ada1f9bc73729c67d3e1f3'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker:
-    newFile: !uuid '5ad33a465a4bbd5b6ccddf5487489e6b969cf7f9'
-    oldFile: !uuid 'ecc25be06fd68f63ab147d9d2abbf93fecdfa7c9'
-  /dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml:
-    newFile: !uuid 'dfb769a46c3422a9f06f862fe69b6a4804f5aade'
-    oldFile: !uuid '66f761d825c0178ec53b195b0298795b6f5c68c1'
-  /tools:
-    newFile: !uuid '1abab5eeb7176b02e7b7d210f2faaf8347d341b7'
-    oldFile: !uuid 'fbffc2a82a3cd1aaef2f16654d1c2a907cf335c3'
-  /tools/dependencies:
-    newFile: !uuid 'c0a84ccc381571a8a1f811d80010f40edc6e3bc9'
-    oldFile: !uuid '64d9b685e24264f0c6fbf8a07a3e40aebd72b81a'
-  /tools/dependencies/known-dependencies.txt:
-    newFile: !uuid 'ef92dc43a0efbbc3c94b9cb7007ce5188a28e497'
-    oldFile: !uuid '00b2d66abea1975d8aa0969782cadeb820057077'
-gitCommitId: !uuid '147e0ae8d74c39ed82ca36f068b96c941fcdcf50'
+    newFile: !uuid '7a3de25dcfe135a3676146df8c16cdaf323aa15e'
+    oldFile: !uuid '34b4c706328afb8b35302a4611af30747ea7513c'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark:
+    newFile: !uuid '6ecd41e0c8c6de8c9bc25e2b1b40dc42d09a057e'
+    oldFile: !uuid 'cb6851c818e6a2e4d16f5b9c4f65f3eec1843457'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src:
+    newFile: !uuid '42c8c17c22d9fe8ec03272e5a0d0cd5aac377328'
+    oldFile: !uuid 'adc062187cffbafcc83c36f38fb517c86b71520b'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main:
+    newFile: !uuid '137491fe7d066745d151d249e16830194f6e63fe'
+    oldFile: !uuid 'cc16b0f854d545952a26a52f288a79ebb59231dc'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java:
+    newFile: !uuid '328a65e28e85fb141cdf0979885d2f587adee6a3'
+    oldFile: !uuid '02f3f1371ba9ad47d5c30b6b1443add0ba0bee8e'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org:
+    newFile: !uuid '8a7a449598cdd59e55f99706a20bc2e9f888e3ab'
+    oldFile: !uuid '59124eb4c6ebdd3a52ba0adda7e6489d8c616904'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache:
+    newFile: !uuid '39b1adfc31f20ad56d63141c915106acaadd6f0a'
+    oldFile: !uuid '78a1cb066afa4dd24704571c36061f475a1af3fd'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '34b1ffc9d11dcd0bbf683a9c3f3666ee38ad707b'
+    oldFile: !uuid 'f5797aa72d84c4c87ab26f33ea1576e58679c0f3'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid '047abfadda5b25b5fa89caf97ab8780770eff0b1'
+    oldFile: !uuid 'abdc9416200345a6cd5e6614017cc320e66cce6d'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid 'c67c74dfe26b8dd4b5ccbb134b7c37a4a7ae1163'
+    oldFile: !uuid 'a8c39e60bdddb830720b9794b1c4657376ef87bc'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark:
+    newFile: !uuid '4bd9e70b473f5e27f6ffea4c23bb2e55e50065c5'
+    oldFile: !uuid '963c222836c8045f28c6b928f484e8b56b6d824e'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkCommand.java
+  : newFile: !uuid '11609f37f232ce77067328fd8f294cc9a241ca34'
+    oldFile: null
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
+  : newFile: !uuid '2e40ecf6969bb1ba5130c6e996b9482817dc3c65'
+    oldFile: !uuid '01db3426612e8cf4520fe5a1035809e191d5a0dd'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkVersion.java
+  : newFile: !uuid 'baafafe2e426b45117b2ada8ea678a866cf0dda4'
+    oldFile: !uuid '02c357914b2b5c164bbaa72e5273334e0829444a'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test:
+    newFile: !uuid '3830825a08eb48426908461ec41cf7eb198666b0'
+    oldFile: !uuid '41d8a33ceccf8116f08c5ac2e359418977569d85'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java:
+    newFile: !uuid 'addd77e28c9bd9233e2bab54c88fd15efb3099de'
+    oldFile: !uuid 'b50900fb49d62c4a65920aaa2752668035a9d588'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org:
+    newFile: !uuid '50e6b13c9e94e2e67219de89d6c7197f29033a5a'
+    oldFile: !uuid '2a82a3c8414ec69f3a6cb6fd4e3d60ec4bd0710d'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache:
+    newFile: !uuid 'b4b868dbc84ce824e2b8cac04bc351f944b41ccb'
+    oldFile: !uuid 'c96e623a4ad3ad5f522760d15ea7dc3a0a132cf9'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler:
+    newFile: !uuid '29e8da3cfcbc8721649502e2f0fce3708a103e35'
+    oldFile: !uuid '40a42feb30261e9e37cfa8c0081531eb60ef8c6a'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin:
+    newFile: !uuid 'c04efb764186a0a10d8288ac7f465585f43198af'
+    oldFile: !uuid '5819eb8e4746e8a2d8754500457c4897d96b3af3'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task:
+    newFile: !uuid 'bb78ec6c56c447827e41a2ef18d1b6ad07e79ef3'
+    oldFile: !uuid 'fa2a329a8e79e8efe2ab034de943f45c51161505'
+  /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark:
+    newFile: !uuid '3f0860c2bc31307312f6ac5fb6eaf0627c441398'
+    oldFile: !uuid '9d38b331cf8128d9f08a2a5638544370cc54a4ea'
+  ? /dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTaskTest.java
+  : newFile: !uuid '4edd28fd1e041196249e732deea23bd3f67a880c'
+    oldFile: !uuid '9d5565ab950071b2f90e5f232437a09cef70eacd'
+  /dolphinscheduler-worker:
+    newFile: !uuid '8354564bc29dfb96133c00284913da209d8dee0a'
+    oldFile: !uuid 'a8ffdf63d7e66bf726a025e3783049fee835e1d2'
+  /dolphinscheduler-worker/src:
+    newFile: !uuid '12ef2b1f9599f23c319b463ba778f7c1ca89339a'
+    oldFile: !uuid 'b2db251021cdf9cd671543e828d1c8a51b7c33f7'
+  /dolphinscheduler-worker/src/main:
+    newFile: !uuid '543c309a93bbca179b7570073f52a78ab44192b1'
+    oldFile: !uuid 'aa8986dc5dfe2e27cba5df222c1ce2dd463f8ca1'
+  /dolphinscheduler-worker/src/main/bin:
+    newFile: !uuid 'f7f27db6f58291099122ff16798d9551e27122d2'
+    oldFile: !uuid '4b490a4249018bc9f79f163ac0416ddf57a5a4db'
+  /dolphinscheduler-worker/src/main/bin/start.sh:
+    newFile: !uuid '56a799b500a82fa901a3b338955e06c63ec387c8'
+    oldFile: !uuid '1a865ca6bc7c8c11f36093308e8efaa245c29b4b'
+gitCommitId: !uuid '25b78a80037c4a7edb551dd04328276ebdc7efc1'
 renames: {
   }
-revisionId: 3463
+revisionId: 3464