Update requirements.txt

CBLClient/Collection.py

@@ -0,0 +1,117 @@
+from CBLClient.Client import Client
+from CBLClient.Args import Args
+
+
+class Collection(object):
+    _client = None
+
+    def __init__(self, base_url):
+        self.base_url = base_url
+
+        # If no base url was specified, raise an exception
+        if not self.base_url:
+            raise Exception("No base_url specified")
+
+        self._client = Client(base_url)
+
+    def collectionName(self, collection):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        return self._client.invokeMethod("collection_getCollectionName", args)
+
+    def allCollection(self, database, scopeName):
+        args = Args()
+        args.setMemoryPointer("database", database)
+        args.setString("scopeName", scopeName)
+        return self._client.invokeMethod("collection_collectionNames", args)
+
+    def documentCount(self, collection):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        return self._client.invokeMethod("collection_documentCount", args)
+
+    def saveDocument(self, collection, document):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setMemoryPointer("document", document)
+        return self._client.invokeMethod("collection_saveDocument", args)
+
+    def collectionScope(self, collection):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        return self._client.invokeMethod("collection_collectionScope", args)
+
+    def getDocument(self, collection, docId):
+        args = Args()
+        args.setString("docId", docId)
+        args.setMemoryPointer("collection", collection)
+        return self._client.invokeMethod("collection_getDocument", args)
+
+    def deleteDocument(self, collection, doc):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setMemoryPointer("document", doc)
+        return self._client.invokeMethod("collection_deleteDocument", args)
+
+    def purgeDocument(self, collection, doc):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setMemoryPointer("document", doc)
+        return self._client.invokeMethod("collection_purgeDocument", args)
+
+    def purgeDocumentById(self, collection, docId):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setString("docId", docId)
+        return self._client.invokeMethod("collection_purgeDocumentID", args)
+
+    def getDocumentExpiration(self, collection, docId):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setString("docId", docId)
+        return self._client.invokeMethod("collection_getDocumentExpiration", args)
+
+    def setDocumentExpiration(self, collection, docId, expirationTime):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setString("docId", docId)
+        args.setInt("expiration", expirationTime)
+        return self._client.invokeMethod("collection_setDocumentExpiration", args)
+
+    def getMutableDocument(self, collection, docId):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setString("docId", docId)
+        return self._client.invokeMethod("collection_getMutableDocument", args)
+
+    def createValueIndex(self, collection, name, expression):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setString("name", name)
+        args.setString("expression", expression)
+        return self._client.invokeMethod("collection_createValueIndex", args)
+
+    def iosCreateValueIndex(self, collection, name, expression):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setString("name", name)
+        args.setArray("expression", expression)
+        return self._client.invokeMethod("collection_createValueIndex", args)
+
+    def deleteIndex(self, collection, name):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        args.setString("name", name)
+        return self._client.invokeMethod("collection_deleteIndex", args)
+
+    def getIndexNames(self, collection):
+        args = Args()
+        args.setMemoryPointer("collection", collection)
+        return self._client.invokeMethod("collection_getIndexNames", args)
+
+    def collectionSaveDocuments(self, database, documents, collection):
+        args = Args()
+        args.setMemoryPointer("database", database)
+        args.setMemoryPointer("collection", collection)
+        args.setDictionary("documents", documents)
+        return self._client.invokeMethod("collection_saveDocuments", args)

CBLClient/Database.py

@@ -1,6 +1,7 @@
 import uuid
 
 from CBLClient.Client import Client
+from CBLClient.Collection import Collection
 from CBLClient.Args import Args
 from keywords.utils import log_info
 from keywords import types
@@ -21,6 +22,7 @@ def __init__(self, base_url):
             raise Exception("No base_url specified")
 
         self._client = Client(base_url)
+        self._collection = Collection(base_url)
 
     def configure(self, directory=None, conflictResolver=None, password=None):
         args = Args()
@@ -208,7 +210,7 @@ def deleteDocumentWithConcurrency(self, database, document, concurrencyControlTy
             args.setString("concurrencyControlType", concurrencyControlType)
         return self._client.invokeMethod("database_deleteWithConcurrency", args)
 
-    def create_bulk_docs(self, number, id_prefix, db, channels=None, generator=None, attachments_generator=None, id_start_num=0, attachment_file_list=None):
+    def create_bulk_docs(self, number, id_prefix, db, channels=None, generator=None, attachments_generator=None, id_start_num=0, attachment_file_list=None, collection=None):
         """
         if id_prefix == None, generate a uuid for each doc
 
@@ -250,7 +252,10 @@ def create_bulk_docs(self, number, id_prefix, db, channels=None, generator=None,
 
             doc_body["id"] = doc_id
             added_docs[doc_id] = doc_body
-        self.saveDocuments(db, added_docs)
+        if collection:
+            self._collection.collectionSaveDocuments(db, added_docs, collection)
+        else:
+            self.saveDocuments(db, added_docs)
         return list(added_docs.keys())
 
     def delete_bulk_docs(self, database, doc_ids=[]):
@@ -385,3 +390,40 @@ def update_bulk_docs_by_deleting_blobs(self, database, doc_ids=[]):
             del doc_body["_attachments"]
             updated_docs[doc] = doc_body
         self.updateDocuments(database, updated_docs)
+
+    def defaultScope(self, database):
+        args = Args()
+        args.setMemoryPointer("database", database)
+        return self._client.invokeMethod("scope_defaultScope", args)
+
+    def defaultCollection(self, database):
+        args = Args()
+        args.setMemoryPointer("database", database)
+        return self._client.invokeMethod("collection_defaultCollection", args)
+
+    def createCollection(self, database, collectionName, scopeName):
+        args = Args()
+        args.setString("collectionName", collectionName)
+        args.setString("scopeName", scopeName)
+        args.setMemoryPointer("database", database)
+        return self._client.invokeMethod("collection_createCollection", args)
+
+    def deleteCollection(self, database, collectionName, scopeName):
+        args = Args()
+        args.setString("collectionName", collectionName)
+        args.setString("scopeName", scopeName)
+        args.setMemoryPointer("database", database)
+        return self._client.invokeMethod("collection_deleteCollection", args)
+
+    def collectionsInScope(self, database, scopeName):
+        args = Args()
+        args.setString("scopeName", scopeName)
+        args.setMemoryPointer("database", database)
+        return self._client.invokeMethod("collection_collectionNames", args)
+
+    def collectionObject(self, database, collectionName, scopeName):
+        args = Args()
+        args.setString("collectionName", collectionName)
+        args.setString("scopeName", scopeName)
+        args.setMemoryPointer("database", database)
+        return self._client.invokeMethod("collection_collection", args)

CBLClient/Replication.py

@@ -331,7 +331,7 @@ def yield_for_replicator_connected(self, repl, max_times=5, sleep_time=0.5):
     def wait_until_replicator_idle(self, repl, err_check=True, max_times=150, sleep_time=2, max_timeout=600):
         count = 0
         idle_count = 0
-        max_idle_count = 3
+        max_idle_count = 20
 
         # Load the current replicator config to decide retry strategy
         repl_config = self.getConfig(repl)

CBLClient/Scope.py

@@ -0,0 +1,26 @@
+from CBLClient.Client import Client
+from CBLClient.Args import Args
+
+
+class Scope(object):
+    _client = None
+
+    def __init__(self, base_url):
+        self.base_url = base_url
+
+        # If no base url was specified, raise an exception
+        if not self.base_url:
+            raise Exception("No base_url specified")
+
+        self._client = Client(base_url)
+
+    def scopeName(self, scope):
+        args = Args()
+        args.setMemoryPointer("scope", scope)
+        return self._client.invokeMethod("scope_scopeName", args)
+
+    def collection(self, scope, collectionName):
+        args = Args()
+        args.setMemoryPointer("scope", scope)
+        args.setString("collectionName", collectionName)
+        return self._client.invokeMethod("scope_collectionObject", args)

keywords/ChangesTracker.py

@@ -60,7 +60,7 @@ def start(self, timeout=1000, heartbeat=None, request_timeout=None):
         else:
             request_timeout = 1000
 
-        auth_type = get_auth_type(self.auth)
+        auth_type, self.auth = get_auth_type(self.auth)
         current_seq_num = 0
 
         start = time.time()