Merge "Change sample id from int to BigInt" into stable/ocata

2 files changed, 22 insertions, 1 deletions

diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/046_sample_id_to_bigint.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/046_sample_id_to_bigint.py
new file mode 100644
index 00000000..4300a631
--- /dev/null
+++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/046_sample_id_to_bigint.py
@@ -0,0 +1,21 @@
+# 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.
+
+from sqlalchemy import BigInteger
+from sqlalchemy import MetaData
+from sqlalchemy import Table
+
+
+def upgrade(migrate_engine):
+    meta = MetaData(bind=migrate_engine)
+    sample = Table('sample', meta, autoload=True)
+    sample.c.id.alter(type=BigInteger)
diff --git a/ceilometer/storage/sqlalchemy/models.py b/ceilometer/storage/sqlalchemy/models.py
index 386d7361..ac82b26e 100644
--- a/ceilometer/storage/sqlalchemy/models.py
+++ b/ceilometer/storage/sqlalchemy/models.py
@@ -220,7 +220,7 @@ class Sample(Base):
         Index('ix_sample_meter_id_resource_id', 'meter_id', 'resource_id'),
         _COMMON_TABLE_ARGS,
     )
-    id = Column(Integer, primary_key=True)
+    id = Column(BigInteger, primary_key=True)
     meter_id = Column(Integer, ForeignKey('meter.id'))
     resource_id = Column(Integer, ForeignKey('resource.internal_id'))
     volume = Column(Float(53))