Repository: incubator-airflow Updated Branches: refs/heads/master 04bfba3aa -> 67b47c958
[AIRFLOW-1495] Fix migration on index on job_id There was a merge conflict on the migration hash for down revision at the time that two commits including migrations were merged. This commit restores the chain of revisions for the migrations, pointing to the last one. The job_id index migration was regenerated from the top migration. Closes #2524 from edgarRd/erod-ti-jobid-index-fix Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/67b47c95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/67b47c95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/67b47c95 Branch: refs/heads/master Commit: 67b47c958903a2297916b44e97adc289d6184b5a Parents: 04bfba3 Author: Edgar Rodriguez <[email protected]> Authored: Tue Aug 15 15:27:04 2017 -0700 Committer: Dan Davydov <[email protected]> Committed: Tue Aug 15 15:27:06 2017 -0700 ---------------------------------------------------------------------- .../7171349d4c73_add_ti_job_id_index.py | 38 -------------------- .../947454bf1dff_add_ti_job_id_index.py | 38 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/67b47c95/airflow/migrations/versions/7171349d4c73_add_ti_job_id_index.py ---------------------------------------------------------------------- diff --git a/airflow/migrations/versions/7171349d4c73_add_ti_job_id_index.py b/airflow/migrations/versions/7171349d4c73_add_ti_job_id_index.py deleted file mode 100644 index b7e2be6..0000000 --- a/airflow/migrations/versions/7171349d4c73_add_ti_job_id_index.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Licensed 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 ti job_id index - -Revision ID: 7171349d4c73 -Revises: cc1e65623dc7 -Create Date: 2017-08-14 18:08:50.196042 - -""" - -# revision identifiers, used by Alembic. -revision = '7171349d4c73' -down_revision = 'cc1e65623dc7' -branch_labels = None -depends_on = None - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - op.create_index('ti_job_id', 'task_instance', ['job_id'], unique=False) - - -def downgrade(): - op.drop_index('ti_job_id', table_name='task_instance') http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/67b47c95/airflow/migrations/versions/947454bf1dff_add_ti_job_id_index.py ---------------------------------------------------------------------- diff --git a/airflow/migrations/versions/947454bf1dff_add_ti_job_id_index.py b/airflow/migrations/versions/947454bf1dff_add_ti_job_id_index.py new file mode 100644 index 0000000..b0817c3 --- /dev/null +++ b/airflow/migrations/versions/947454bf1dff_add_ti_job_id_index.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# +# Licensed 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 ti job_id index + +Revision ID: 947454bf1dff +Revises: bdaa763e6c56 +Create Date: 2017-08-15 15:12:13.845074 + +""" + +# revision identifiers, used by Alembic. +revision = '947454bf1dff' +down_revision = 'bdaa763e6c56' +branch_labels = None +depends_on = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.create_index('ti_job_id', 'task_instance', ['job_id'], unique=False) + + +def downgrade(): + op.drop_index('ti_job_id', table_name='task_instance')
