Skip to content

Refactor opensearch, elasticsearch, amazon to use SQLA2 #60497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ricky-chaoju wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −16
Open

Refactor opensearch, elasticsearch, amazon to use SQLA2 #60497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,17 +489,21 @@ repos:
^airflow-core/tests/unit/dag_processing/test_processor.py$|
^airflow-core/tests/unit/dag_processing/test_collection\.py$|
^dev/airflow_perf/scheduler_dag_execution_timing.py$|
^providers/amazon/tests/system/amazon/aws/example_kinesis_analytics.py$|
^providers/amazon/tests/unit/amazon/aws/transfers/test_s3_to_sql.py$|
^providers/celery/.*\.py$|
^providers/cncf/kubernetes/.*\.py$|
^providers/databricks/.*\.py$|
^providers/edge3/.*\.py$|
^providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py$|
^providers/mysql/.*\.py$|
^providers/openlineage/.*\.py$|
^providers/google/src/airflow/providers/google/cloud/triggers/dataproc\.py$|
^providers/opensearch/src/airflow/providers/opensearch/log/os_task_handler.py$|
^providers/google/src/airflow/providers/google/cloud/triggers/bigquery\.py$|
^providers/google/src/airflow/providers/google/cloud/triggers/dataproc\.py$|
^providers/google/tests/system/google/gcp_api_client_helpers\.py$|
^providers/google/tests/unit/google/cloud/utils/gcp_authenticator\.py$|
^providers/google/tests/unit/google/marketing_platform/operators/test_campaign_manager\.py$|
^providers/google/tests/system/google/gcp_api_client_helpers\.py$|
^providers/standard/tests/unit/standard/operators/test_latest_only_operator\.py$|
^providers/standard/tests/unit/standard/operators/test_trigger_dagrun\.py$|
^providers/standard/tests/unit/standard/operators/test_weekday\.py$|
Expand Down
3 changes: 2 additions & 1 deletion providers/amazon/tests/system/amazon/aws/example_kinesis_analytics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from datetime import datetime

import boto3
from sqlalchemy import select

from airflow import settings
from airflow.models import Connection
Expand Down Expand Up @@ -189,7 +190,7 @@ def delete_connection(conn_id: str):
if settings.Session is None:
raise RuntimeError("Session not configured. Call configure_orm() first.")
session = settings.Session()
conn_to_details = session.query(Connection).filter(Connection.conn_id == conn_id).first()
conn_to_details = session.scalar(select(Connection).where(Connection.conn_id == conn_id))
session.delete(conn_to_details)
session.commit()

Expand Down
10 changes: 5 additions & 5 deletions providers/amazon/tests/unit/amazon/aws/transfers/test_s3_to_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from unittest.mock import MagicMock, patch

import pytest
from sqlalchemy import or_
from sqlalchemy import delete, or_

from airflow import models
from airflow.providers.amazon.aws.transfers.s3_to_sql import S3ToSqlOperator
Expand Down Expand Up @@ -119,8 +119,8 @@ def test_hook_params(self, mock_parser):

def teardown_method(self):
with create_session() as session:
(
session.query(models.Connection)
.filter(or_(models.Connection.conn_id == "s3_test", models.Connection.conn_id == "sql_test"))
.delete()
session.execute(
delete(models.Connection).where(
or_(models.Connection.conn_id == "s3_test", models.Connection.conn_id == "sql_test")
)
)
7 changes: 3 additions & 4 deletions providers/elasticsearch/src/airflow/providers/elasticsearch/log/es_task_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import pendulum
from elasticsearch import helpers
from elasticsearch.exceptions import NotFoundError
from sqlalchemy import select

from airflow.models.dagrun import DagRun
from airflow.providers.common.compat.module_loading import import_string
Expand Down Expand Up @@ -98,15 +99,13 @@ def _ensure_ti(ti: TaskInstanceKey | TaskInstance, session) -> TaskInstance:

if not isinstance(ti, TaskInstanceKey):
return ti
val = (
session.query(TaskInstance)
.filter(
val = session.scalar(
select(TaskInstance).where(
TaskInstance.task_id == ti.task_id,
TaskInstance.dag_id == ti.dag_id,
TaskInstance.run_id == ti.run_id,
TaskInstance.map_index == ti.map_index,
)
.one_or_none()
)
if isinstance(val, TaskInstance):
val.try_number = ti.try_number
Expand Down
7 changes: 3 additions & 4 deletions providers/opensearch/src/airflow/providers/opensearch/log/os_task_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import pendulum
from opensearchpy import OpenSearch
from opensearchpy.exceptions import NotFoundError
from sqlalchemy import select

from airflow.models import DagRun
from airflow.providers.common.compat.module_loading import import_string
Expand Down Expand Up @@ -85,15 +86,13 @@ def _ensure_ti(ti: TaskInstanceKey | TaskInstance, session) -> TaskInstance:

if not isinstance(ti, TaskInstanceKey):
return ti
val = (
session.query(TaskInstance)
.filter(
val = session.scalar(
select(TaskInstance).where(
TaskInstance.task_id == ti.task_id,
TaskInstance.dag_id == ti.dag_id,
TaskInstance.run_id == ti.run_id,
TaskInstance.map_index == ti.map_index,
)
.one_or_none()
)
if isinstance(val, TaskInstance):
val.try_number = ti.try_number
Expand Down