fixed collection naming

Author: tunstek

pyspider/database/couchdb/couchdbbase.py

@@ -41,8 +41,6 @@ def _list_project(self):
     def create_database(self, name):
         url = self.base_url + name
         res = requests.put(url, headers={"Content-Type": "application/json"}).json()
-        if name == "test_create_project":
-            raise Exception
         print('[couchdbbase create_database] - url: {} res: {}'.format(url, res))
         return res
 

pyspider/database/couchdb/resultdb.py

@@ -13,8 +13,11 @@ def __init__(self, url, database='resultdb'):
         self.database = database
         self.create_database(database)
 
+    def _get_collection_name(self, project):
+        return self.database + "_" + self._collection_name(project)
+
     def _create_project(self, project):
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
         self.create_database(collection_name)
         #self.database[collection_name].ensure_index('taskid')
         self._list_project()
@@ -34,7 +37,7 @@ def _stringify(self, data):
     def save(self, project, taskid, url, result):
         if project not in self.projects:
             self._create_project(project)
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
         obj = {
             'taskid': taskid,
             'url': url,
@@ -53,7 +56,7 @@ def select(self, project, fields=None, offset=0, limit=0):
             return
         offset = offset or 0
         limit = limit or 0
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
         if fields is None:
             fields = []
         if limit == 0:
@@ -79,7 +82,7 @@ def count(self, project):
             self._list_project()
         if project not in self.projects:
             return
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
         return len(self.get_all_docs(collection_name))
         #return self.database[collection_name].count()
 
@@ -88,7 +91,7 @@ def get(self, project, taskid, fields=None):
             self._list_project()
         if project not in self.projects:
             return
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
         if fields is None:
             fields = []
         sel = {

pyspider/database/couchdb/taskdb.py

@@ -16,8 +16,11 @@ def __init__(self, url, database='taskdb'):
         self.projects = set()
         self._list_project()
 
+    def _get_collection_name(self, project):
+        return self.database + "_" + self._collection_name(project)
+
     def _create_project(self, project):
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
         self.create_database(collection_name)
         #self.database[collection_name].ensure_index('status')
         #self.database[collection_name].ensure_index('taskid')
@@ -37,7 +40,7 @@ def load_tasks(self, status, project=None, fields=None):
             projects = self.projects
 
         for project in projects:
-            collection_name = self._collection_name(project)
+            collection_name = self._get_collection_name(project)
             for task in self.get_docs(collection_name, {"selector": {"status": status}, "fields": fields}):
             #for task in self.database[collection_name].find({'status': status}, fields):
                 print("[couchdb taskdb load_tasks] status: {} project: {} fields: {} res: {}".format(status, project, fields, task))
@@ -51,7 +54,7 @@ def get_task(self, project, taskid, fields=None):
             return
         if fields is None:
             fields = []
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
         ret = self.get_docs(collection_name, {"selector": {"taskid": taskid}, "fields": fields})
         #ret = self.database[collection_name].find_one({'taskid': taskid}, fields)
         if len(ret) == 0:
@@ -63,7 +66,7 @@ def status_count(self, project):
             self._list_project()
         if project not in self.projects:
             return {}
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
 
         def _count_for_status(collection_name, status):
             total = len(self.get_docs(collection_name, {"selector": {'status': status}}))
@@ -95,7 +98,7 @@ def update(self, project, taskid, obj={}, **kwargs):
         obj = dict(obj)
         obj.update(kwargs)
         obj['updatetime'] = time.time()
-        collection_name = self._collection_name(project)
+        collection_name = self._get_collection_name(project)
         return self.update_doc(collection_name, taskid, obj)
 
     def drop_database(self):