You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2019/01/11 18:12:57 UTC
[GitHub] bolkedebruin closed pull request #4421: [AIRFLOW-3468] Remove
KnownEvent(Event)?
bolkedebruin closed pull request #4421: [AIRFLOW-3468] Remove KnownEvent(Event)?
URL: https://github.com/apache/airflow/pull/4421
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/airflow/migrations/versions/0e2a74e0fc9f_add_time_zone_awareness.py b/airflow/migrations/versions/0e2a74e0fc9f_add_time_zone_awareness.py
index ac7824fd9e..6c58a25f18 100644
--- a/airflow/migrations/versions/0e2a74e0fc9f_add_time_zone_awareness.py
+++ b/airflow/migrations/versions/0e2a74e0fc9f_add_time_zone_awareness.py
@@ -7,9 +7,9 @@
# 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
@@ -63,9 +63,6 @@ def upgrade():
op.alter_column(table_name='job', column_name='end_date', type_=mysql.TIMESTAMP(fsp=6))
op.alter_column(table_name='job', column_name='latest_heartbeat', type_=mysql.TIMESTAMP(fsp=6))
- op.alter_column(table_name='known_event', column_name='start_date', type_=mysql.TIMESTAMP(fsp=6))
- op.alter_column(table_name='known_event', column_name='end_date', type_=mysql.TIMESTAMP(fsp=6))
-
op.alter_column(table_name='log', column_name='dttm', type_=mysql.TIMESTAMP(fsp=6))
op.alter_column(table_name='log', column_name='execution_date', type_=mysql.TIMESTAMP(fsp=6))
@@ -113,9 +110,6 @@ def upgrade():
op.alter_column(table_name='job', column_name='end_date', type_=sa.TIMESTAMP(timezone=True))
op.alter_column(table_name='job', column_name='latest_heartbeat', type_=sa.TIMESTAMP(timezone=True))
- op.alter_column(table_name='known_event', column_name='start_date', type_=sa.TIMESTAMP(timezone=True))
- op.alter_column(table_name='known_event', column_name='end_date', type_=sa.TIMESTAMP(timezone=True))
-
op.alter_column(table_name='log', column_name='dttm', type_=sa.TIMESTAMP(timezone=True))
op.alter_column(table_name='log', column_name='execution_date', type_=sa.TIMESTAMP(timezone=True))
@@ -159,9 +153,6 @@ def downgrade():
op.alter_column(table_name='job', column_name='end_date', type_=mysql.DATETIME(fsp=6))
op.alter_column(table_name='job', column_name='latest_heartbeat', type_=mysql.DATETIME(fsp=6))
- op.alter_column(table_name='known_event', column_name='start_date', type_=mysql.DATETIME(fsp=6))
- op.alter_column(table_name='known_event', column_name='end_date', type_=mysql.DATETIME(fsp=6))
-
op.alter_column(table_name='log', column_name='dttm', type_=mysql.DATETIME(fsp=6))
op.alter_column(table_name='log', column_name='execution_date', type_=mysql.DATETIME(fsp=6))
@@ -208,9 +199,6 @@ def downgrade():
op.alter_column(table_name='job', column_name='end_date', type_=sa.DateTime())
op.alter_column(table_name='job', column_name='latest_heartbeat', type_=sa.DateTime())
- op.alter_column(table_name='known_event', column_name='start_date', type_=sa.DateTime())
- op.alter_column(table_name='known_event', column_name='end_date', type_=sa.DateTime())
-
op.alter_column(table_name='log', column_name='dttm', type_=sa.DateTime())
op.alter_column(table_name='log', column_name='execution_date', type_=sa.DateTime())
diff --git a/airflow/migrations/versions/4addfa1236f1_add_fractional_seconds_to_mysql_tables.py b/airflow/migrations/versions/4addfa1236f1_add_fractional_seconds_to_mysql_tables.py
index 655ff61042..e7e832da51 100644
--- a/airflow/migrations/versions/4addfa1236f1_add_fractional_seconds_to_mysql_tables.py
+++ b/airflow/migrations/versions/4addfa1236f1_add_fractional_seconds_to_mysql_tables.py
@@ -64,11 +64,6 @@ def upgrade():
op.alter_column(table_name='job', column_name='latest_heartbeat',
type_=mysql.DATETIME(fsp=6))
- op.alter_column(table_name='known_event', column_name='start_date',
- type_=mysql.DATETIME(fsp=6))
- op.alter_column(table_name='known_event', column_name='end_date',
- type_=mysql.DATETIME(fsp=6))
-
op.alter_column(table_name='log', column_name='dttm',
type_=mysql.DATETIME(fsp=6))
op.alter_column(table_name='log', column_name='execution_date',
@@ -132,11 +127,6 @@ def downgrade():
op.alter_column(table_name='job', column_name='latest_heartbeat',
type_=mysql.DATETIME())
- op.alter_column(table_name='known_event', column_name='start_date',
- type_=mysql.DATETIME())
- op.alter_column(table_name='known_event', column_name='end_date',
- type_=mysql.DATETIME())
-
op.alter_column(table_name='log', column_name='dttm',
type_=mysql.DATETIME())
op.alter_column(table_name='log', column_name='execution_date',
diff --git a/airflow/migrations/versions/856955da8476_fix_sqlite_foreign_key.py b/airflow/migrations/versions/856955da8476_fix_sqlite_foreign_key.py
index 52a817081b..c205b62d01 100644
--- a/airflow/migrations/versions/856955da8476_fix_sqlite_foreign_key.py
+++ b/airflow/migrations/versions/856955da8476_fix_sqlite_foreign_key.py
@@ -66,22 +66,6 @@ def upgrade():
batch_op.create_foreign_key('chart_user_id_fkey', 'users',
['user_id'], ['id'])
- known_event_table = sa.Table('known_event',
- sa.MetaData(),
- sa.Column('id', sa.Integer(), nullable=False),
- sa.Column('label', sa.String(length=200), nullable=True),
- sa.Column('start_date', sa.DateTime(), nullable=True),
- sa.Column('end_date', sa.DateTime(), nullable=True),
- sa.Column('user_id', sa.Integer(), nullable=True),
- sa.Column('known_event_type_id', sa.Integer(), nullable=True),
- sa.Column('description', sa.Text(), nullable=True),
- sa.ForeignKeyConstraint(['known_event_type_id'],
- ['known_event_type.id'], ),
- sa.PrimaryKeyConstraint('id'))
- with op.batch_alter_table('chart', copy_from=known_event_table) as batch_op:
- batch_op.create_foreign_key('known_event_user_id_fkey', 'users',
- ['user_id'], ['id'])
-
def downgrade():
# Downgrade would fail because the broken FK constraint can't be re-created.
diff --git a/airflow/migrations/versions/e3a246e0dc1_current_schema.py b/airflow/migrations/versions/e3a246e0dc1_current_schema.py
index cbf9897645..c915ed6f76 100644
--- a/airflow/migrations/versions/e3a246e0dc1_current_schema.py
+++ b/airflow/migrations/versions/e3a246e0dc1_current_schema.py
@@ -111,13 +111,6 @@ def upgrade():
['job_type', 'latest_heartbeat'],
unique=False
)
- if 'known_event_type' not in tables:
- op.create_table(
- 'known_event_type',
- sa.Column('id', sa.Integer(), nullable=False),
- sa.Column('know_event_type', sa.String(length=200), nullable=True),
- sa.PrimaryKeyConstraint('id')
- )
if 'log' not in tables:
op.create_table(
'log',
@@ -228,21 +221,6 @@ def upgrade():
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
- if 'known_event' not in tables:
- op.create_table(
- 'known_event',
- sa.Column('id', sa.Integer(), nullable=False),
- sa.Column('label', sa.String(length=200), nullable=True),
- sa.Column('start_date', sa.DateTime(), nullable=True),
- sa.Column('end_date', sa.DateTime(), nullable=True),
- sa.Column('user_id', sa.Integer(), nullable=True),
- sa.Column('known_event_type_id', sa.Integer(), nullable=True),
- sa.Column('description', sa.Text(), nullable=True),
- sa.ForeignKeyConstraint(['known_event_type_id'],
- ['known_event_type.id'], ),
- sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
- sa.PrimaryKeyConstraint('id')
- )
if 'xcom' not in tables:
op.create_table(
'xcom',
@@ -262,7 +240,6 @@ def upgrade():
def downgrade():
- op.drop_table('known_event')
op.drop_table('chart')
op.drop_table('variable')
op.drop_table('user')
@@ -273,7 +250,6 @@ def downgrade():
op.drop_table('slot_pool')
op.drop_table('sla_miss')
op.drop_table('log')
- op.drop_table('known_event_type')
op.drop_index('job_type_heart', table_name='job')
op.drop_table('job')
op.drop_table('import_error')
diff --git a/airflow/models/__init__.py b/airflow/models/__init__.py
index c1f75fdbf2..69b164c6d6 100755
--- a/airflow/models/__init__.py
+++ b/airflow/models/__init__.py
@@ -4393,37 +4393,6 @@ def __repr__(self):
return self.label
-class KnownEventType(Base):
- __tablename__ = "known_event_type"
-
- id = Column(Integer, primary_key=True)
- know_event_type = Column(String(200))
-
- def __repr__(self):
- return self.know_event_type
-
-
-class KnownEvent(Base):
- __tablename__ = "known_event"
-
- id = Column(Integer, primary_key=True)
- label = Column(String(200))
- start_date = Column(UtcDateTime)
- end_date = Column(UtcDateTime)
- user_id = Column(Integer(), ForeignKey('users.id'),)
- known_event_type_id = Column(Integer(), ForeignKey('known_event_type.id'),)
- reported_by = relationship(
- "User", cascade=False, cascade_backrefs=False, backref='known_events')
- event_type = relationship(
- "KnownEventType",
- cascade=False,
- cascade_backrefs=False, backref='known_events')
- description = Column(Text)
-
- def __repr__(self):
- return self.label
-
-
class Variable(Base, LoggingMixin):
__tablename__ = "variable"
diff --git a/airflow/utils/db.py b/airflow/utils/db.py
index e864c6f26e..12ad6f5bad 100644
--- a/airflow/utils/db.py
+++ b/airflow/utils/db.py
@@ -289,20 +289,6 @@ def initdb(rbac=False):
conn_id='cassandra_default', conn_type='cassandra',
host='cassandra', port=9042))
- # Known event types
- KET = models.KnownEventType
- if not session.query(KET).filter(KET.know_event_type == 'Holiday').first():
- session.add(KET(know_event_type='Holiday'))
- if not session.query(KET).filter(KET.know_event_type == 'Outage').first():
- session.add(KET(know_event_type='Outage'))
- if not session.query(KET).filter(
- KET.know_event_type == 'Natural Disaster').first():
- session.add(KET(know_event_type='Natural Disaster'))
- if not session.query(KET).filter(
- KET.know_event_type == 'Marketing Campaign').first():
- session.add(KET(know_event_type='Marketing Campaign'))
- session.commit()
-
dagbag = models.DagBag()
# Save individual DAGs in the ORM
for dag in dagbag.dags.values():
diff --git a/airflow/www/app.py b/airflow/www/app.py
index d700f87dd2..bc1a40bfc5 100644
--- a/airflow/www/app.py
+++ b/airflow/www/app.py
@@ -89,9 +89,6 @@ def create_app(config=None, testing=False):
av(vs.QueryView(name='Ad Hoc Query', category="Data Profiling"))
av(vs.ChartModelView(
models.Chart, Session, name="Charts", category="Data Profiling"))
- av(vs.KnownEventView(
- models.KnownEvent,
- Session, name="Known Events", category="Data Profiling"))
av(vs.SlaMissModelView(
models.SlaMiss,
Session, name="SLA Misses", category="Browse"))
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 024f81ad53..337aa3bc3b 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -83,7 +83,6 @@
from airflow.www import utils as wwwutils
from airflow.www.forms import (DateTimeForm, DateTimeWithNumRunsForm,
DateTimeWithNumRunsWithDagRunsForm)
-from airflow.www.validators import GreaterEqualThan
if PY2:
from cStringIO import StringIO
else:
@@ -2452,88 +2451,6 @@ def on_model_change(self, form, model, is_created=True):
chart_mapping = dict(chart_mapping)
-class KnownEventView(wwwutils.DataProfilingMixin, AirflowModelView):
- verbose_name = "known event"
- verbose_name_plural = "known events"
- form_columns = (
- 'label',
- 'event_type',
- 'start_date',
- 'end_date',
- 'reported_by',
- 'description',
- )
- form_args = {
- 'label': {
- 'validators': [
- validators.DataRequired(),
- ],
- },
- 'event_type': {
- 'validators': [
- validators.DataRequired(),
- ],
- },
- 'start_date': {
- 'validators': [
- validators.DataRequired(),
- ],
- 'filters': [
- parse_datetime_f,
- ],
- },
- 'end_date': {
- 'validators': [
- validators.DataRequired(),
- GreaterEqualThan(fieldname='start_date'),
- ],
- 'filters': [
- parse_datetime_f,
- ]
- },
- 'reported_by': {
- 'validators': [
- validators.DataRequired(),
- ],
- }
- }
- column_list = (
- 'label',
- 'event_type',
- 'start_date',
- 'end_date',
- 'reported_by',
- )
- column_default_sort = ("start_date", True)
- column_sortable_list = (
- 'label',
- # todo: yes this has a spelling error
- ('event_type', 'event_type.know_event_type'),
- 'start_date',
- 'end_date',
- ('reported_by', 'reported_by.username'),
- )
- filter_converter = wwwutils.UtcFilterConverter()
- form_overrides = dict(start_date=DateTimeField, end_date=DateTimeField)
-
-
-class KnownEventTypeView(wwwutils.DataProfilingMixin, AirflowModelView):
- pass
-
-
-# NOTE: For debugging / troubleshooting
-# mv = KnowEventTypeView(
-# models.KnownEventType,
-# Session, name="Known Event Types", category="Manage")
-# admin.add_view(mv)
-# class DagPickleView(SuperUserMixin, ModelView):
-# pass
-# mv = DagPickleView(
-# models.DagPickle,
-# Session, name="Pickles", category="Manage")
-# admin.add_view(mv)
-
-
class VariableView(wwwutils.DataProfilingMixin, AirflowModelView):
verbose_name = "Variable"
verbose_name_plural = "Variables"
diff --git a/tests/www/test_views.py b/tests/www/test_views.py
index f772e2924b..42b1019cb1 100644
--- a/tests/www/test_views.py
+++ b/tests/www/test_views.py
@@ -169,76 +169,6 @@ def test_xss_prevention(self):
response.data.decode("utf-8"))
-class TestKnownEventView(unittest.TestCase):
-
- CREATE_ENDPOINT = '/admin/knownevent/new/?url=/admin/knownevent/'
-
- @classmethod
- def setUpClass(cls):
- super(TestKnownEventView, cls).setUpClass()
- session = Session()
- session.query(models.KnownEvent).delete()
- session.query(models.User).delete()
- session.commit()
- user = models.User(username='airflow')
- session.add(user)
- session.commit()
- cls.user_id = user.id
- session.close()
-
- def setUp(self):
- super(TestKnownEventView, self).setUp()
- configuration.load_test_config()
- app = application.create_app(testing=True)
- app.config['WTF_CSRF_METHODS'] = []
- self.app = app.test_client()
- self.session = Session()
- self.known_event = {
- 'label': 'event-label',
- 'event_type': '1',
- 'start_date': '2017-06-05 12:00:00',
- 'end_date': '2017-06-05 13:00:00',
- 'reported_by': self.user_id,
- 'description': '',
- }
-
- def tearDown(self):
- self.session.query(models.KnownEvent).delete()
- self.session.commit()
- self.session.close()
- super(TestKnownEventView, self).tearDown()
-
- @classmethod
- def tearDownClass(cls):
- session = Session()
- session.query(models.User).delete()
- session.commit()
- session.close()
- super(TestKnownEventView, cls).tearDownClass()
-
- def test_create_known_event(self):
- response = self.app.post(
- self.CREATE_ENDPOINT,
- data=self.known_event,
- follow_redirects=True,
- )
- self.assertEqual(response.status_code, 200)
- self.assertEqual(self.session.query(models.KnownEvent).count(), 1)
-
- def test_create_known_event_with_end_data_earlier_than_start_date(self):
- self.known_event['end_date'] = '2017-06-05 11:00:00'
- response = self.app.post(
- self.CREATE_ENDPOINT,
- data=self.known_event,
- follow_redirects=True,
- )
- self.assertIn(
- 'Field must be greater than or equal to Start Date.',
- response.data.decode('utf-8'),
- )
- self.assertEqual(self.session.query(models.KnownEvent).count(), 0)
-
-
class TestPoolModelView(unittest.TestCase):
CREATE_ENDPOINT = '/admin/pool/new/?url=/admin/pool/'
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services