Merge lp:~brian-murray/oops-repository/src-version-buckets into lp:~daisy-pluckers/oops-repository/trunk

[Brian Murray]

This adds in a ColumnFamily that will track source package versions and buckets that affect them.

[lp:~brian-murray/oops-repository/src-version-buckets]

65. By Brian Murray on 2013-03-26

add CF to the schema

[Evan (ev)]

Bucket keys can be UTF8, so the comparator_type will need to be UTF8Type(). Also, you insert using a composite type for the row key, but use an AsciiType() in the definition for it in schema.

All together, this should be something like:
9 + if 'SourceVersionBuckets' not in cfs:
30 + composite = CompositeType(AsciiType(), AsciiType())
31 + workaround_1779(mgr.create_column_family, keyspace,
32 + 'SourceVersionBuckets', key_validation_class=composite,
33 + comparator_type=UTF8_TYPE)

Also, can we have a simple test of this new function in oopsrepository/test/test_oopses.py?

Thanks!

review: Needs Fixing

[lp:~brian-murray/oops-repository/src-version-buckets]

66. By Brian Murray on 2013-03-27

update branch based on evan's feedback

67. By Brian Murray on 2013-03-27

fix test failures

[Brian Murray (brian-murray)]

It should be good now.

[Evan (ev)]

Looks good to me. Feel free to merge and file an RT for this.

review: Approve

=== modified file 'oopsrepository/oopses.py'
--- oopsrepository/oopses.py	2013-03-12 09:28:49 +0000
+++ oopsrepository/oopses.py	2013-03-27 21:27:19 +0000
@@ -251,9 +251,14 @@
         metadata['Source'] = source
         bucketmetadata_cf.insert(bucketid, metadata)
 
-def update_bucket_systems(config, bucket, system):
+def update_bucket_systems(config, bucketid, system):
     if not system:
         return
     pool = connection_pool(config)
     bucketsystems_cf = pycassa.ColumnFamily(pool, 'BucketSystems')
-    bucketsystems_cf.insert(bucket, {system: ''})
+    bucketsystems_cf.insert(bucketid, {system: ''})
+
+def update_source_version_buckets(config, source, version, bucketid):
+    pool = connection_pool(config)
+    srcversionbuckets_cf = pycassa.ColumnFamily(pool, 'SourceVersionBuckets')
+    srcversionbuckets_cf.insert((source, version), {bucketid: ''})

=== modified file 'oopsrepository/schema.py'
--- oopsrepository/schema.py	2013-03-12 04:12:56 +0000
+++ oopsrepository/schema.py	2013-03-27 21:27:19 +0000
@@ -90,6 +90,11 @@
                             default_validation_class=DateType(),
                             key_validation_class=composite,
                             comparator_type=TIME_UUID_TYPE)
+        if 'SourceVersionBuckets' not in cfs:
+            composite = CompositeType(AsciiType(), AsciiType())
+            workaround_1779(mgr.create_column_family, keyspace,
+                'SourceVersionBuckets', key_validation_class=composite,
+                 comparator_type=UTF8_TYPE)
     finally:
         mgr.close()
 

=== modified file 'oopsrepository/tests/test_oopses.py'
--- oopsrepository/tests/test_oopses.py	2013-03-12 05:56:08 +0000
+++ oopsrepository/tests/test_oopses.py	2013-03-27 21:27:19 +0000
@@ -219,3 +219,15 @@
         self.assertEqual(today, d)
         d = errorsbyrelease.get((release, today)).values()[0]
         self.assertEqual(today, d)
+
+    def test_update_source_version_buckets(self):
+        keyspace = self.useFixture(TemporaryOOPSDB()).keyspace
+        srcversbuckets = pycassa.ColumnFamily(self.pool, 'SourceVersionBuckets')
+        src_package = 'whoopsie'
+        version = '1.2.3'
+        oops_id = str(uuid.uuid1())
+        oopses.update_source_version_buckets(self.config, src_package,
+                                             version, oops_id)
+
+        bucket_id = srcversbuckets.get((src_package, version)).keys()[0]
+        self.assertEqual(oops_id, bucket_id)