kaxil commented on code in PR #24613: URL: https://github.com/apache/airflow/pull/24613#discussion_r905368016
########## airflow/models/dataset.py: ########## @@ -0,0 +1,53 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from typing import Dict, Optional +from urllib.parse import urlparse + +from sqlalchemy import Column, Index, Integer + +from airflow.models.base import Base, StringID +from airflow.utils import timezone +from airflow.utils.sqlalchemy import ExtendedJSON, UtcDateTime + + +class Dataset(Base): + """A table to store datasets.""" Review Comment: Should we have docstring on uri and extra from __init__ ########## airflow/migrations/versions/0113_2_4_0_add_dataset_model.py: ########## @@ -0,0 +1,59 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +"""Add Dataset model + +Revision ID: 0038cd0c28b4 +Revises: 424117c37d18 +Create Date: 2022-06-22 14:37:20.880672 + +""" + +import sqlalchemy as sa +from alembic import op + +# revision identifiers, used by Alembic. +from sqlalchemy import Integer, func + +from airflow.migrations.db_types import TIMESTAMP, StringID +from airflow.utils.sqlalchemy import ExtendedJSON + +revision = '0038cd0c28b4' +down_revision = '424117c37d18' +branch_labels = None +depends_on = None +airflow_version = '2.4.0' + + +def upgrade(): + """Apply Add Dataset model""" + op.create_table( + 'dataset', + sa.Column('id', Integer, primary_key=True, autoincrement=True), + sa.Column('uri', StringID(length=500)), + sa.Column('extra', ExtendedJSON), + sa.Column('created_at', TIMESTAMP, default=func.now(), nullable=False), + sa.Column('updated_at', TIMESTAMP, default=func.now(), nullable=False), Review Comment: Don't we want the `onupdate` here too? ########## airflow/migrations/versions/0113_2_4_0_add_dataset_model.py: ########## @@ -0,0 +1,59 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +"""Add Dataset model + +Revision ID: 0038cd0c28b4 +Revises: 424117c37d18 +Create Date: 2022-06-22 14:37:20.880672 + +""" + +import sqlalchemy as sa +from alembic import op + +# revision identifiers, used by Alembic. +from sqlalchemy import Integer, func + +from airflow.migrations.db_types import TIMESTAMP, StringID +from airflow.utils.sqlalchemy import ExtendedJSON + +revision = '0038cd0c28b4' +down_revision = '424117c37d18' +branch_labels = None +depends_on = None +airflow_version = '2.4.0' + + +def upgrade(): + """Apply Add Dataset model""" + op.create_table( + 'dataset', + sa.Column('id', Integer, primary_key=True, autoincrement=True), + sa.Column('uri', StringID(length=500)), + sa.Column('extra', ExtendedJSON), + sa.Column('created_at', TIMESTAMP, default=func.now(), nullable=False), + sa.Column('updated_at', TIMESTAMP, default=func.now(), nullable=False), + sqlite_autoincrement=True, Review Comment: Why sqlite autoincrement needs to be passed separately? A comment would be nice for future readers (including me) ########## airflow/models/dataset.py: ########## @@ -0,0 +1,53 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from typing import Dict, Optional +from urllib.parse import urlparse + +from sqlalchemy import Column, Index, Integer + +from airflow.models.base import Base, StringID +from airflow.utils import timezone +from airflow.utils.sqlalchemy import ExtendedJSON, UtcDateTime + + +class Dataset(Base): + """A table to store datasets.""" + + id = Column(Integer, primary_key=True, autoincrement=True) + uri = Column(StringID(length=500), nullable=False) + extra = Column(ExtendedJSON, nullable=True) + created_at = Column(UtcDateTime, default=timezone.utcnow(), nullable=False) + updated_at = Column(UtcDateTime, default=timezone.utcnow(), onupdate=timezone.utcnow(), nullable=False) + + __tablename__ = "dataset" + __table_args__ = ( + Index('idx_uri', uri, unique=True), + {'sqlite_autoincrement': True}, + ) + + def __init__(self, uri: str, extra: Optional[Dict] = None, **kwargs): + parsed = urlparse(uri) + if parsed.scheme and parsed.scheme.lower() == 'airflow': + raise ValueError("Scheme `airflow` is reserved.") + super().__init__(uri=uri, extra=extra, **kwargs) + + def __eq__(self, other): + return self.uri == other.uri + + def __hash__(self): + return hash((self.uri, self.extra)) Review Comment: Would be good to add the boilerplate `__repr__` so it is easier when debugging instead of memory address -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
