Add support to delete docs through Solr interface.

roidrage · roidrage · commit fea6e96e60f0 · 2011-07-14T18:25:03.000+02:00
Works for both IDs and queries.
diff --git a/riak/search.py b/riak/search.py
@@ -43,8 +43,31 @@ def add(self, index, *docs):
         self._transport.post_request(uri=url, body=xml.toxml(),
                                      content_type="text/xml")
 
-    def delete(self, doc):
-        pass
+    index = add
+
+    def delete(self, index, docs=None, queries=None):
+        xml = Document()
+        root = xml.createElement('delete')
+        if docs:
+            for doc in docs:
+                doc_element = xml.createElement('id')
+                text = xml.createTextNode(doc)
+                doc_element.appendChild(text)
+                root.appendChild(doc_element)
+        if queries:
+            for query in queries:
+                query_element = xml.createElement('query')
+                text = xml.createTextNode(query)
+                query_element.appendChild(text)
+                root.appendChild(query_element)
+
+        xml.appendChild(root)
+
+        url = "/solr/%s/update" % index
+        self._transport.post_request(uri=url, body=xml.toxml(),
+                                     content_type="text/xml")
+
+    remove = delete
 
     def search(self, index, query, **params):
         options = {'q': query, 'wt': 'json'}
@@ -53,3 +76,5 @@ def search(self, index, query, **params):
         headers, results = self._transport.get_request(uri, options)
         decoder = self.get_decoder(headers['content-type'])
         return decoder(results)
+    
+    select = search
diff --git a/riak/tests/test_all.py b/riak/tests/test_all.py
@@ -792,6 +792,29 @@ def test_add_multiple_documents_to_index(self):
         results = self.client.solr().search("searchbucket", "username:russell OR username:dizzy")
         self.assertEquals(2, len(results["response"]["docs"]))
 
+    def test_delete_documents_from_search_by_id(self):
+        if SKIP_SEARCH:
+            return True
+        self.client.solr().add("searchbucket", {"id": "dizzy", "username": "dizzy"}, {"id": "russell", "username": "russell"})
+        self.client.solr().delete("searchbucket", docs=["dizzy"])
+        results = self.client.solr().search("searchbucket", "username:russell OR username:dizzy")
+        self.assertEquals(1, len(results["response"]["docs"]))
+
+    def test_delete_documents_from_search_by_query(self):
+        if SKIP_SEARCH:
+            return True
+        self.client.solr().add("searchbucket", {"id": "dizzy", "username": "dizzy"}, {"id": "russell", "username": "russell"})
+        self.client.solr().delete("searchbucket", queries=["username:dizzy", "username:russell"])
+        results = self.client.solr().search("searchbucket", "username:russell OR username:dizzy")
+        self.assertEquals(0, len(results["response"]["docs"]))
+
+    def test_delete_documents_from_search_by_query_and_id(self):
+        if SKIP_SEARCH:
+            return True
+        self.client.solr().add("searchbucket", {"id": "dizzy", "username": "dizzy"}, {"id": "russell", "username": "russell"})
+        self.client.solr().delete("searchbucket", docs=["dizzy"], queries=["username:russell"])
+        results = self.client.solr().search("searchbucket", "username:russell OR username:dizzy")
+        self.assertEquals(0, len(results["response"]["docs"]))
 
 class RiakHttpPoolTransportTestCase(BaseTestCase, MapReduceAliasTestMixIn, unittest.TestCase):
 
