openstack/deb-gnocchi
Code Issues Proposed changes

Merge "Revert "indexer: fix datetime with mysql >= 5.7.17""

Browse Source
This commit is contained in:
Jenkins 2017-01-24 14:16:49 +00:00 committed by Gerrit Code Review
commit 85f9027130
2 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gnocchi/indexer/alembic/versions/5c4f93e5bb4_mysql_float_to_timestamp.py
View File

@ -36,40 +36,33 @@ branch_labels = None
depends_on = None
timestamp_default = '1000-01-01 00:00:00.000000'
def upgrade():
bind = op.get_bind()
if bind.engine.name == "mysql":
if bind and bind.engine.name == "mysql":
op.execute("SET time_zone = '+00:00'")
# NOTE(jd) So that crappy engine that is MySQL does not have "ALTER
# TABLE … USING …". We need to copy everything and convert…
for table_name, column_name in (("resource", "started_at"),
("resource", "ended_at"),
("resource", "revision_start"),
("resource_history", "started_at"),
("resource_history", "ended_at"),
("resource_history", "revision_start"),
("resource_history", "revision_end"),
("resource_type", "updated_at")):
# NOTE(jd) So that crappy engine that is MySQL does not have "ALTER
# TABLE … USING …". We need to copy everything and convert…
for table_name, column_name in (("resource", "started_at"),
("resource", "ended_at"),
("resource", "revision_start"),
("resource_history", "started_at"),
("resource_history", "ended_at"),
("resource_history", "revision_start"),
("resource_history", "revision_end"),
("resource_type", "updated_at")):
nullable = column_name == "ended_at"
nullable = column_name == "ended_at"
server_default = None if nullable else timestamp_default
if bind.engine.name == "mysql":
existing_type = sa.types.DECIMAL(
precision=20, scale=6, asdecimal=True)
existing_col = sa.Column(
column_name,
sa.types.DECIMAL(precision=20, scale=6, asdecimal=True),
existing_type,
nullable=nullable)
temp_col = sa.Column(
column_name + "_ts",
sqlalchemy_base.TimestampUTC(),
nullable=nullable,
server_default=server_default,
)
nullable=True)
op.add_column(table_name, temp_col)
t = sa.sql.table(table_name, existing_col, temp_col)
op.execute(t.update().values(
@ -77,16 +70,8 @@ def upgrade():
op.drop_column(table_name, column_name)
op.alter_column(table_name,
column_name + "_ts",
existing_type=sqlalchemy_base.TimestampUTC(),
nullable=nullable,
type_=sqlalchemy_base.TimestampUTC(),
existing_nullable=nullable,
existing_server_default=server_default,
server_default=server_default,
existing_type=existing_type,
new_column_name=column_name)
else:
op.alter_column(
table_name,
column_name,
existing_type=sqlalchemy_base.TimestampUTC(),
existing_nullable=nullable,
existing_server_default=None,
server_default=None if nullable else timestamp_default)

7
gnocchi/indexer/sqlalchemy_base.py
View File

@ -43,9 +43,6 @@ COMMON_TABLES_ARGS = {'mysql_charset': "utf8",
'mysql_engine': "InnoDB"}
timestamp_default = sqlalchemy.text("'1000-01-01 00:00:00.000000'")
class PreciseTimestamp(types.TypeDecorator):
"""Represents a timestamp precise to the microsecond.
@ -287,7 +284,6 @@ class ResourceType(Base, GnocchiBase, resource_type.ResourceType):
# MySQL is not a Timestamp, so it would
# not store a timestamp but a date as an
# integer.
server_default=timestamp_default,
default=lambda: utils.utcnow())
def to_baseclass(self):
@ -335,10 +331,8 @@ class ResourceMixin(ResourceJsonifier):
creator = sqlalchemy.Column(sqlalchemy.String(255))
started_at = sqlalchemy.Column(TimestampUTC, nullable=False,
server_default=timestamp_default,
default=lambda: utils.utcnow())
revision_start = sqlalchemy.Column(TimestampUTC, nullable=False,
server_default=timestamp_default,
default=lambda: utils.utcnow())
ended_at = sqlalchemy.Column(TimestampUTC)
user_id = sqlalchemy.Column(sqlalchemy.String(255))
@ -380,7 +374,6 @@ class ResourceHistory(ResourceMixin, Base, GnocchiBase):
name="fk_rh_id_resource_id"),
nullable=False)
revision_end = sqlalchemy.Column(TimestampUTC, nullable=False,
server_default=timestamp_default,
default=lambda: utils.utcnow())
metrics = sqlalchemy.orm.relationship(
Metric, primaryjoin="Metric.resource_id == ResourceHistory.id",