Merge lp:~ev/oops-repository/bucket-version-systems-test into lp:~daisy-pluckers/oops-repository/trunk

[Evan]

Fix the BucketVersionSystems CF and rename it to BucketVersionSystems2.

We set the comparator_type incorrectly with the previous cut of BucketVersionSystems. As we had set it to the same composite type used for the row key (UTF8, ASCII), pycassa was treating the value we were inserting into the column name (the system uuid) as an iterable, and thus giving us data like a:3 (where a3 might be the first two characters of a sha512 hashed system UUID).

[Brian Murray (brian-murray)]

This looks good to me sorry about the mistake with the comparator_type.

review: Approve

[Evan (ev)]

No worries. It surfaced problems in our review process. :)

[Evan (ev)]

yay, it works

=== modified file 'oopsrepository/oopses.py'
--- oopsrepository/oopses.py	2013-06-11 16:24:25 +0000
+++ oopsrepository/oopses.py	2013-06-12 14:53:30 +0000
@@ -310,7 +310,7 @@
         # If all we had were unicode characters.
         return
     pool = connection_pool(config)
-    bucketsystems_cf = pycassa.ColumnFamily(pool, 'BucketVersionSystems')
+    bucketsystems_cf = pycassa.ColumnFamily(pool, 'BucketVersionSystems2')
     bucketsystems_cf.insert((bucketid, version), {system: ''})
 
 def update_source_version_buckets(config, source, version, bucketid):

=== modified file 'oopsrepository/schema.py'
--- oopsrepository/schema.py	2013-06-10 16:20:23 +0000
+++ oopsrepository/schema.py	2013-06-12 14:53:30 +0000
@@ -96,11 +96,11 @@
             workaround_1779(mgr.create_column_family, keyspace, 'BucketSystems',
                 key_validation_class=UTF8_TYPE,
                 comparator_type=ASCII_TYPE)
-        if 'BucketVersionSystems' not in cfs:
+        if 'BucketVersionSystems2' not in cfs:
             composite = CompositeType(UTF8Type(), AsciiType())
             workaround_1779(mgr.create_column_family, keyspace,
-                'BucketVersionSystems', key_validation_class=composite,
-                comparator_type=composite)
+                'BucketVersionSystems2', key_validation_class=composite,
+                comparator_type=AsciiType())
         if 'Counters' not in cfs:
             workaround_1779(mgr.create_column_family, keyspace, 'Counters',
                 comparator_type=UTF8_TYPE,

=== modified file 'oopsrepository/tests/test_oopses.py'
--- oopsrepository/tests/test_oopses.py	2013-06-12 12:38:16 +0000
+++ oopsrepository/tests/test_oopses.py	2013-06-12 14:53:30 +0000
@@ -266,3 +266,15 @@
 
         bucket_id = srcversbuckets.get((src_package, version)).keys()[0]
         self.assertEqual(oops_id, bucket_id)
+
+    def test_update_bucket_systems(self):
+        keyspace = self.useFixture(TemporaryOOPSDB()).keyspace
+        bv_systems = pycassa.ColumnFamily(self.pool, 'BucketVersionSystems2')
+        bucketid = 'foo'
+        system_token = 'system-id'
+        version = '1.0'
+        oopses.update_bucket_systems(self.config, bucketid, system_token,
+                                     version=version)
+
+        system = bv_systems.get((bucketid, version)).keys()[0]
+        self.assertEqual(system, system_token)