ephraimbuddy commented on a change in pull request #22274:
URL: https://github.com/apache/airflow/pull/22274#discussion_r835079224
##########
File path: airflow/models/log.py
##########
@@ -30,8 +30,9 @@ class Log(Base):
id = Column(Integer, primary_key=True)
dttm = Column(UtcDateTime)
- dag_id = Column(String(ID_LEN, **COLLATION_ARGS))
- task_id = Column(String(ID_LEN, **COLLATION_ARGS))
+ dag_id = Column(StringID())
+ task_id = Column(StringID())
+ map_index = Column(Integer, server_default='-1')
Review comment:
If we do not want the map_index value to be set when dag_id, task_id,
etc are null, I think we shouldn't use `server_default`. We could use default:
```python
map_index = Column(Integer, default=lambda:set_map_index())
```
Then workout the map_index in `set_map_index`?
##########
File path: airflow/migrations/versions/0105_75d5ed6c2b43_add_map_index_to_log.py
##########
@@ -0,0 +1,64 @@
+#
+# 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 map_index to Log.
+
+Revision ID: 75d5ed6c2b43
+Revises: 4eaab2fe6582
+Create Date: 2022-03-15 16:35:54.816863
+"""
+from alembic import op
+from sqlalchemy import Column, Integer
+
+# Revision identifiers, used by Alembic.
+revision = '75d5ed6c2b43'
+down_revision = '4eaab2fe6582'
+branch_labels = None
+depends_on = None
+airflow_version = '2.3.0'
+
+
+def upgrade():
+ """Add map_index to Log."""
+ op.add_column("log", Column("map_index", Integer, server_default="-1"))
+ # Only set map_index if the log is related to a task instance.
+ op.execute(
+ """
+ update log set map_index = -1
+ where dag_id is not null and task_id is not null and execution_date is
not null
+ """
Review comment:
I think that the `server_default` above will set the `map_index`
regardless of whether dag_id etc is null
##########
File path: airflow/migrations/versions/0105_75d5ed6c2b43_add_map_index_to_log.py
##########
@@ -0,0 +1,64 @@
+#
+# 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 map_index to Log.
+
+Revision ID: 75d5ed6c2b43
+Revises: 4eaab2fe6582
+Create Date: 2022-03-15 16:35:54.816863
+"""
+from alembic import op
+from sqlalchemy import Column, Integer
+
+# Revision identifiers, used by Alembic.
+revision = '75d5ed6c2b43'
+down_revision = '4eaab2fe6582'
+branch_labels = None
+depends_on = None
+airflow_version = '2.3.0'
+
+
+def upgrade():
+ """Add map_index to Log."""
+ op.add_column("log", Column("map_index", Integer, server_default="-1"))
+ # Only set map_index if the log is related to a task instance.
+ op.execute(
+ """
+ update log set map_index = -1
+ where dag_id is not null and task_id is not null and execution_date is
not null
+ """
+ )
+
+
+def _find_map_index_constraints(conn):
+ result = conn.execute(
+ """
+ SELECT CONSTRAINT_NAME
+ FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE
+ WHERE TABLE_NAME = 'log' AND COLUMN_NAME = 'map_index'
+ """,
+ )
+ if result:
+ return result.fetchall()
+ return []
Review comment:
```suggestion
```
seems not used?
--
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]
