From c206360fd2860a60fb9cabdc4eb9579f2a71685c Mon Sep 17 00:00:00 2001 From: romsharon98 Date: Fri, 19 Jan 2024 18:00:54 +0200 Subject: [PATCH 1/2] remove unecessary templated fields --- .../providers/alibaba/cloud/operators/analyticdb_spark.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py b/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py index 106f7583cb717..81fcf0c74ddfb 100644 --- a/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py +++ b/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py @@ -113,9 +113,6 @@ class AnalyticDBSparkSQLOperator(AnalyticDBSparkBaseOperator): :param rg_name: The name of resource group in AnalyticDB MySQL 3.0 Data Lakehouse cluster. """ - template_fields: Sequence[str] = ("spark_params",) - template_fields_renderers = {"spark_params": "json"} - def __init__( self, *, @@ -172,9 +169,6 @@ class AnalyticDBSparkBatchOperator(AnalyticDBSparkBaseOperator): :param rg_name: The name of resource group in AnalyticDB MySQL 3.0 Data Lakehouse cluster. """ - template_fields: Sequence[str] = ("spark_params",) - template_fields_renderers = {"spark_params": "json"} - def __init__( self, *, From e602474cb9cf471d9cad3592dafbc76dbc25bfe9 Mon Sep 17 00:00:00 2001 From: romsharon98 Date: Fri, 19 Jan 2024 21:28:11 +0200 Subject: [PATCH 2/2] reverting templeting field and fix assignment in constructor --- .../alibaba/cloud/operators/analyticdb_spark.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py b/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py index 81fcf0c74ddfb..1ea8f8a970aa6 100644 --- a/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py +++ b/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py @@ -113,6 +113,9 @@ class AnalyticDBSparkSQLOperator(AnalyticDBSparkBaseOperator): :param rg_name: The name of resource group in AnalyticDB MySQL 3.0 Data Lakehouse cluster. """ + template_fields: Sequence[str] = ("spark_params",) + template_fields_renderers = {"spark_params": "json"} + def __init__( self, *, @@ -128,7 +131,7 @@ def __init__( ) -> None: super().__init__(**kwargs) - self.spark_params = { + spark_params = { "sql": sql, "conf": conf, "driver_resource_spec": driver_resource_spec, @@ -136,7 +139,7 @@ def __init__( "num_executors": num_executors, "name": name, } - + self.spark_params = spark_params self._cluster_id = cluster_id self._rg_name = rg_name @@ -169,6 +172,9 @@ class AnalyticDBSparkBatchOperator(AnalyticDBSparkBaseOperator): :param rg_name: The name of resource group in AnalyticDB MySQL 3.0 Data Lakehouse cluster. """ + template_fields: Sequence[str] = ("spark_params",) + template_fields_renderers = {"spark_params": "json"} + def __init__( self, *, @@ -190,7 +196,7 @@ def __init__( ) -> None: super().__init__(**kwargs) - self.spark_params = { + spark_params = { "file": file, "class_name": class_name, "args": args, @@ -204,7 +210,7 @@ def __init__( "archives": archives, "name": name, } - + self.spark_params = spark_params self._cluster_id = cluster_id self._rg_name = rg_name