Merge lp:~chipaca/u1db/whoops_i_did_it_again into lp:u1db

[John Lenton]

Fix #1002375 (stop get_keys_from_index throwing IndexDoesNotExist on existing but empty indexes)

I introduced a bug in r302 where get_keys_from_index fails with IndexDoesNotExist in the case where the index exists but has no matches. This fixes that.

[Eric Casteleijn (thisfred)]

Again looks good, and I looked harder and longer.

review: Approve

[Samuele Pedroni (pedronis)]

+1

review: Approve

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 5/21/2012 6:36 PM, John Lenton wrote:
> John Lenton has proposed merging
> lp:~chipaca/u1db/whoops_i_did_it_again into lp:u1db.
>
> Requested reviews: Ubuntu One hackers (ubuntuone-hackers) Related
> bugs: Bug #1002375 in U1DB: "get_index_keys fails with
> IndexDoesNotExist when index exists but has nothing indexed."
> https://bugs.launchpad.net/u1db/+bug/1002375
>
> For more details, see:
> https://code.launchpad.net/~chipaca/u1db/whoops_i_did_it_again/+merge/106665
>
> I introduced a bug in r302 where get_keys_from_index fails with
> IndexDoesNotExist in the case where the index exists but has no
> matches. This fixes that.

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+7XCEACgkQJdeBCYSNAAMBBQCgu+XTE0Ff+mcEvQf83EYK/Zmq
R4wAn21sEZyaheGP9bpr22utQwXYoO1X
=aT3m
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'src/u1db_query.c'
--- src/u1db_query.c	2012-05-21 15:01:18 +0000
+++ src/u1db_query.c	2012-05-21 16:37:19 +0000
@@ -631,7 +631,26 @@
     }
     status = sqlite3_step(statement);
     if (status == SQLITE_DONE) {
-        status = U1DB_INDEX_DOES_NOT_EXIST;
+        sqlite3_finalize(statement);
+        status = sqlite3_prepare_v2(
+            db->sql_handle,
+            "SELECT field FROM index_definitions WHERE name = ?;",
+            -1, &statement, NULL);
+        if (status != SQLITE_OK) {
+            goto finish;
+        }
+        status = sqlite3_bind_text(
+            statement, 1, index_name, -1, SQLITE_TRANSIENT);
+        if (status != SQLITE_OK) {
+            goto finish;
+        }
+        status = sqlite3_step(statement);
+        if (status == SQLITE_DONE) {
+            status = U1DB_INDEX_DOES_NOT_EXIST;
+        } else {
+            status = U1DB_OK;
+        }
+        goto finish;
     }
     while (status == SQLITE_ROW) {
         key = (char*)sqlite3_column_text(statement, 0);

=== modified file 'u1db/backends/sqlite_backend.py'
--- u1db/backends/sqlite_backend.py	2012-05-21 15:01:18 +0000
+++ u1db/backends/sqlite_backend.py	2012-05-21 16:37:19 +0000
@@ -622,7 +622,8 @@
                 '\nstatement: %s\nargs: %s\n' % (SQL_INDEX_KEYS, (index,)))
         res = c.fetchall()
         if not res:
-            raise errors.IndexDoesNotExist
+            # raise IndexDoesNotExist if appropriate
+            self._get_index_definition(index)
         return [r[0] for r in res]
 
     def delete_index(self, index_name):

=== modified file 'u1db/tests/test_backends.py'
--- u1db/tests/test_backends.py	2012-05-21 15:01:18 +0000
+++ u1db/tests/test_backends.py	2012-05-21 16:37:19 +0000
@@ -733,6 +733,10 @@
                           self.db.get_index_keys,
                           'foo')
 
+    def test_get_index_keys_works_if_no_docs(self):
+        self.db.create_index('test-idx', ['key'])
+        self.assertEqual([], self.db.get_index_keys('test-idx'))
+
     def test_put_updates_index(self):
         doc = self.db.create_doc(simple_doc)
         self.db.create_index('test-idx', ['key'])