From b3919d30e77f622e7b82713a293f262b6effbbca Mon Sep 17 00:00:00 2001
From: Assert <42203474+shangeyao@users.noreply.github.com>
Date: Wed, 10 Aug 2022 20:17:16 +0800
Subject: [PATCH] [Improvement-11394][Task Plugin] Remove Passed Parameter
 --queue in Seatunnel Task Plugin (#11395)

---
 .../seatunnel/spark/SeatunnelSparkParameters.java  |  9 ---------
 .../task/seatunnel/spark/SeatunnelSparkTask.java   |  4 ----
 .../task/components/node/fields/use-sea-tunnel.ts  | 14 --------------
 .../projects/task/components/node/format-data.ts   |  1 -
 .../task/components/node/tasks/use-sea-tunnel.ts   |  1 -
 5 files changed, 29 deletions(-)

diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java
index a21538e9b5..e17675a845 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkParameters.java
@@ -29,7 +29,6 @@ public class SeatunnelSparkParameters extends SeatunnelParameters {
     private DeployModeEnum deployMode;
     private MasterTypeEnum master;
     private String masterUrl;
-    private String queue;
 
     @Override
     public boolean checkParameters() {
@@ -83,12 +82,4 @@ public class SeatunnelSparkParameters extends SeatunnelParameters {
     public void setMasterUrl(String masterUrl) {
         this.masterUrl = masterUrl;
     }
-
-    public String getQueue() {
-        return queue;
-    }
-
-    public void setQueue(String queue) {
-        this.queue = queue;
-    }
 }
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java
index 842dd05cbf..9fcb5a424a 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/spark/SeatunnelSparkTask.java
@@ -64,10 +64,6 @@ public class SeatunnelSparkTask extends SeatunnelTask {
             args.add(seatunnelParameters.getMasterUrl());
         }
 
-        if (StringUtils.isNotBlank(seatunnelParameters.getQueue())) {
-            args.add(QUEUE_OPTIONS);
-            args.add(seatunnelParameters.getQueue());
-        }
         return args;
     }
 }
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sea-tunnel.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sea-tunnel.ts
index 1c35dffa94..6869f83070 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sea-tunnel.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sea-tunnel.ts
@@ -36,13 +36,6 @@ export function useSeaTunnel(model: { [field: string]: any }): IJsonItem[] {
       ? 12
       : 0
   )
-  const queueSpan = computed(() =>
-    model.engine === 'SPARK' &&
-    model.deployMode != 'local' &&
-    model.master === 'YARN'
-      ? 24
-      : 0
-  )
 
   return [
     {
@@ -107,13 +100,6 @@ export function useSeaTunnel(model: { [field: string]: any }): IJsonItem[] {
         }
       }
     },
-    {
-      type: 'input',
-      field: 'queue',
-      name: t('project.node.sea_tunnel_queue'),
-      value: model.queue,
-      span: queueSpan
-    },
 
     // SeaTunnel config parameter
     {
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts
index f7ff744b97..bc39ce97b1 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts
@@ -212,7 +212,6 @@ export function formatParams(data: INodeData): {
         taskParams.deployMode = data.deployMode
         taskParams.master = data.master
         taskParams.masterUrl = data.masterUrl
-        taskParams.queue = data.queue
         break
       default:
         break
diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
index c5fd116ec0..4efd21b993 100644
--- a/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
+++ b/dolphinscheduler-ui/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
@@ -50,7 +50,6 @@ export function useSeaTunnel({
     runMode: 'RUN',
     useCustom: true,
     deployMode: 'client',
-    queue: 'default',
     master: 'YARN',
     masterUrl: '',
     resourceFiles: [],