Update managers as per RFC

Change-Id: Ied75c954b3acd87b92eeb18d50da6d4ec8683f8c
Reviewed-on: http://review.couchbase.org/120917
Tested-by: Build Bot <[email protected]>
Reviewed-by: Sergey Avseyev <[email protected]>

Author: avsej

config.m4

@@ -70,7 +70,6 @@ COUCHBASE_FILES=" \
     src/couchbase/bucket/touch.c \
     src/couchbase/bucket/unlock.c \
     src/couchbase/bucket/view.c \
-    src/couchbase/bucket_manager.c \
     src/couchbase/cert_authenticator.c \
     src/couchbase/cluster.c \
     src/couchbase/cluster_manager.c \
@@ -79,6 +78,8 @@ COUCHBASE_FILES=" \
     src/couchbase/collection.c \
     src/couchbase/log_formatter.c \
     src/couchbase/lookup_spec.c \
+    src/couchbase/managers/bucket_manager.c \
+    src/couchbase/managers/view_index_manager.c \
     src/couchbase/mutate_spec.c \
     src/couchbase/mutation_state.c \
     src/couchbase/n1ql_index.c \
@@ -121,7 +122,6 @@ COUCHBASE_FILES=" \
     src/couchbase/search/wildcard_query.c \
     src/couchbase/search_index_manager.c \
     src/couchbase/search_options.c \
-    src/couchbase/view_index_manager.c \
     transcoding.c \
 "
 

config.w32

@@ -25,7 +25,6 @@ if (PHP_COUCHBASE != "no") {
             "password_authenticator.c " +
             "cluster_options.c " +
             "bucket.c " +
-            "bucket_manager.c " +
             "cluster.c " +
             "cluster_manager.c " +
             "collection.c " +
@@ -37,7 +36,6 @@ if (PHP_COUCHBASE != "no") {
             "pool.c " +
             "query_index_manager.c " +
             "result.c " +
-            "view_index_manager.c " +
             "search_index_manager.c " +
             "search_options.c ";
         src_couchbase_bucket_sources =
@@ -56,6 +54,9 @@ if (PHP_COUCHBASE != "no") {
             "touch.c " +
             "unlock.c " +
             "view.c ";
+        src_couchbase_managers_sources =
+            "bucket_manager.c " +
+            "view_index_manager.c ";
         src_couchbase_query_index_manager_sources =
             "n1ix_create.c " +
             "n1ix_drop.c " +
@@ -99,6 +100,7 @@ if (PHP_COUCHBASE != "no") {
         ADD_SOURCES(configure_module_dirname + "\\src\\couchbase", src_couchbase_sources, "couchbase");
         ADD_SOURCES(configure_module_dirname + "\\src\\couchbase\\search", src_couchbase_search_sources, "couchbase");
         ADD_SOURCES(configure_module_dirname + "\\src\\couchbase\\bucket", src_couchbase_bucket_sources, "couchbase");
+        ADD_SOURCES(configure_module_dirname + "\\src\\couchbase\\managers", src_couchbase_managers_sources, "couchbase");
         ADD_SOURCES(configure_module_dirname + "\\src\\couchbase\\query_index_manager", src_couchbase_query_index_manager_sources, "couchbase");
         ADD_SOURCES(configure_module_dirname + "\\src\\couchbase\\cluster_manager", src_couchbase_cluster_manager_sources, "couchbase");
         AC_DEFINE('HAVE_COUCHBASELIB', 1, 'Have Couchbase library');

couchbase.c

@@ -186,10 +186,10 @@ PHP_MINIT_FUNCTION(CouchbasePool);
 PHP_MINIT_FUNCTION(CouchbaseException);
 PHP_MINIT_FUNCTION(Collection);
 PHP_MINIT_FUNCTION(Cluster);
+PHP_MINIT_FUNCTION(BucketManager);
 PHP_MINIT_FUNCTION(ClusterManager);
 PHP_MINIT_FUNCTION(UserSettings);
 PHP_MINIT_FUNCTION(Bucket);
-PHP_MINIT_FUNCTION(BucketManager);
 PHP_MINIT_FUNCTION(QueryIndexManager);
 PHP_MINIT_FUNCTION(Authenticator);
 PHP_MINIT_FUNCTION(CertAuthenticator);
@@ -266,10 +266,10 @@ PHP_MINIT_FUNCTION(couchbase)
     PHP_MINIT(CouchbaseException)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(Cluster)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(Collection)(INIT_FUNC_ARGS_PASSTHRU);
+    PHP_MINIT(BucketManager)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(ClusterManager)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(UserSettings)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(Bucket)(INIT_FUNC_ARGS_PASSTHRU);
-    PHP_MINIT(BucketManager)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(QueryIndexManager)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(Authenticator)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(CertAuthenticator)(INIT_FUNC_ARGS_PASSTHRU);

couchbase.h

@@ -303,11 +303,6 @@ typedef struct {
     zend_object std;
 } pcbc_bucket_t;
 
-typedef struct {
-    pcbc_connection_t *conn;
-    zend_object std;
-} pcbc_bucket_manager_t;
-
 typedef struct {
     pcbc_connection_t *conn;
     zend_object std;
@@ -336,14 +331,15 @@ int pcbc_decode_value(zval *return_value, pcbc_bucket_t *bucket, const char *byt
 int pcbc_encode_value(pcbc_bucket_t *bucket, zval *value, void **bytes, lcb_size_t *nbytes, lcb_uint32_t *flags,
                       uint8_t *datatype TSRMLS_DC);
 
-void pcbc_http_request(zval *return_value, lcb_INSTANCE *conn, lcb_CMDHTTP *cmd, int json_response TSRMLS_DC);
+void pcbc_http_request(zval *return_value, lcb_INSTANCE *conn, lcb_CMDHTTP *cmd, int json_response,
+                       void(httpcb)(zval *, zval *) TSRMLS_DC);
 
 void pcbc_query_index_manager_init(zval *return_value, zval *cluster TSRMLS_DC);
 
 void pcbc_mutation_state_export_for_n1ql(zval *obj, zval *scan_vectors TSRMLS_DC);
 void pcbc_mutation_state_export_for_search(zval *mutation_state, zval *scan_vectors TSRMLS_DC);
 
-void pcbc_search_index_manager_init(zval *return_value, pcbc_bucket_manager_t *bucket_manager TSRMLS_DC);
+void pcbc_search_index_manager_init(zval *return_value, zval *cluster TSRMLS_DC);
 
 void pcbc_crypto_register(pcbc_bucket_t *obj, const char *name, int name_len, zval *provider TSRMLS_DC);
 void pcbc_crypto_unregister(pcbc_bucket_t *obj, const char *name, int name_len TSRMLS_DC);

integration/BucketManager.php

@@ -0,0 +1,47 @@
+<?php
+
+$options = new \Couchbase\ClusterOptions();
+$options->credentials('Administrator', 'password');
+$cluster = new \Couchbase\Cluster('couchbase://localhost', $options);
+
+$bucket_name = 'newbucket';
+
+$need_cleanup = false;
+$all_buckets = $cluster->buckets()->getAllBuckets();
+printf("There are %d buckets on the cluster\n", count($all_buckets));
+foreach ($all_buckets as $bucket) {
+  printf(" * %s (%d MB)\n", $bucket->name(), $bucket->ramQuotaMb());
+  if ($bucket->name() == $bucket_name) {
+    $need_cleanup = true;
+  }
+}
+
+if ($need_cleanup) {
+  $start = microtime(true);
+  $cluster->buckets()->removeBucket($bucket_name);
+  printf("Bucket \"%s\" removed in %f seconds\n", $bucket_name, microtime(true) - $start);
+}
+
+$settings = new \Couchbase\BucketSettings();
+$settings->setName($bucket_name);
+$settings->setRamQuotaMb(100);
+$settings->enableFlush(true);
+$start = microtime(true);
+$cluster->buckets()->createBucket($settings);
+printf("New bucket \"%s\" created in %f seconds\n", $bucket_name, microtime(true) - $start);
+
+sleep(1);
+
+$settings = $cluster->buckets()->getBucket($bucket_name);
+printf("Bucket \"%s\" settings:\n", $bucket_name);
+printf(" * RAM quota: %d\n", $settings->ramQuotaMb());
+printf(" * number of replicas: %d\n", $settings->numReplicas());
+printf(" * flush enabled: %s\n", $settings->flushEnabled() ? "yes" : "no");
+printf(" * max TTL: %s\n", $settings->maxTtl());
+printf(" * compression mode: %s\n", $settings->compressionMode());
+printf(" * replicas indexed: %s\n", $settings->replicaIndexes() ? "yes" : "no");
+printf(" * ejection method: %s\n", $settings->ejectionMethod());
+
+$start = microtime(true);
+$cluster->buckets()->flush($bucket_name);
+printf("Bucket \"%s\" flushed in %f seconds\n", $bucket_name, microtime(true) - $start);

integration/ViewIndexManager.php

@@ -0,0 +1,37 @@
+<?php
+
+$options = new \Couchbase\ClusterOptions();
+$options->credentials('Administrator', 'password');
+$cluster = new \Couchbase\Cluster('couchbase://localhost', $options);
+
+$bucket = $cluster->bucket('beer-sample');
+$design_documents = $bucket->viewIndexes()->getAllDesignDocuments();
+printf("There are %d design documents in the bucket\n", count($design_documents));
+foreach ($design_documents as $ddoc) {
+  printf("  * %s\n", $ddoc->name());
+  foreach ($ddoc->views() as $view) {
+    printf("    * %s\n", $view->name());
+  }
+}
+
+if (count($design_documents) > 0) {
+  $design_document_name = $design_documents[0]->name();
+  $design_document = $bucket->viewIndexes()->getDesignDocument($design_document_name);
+  printf("Design document \"%s\" contains %d views\n", $design_document->name(), count($design_document->views()));
+
+  $start = microtime(true);
+  $bucket->viewindexes()->dropDesignDocument($design_document_name);
+  printf("Design document \"%s\" removed, in %f seconds\n", $design_document_name, microtime(true)-$start);
+}
+
+$view = new \Couchbase\View();
+$view->setName("example");
+$view->setMap("function (doc, meta) { emit(meta.id, null); }");
+$view->setReduce("_count");
+$design_document = new \Couchbase\DesignDocument();
+$design_document->setName('_design/test');
+$design_document->setViews([$view->name() => $view]);
+
+$start = microtime(true);
+$bucket->viewindexes()->upsertDesignDocument($design_document);
+printf("Design document \"%s\" created, in %f seconds\n", $design_document->name(), microtime(true)-$start);

package.xml

@@ -86,7 +86,6 @@
             <file role="src" name="src/couchbase/bucket/touch.c" />
             <file role="src" name="src/couchbase/bucket/unlock.c" />
             <file role="src" name="src/couchbase/bucket/view.c" />
-            <file role="src" name="src/couchbase/bucket_manager.c" />
             <file role="src" name="src/couchbase/cert_authenticator.c" />
             <file role="src" name="src/couchbase/cluster.c" />
             <file role="src" name="src/couchbase/cluster_options.c" />
@@ -96,6 +95,8 @@
             <file role="src" name="src/couchbase/crypto.c" />
             <file role="src" name="src/couchbase/log_formatter.c" />
             <file role="src" name="src/couchbase/lookup_spec.c" />
+            <file role="src" name="src/couchbase/managers/bucket_manager.c" />
+            <file role="src" name="src/couchbase/managers/view_index_manager.c" />
             <file role="src" name="src/couchbase/mutate_spec.c" />
             <file role="src" name="src/couchbase/mutation_state.c" />
             <file role="src" name="src/couchbase/n1ql_index.c" />
@@ -138,7 +139,6 @@
             <file role="src" name="src/couchbase/search/wildcard_query.c" />
             <file role="src" name="src/couchbase/search_index_manager.c" />
             <file role="src" name="src/couchbase/search_options.c" />
-            <file role="src" name="src/couchbase/view_index_manager.c" />
             <file role="src" name="transcoding.c" />
         </dir>
     </contents>

src/couchbase/bucket.c

@@ -20,6 +20,7 @@
 
 zend_class_entry *pcbc_bucket_ce;
 extern zend_class_entry *pcbc_scope_ce;
+extern zend_class_entry *pcbc_view_index_manager_ce;
 
 PHP_METHOD(Bucket, ping);
 PHP_METHOD(Bucket, diagnostics);
@@ -163,18 +164,14 @@ PHP_METHOD(Bucket, name)
     RETURN_NULL();
 }
 
-void pcbc_view_index_manager_init(zval *return_value, zval *bucket TSRMLS_DC);
-
 PHP_METHOD(Bucket, viewIndexes)
 {
-    int rv;
-
-    rv = zend_parse_parameters_none();
-    if (rv == FAILURE) {
+    if (zend_parse_parameters_none_throw() == FAILURE) {
         RETURN_NULL();
     }
 
-    pcbc_view_index_manager_init(return_value, getThis() TSRMLS_CC);
+    object_init_ex(return_value, pcbc_view_index_manager_ce);
+    zend_update_property(pcbc_view_index_manager_ce, return_value, ZEND_STRL("bucket"), getThis() TSRMLS_CC);
 }
 
 PHP_METHOD(Bucket, defaultCollection)
@@ -266,6 +263,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_scope, 0, 1, \\Couchbase\\Scope
 ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_viewIndexes, 0, 1, \\Couchbase\\ViewIndexManager, 0)
+ZEND_END_ARG_INFO()
+
 // clang-format off
 zend_function_entry bucket_methods[] = {
     PHP_ME(Bucket, __construct, ai_Bucket_none, ZEND_ACC_PRIVATE | ZEND_ACC_FINAL | ZEND_ACC_CTOR)
@@ -279,7 +279,7 @@ zend_function_entry bucket_methods[] = {
     PHP_ME(Bucket, defaultCollection, ai_Bucket_defaultCollection, ZEND_ACC_PUBLIC)
     PHP_ME(Bucket, defaultScope, ai_Bucket_defaultScope, ZEND_ACC_PUBLIC)
     PHP_ME(Bucket, scope, ai_Bucket_scope, ZEND_ACC_PUBLIC)
-    PHP_ME(Bucket, viewIndexes, ai_Bucket_none, ZEND_ACC_PUBLIC)
+    PHP_ME(Bucket, viewIndexes, ai_Bucket_viewIndexes, ZEND_ACC_PUBLIC)
     PHP_FE_END
 };
 // clang-format on

src/couchbase/bucket/http.c

@@ -18,6 +18,9 @@
 
 #define LOGARGS(instance, lvl) LCB_LOG_##lvl, instance, "pcbc/http", __FILE__, __LINE__
 
+extern zend_class_entry *pcbc_default_exception_ce;
+extern zend_class_entry *pcbc_http_exception_ce;
+
 typedef struct {
     opcookie_res header;
     zval bytes;
@@ -58,7 +61,7 @@ void http_callback(lcb_INSTANCE *instance, int cbtype, const lcb_RESPHTTP *resp)
     opcookie_push(cookie, &result->header);
 }
 
-static lcb_STATUS proc_http_results(zval *return_value, opcookie *cookie TSRMLS_DC)
+static lcb_STATUS proc_http_results(zval *return_value, opcookie *cookie, void(httpcb)(zval *, zval *) TSRMLS_DC)
 {
     opcookie_http_res *res;
     lcb_STATUS err = LCB_SUCCESS;
@@ -71,7 +74,42 @@ static lcb_STATUS proc_http_results(zval *return_value, opcookie *cookie TSRMLS_
         FOREACH_OPCOOKIE_RES(opcookie_http_res, res, cookie)
         {
             if (has_value == 0) {
-                ZVAL_ZVAL(return_value, &res->bytes, 1, 0);
+                if (Z_TYPE(res->bytes) == IS_ARRAY) {
+                    HashTable *marr = Z_ARRVAL(res->bytes);
+                    zval *mval;
+                    mval = zend_symtable_str_find(marr, ZEND_STRL("errors"));
+                    if (mval && Z_TYPE_P(mval) == IS_ARRAY) {
+                        smart_str buf = {0};
+                        zend_string *string_key = NULL;
+                        zval *entry;
+                        ZEND_HASH_FOREACH_STR_KEY_VAL(HASH_OF(mval), string_key, entry)
+                        {
+                            smart_str_append_ex(&buf, string_key, 0);
+                            if (Z_TYPE_P(entry) == IS_STRING) {
+                                smart_str_appends(&buf, ": ");
+                                smart_str_append_ex(&buf, Z_STR_P(entry), 0);
+                            }
+                            smart_str_appends(&buf, ", ");
+                        }
+                        ZEND_HASH_FOREACH_END();
+                        if (buf.s && ZSTR_LEN(buf.s) > 2) {
+                            ZSTR_LEN(buf.s) -= 2;
+                            ZSTR_VAL(buf.s)[ZSTR_LEN(buf.s)] = '\0';
+                        }
+                        object_init_ex(return_value, pcbc_http_exception_ce);
+                        zend_update_property_str(pcbc_default_exception_ce, return_value, ZEND_STRL("message"),
+                                                 buf.s TSRMLS_CC);
+                        smart_str_free(&buf);
+                        err = LCB_ERR_HTTP;
+                    }
+                }
+                if (err == LCB_SUCCESS) {
+                    if (httpcb) {
+                        httpcb(return_value, &res->bytes);
+                    } else {
+                        ZVAL_ZVAL(return_value, &res->bytes, 1, 0);
+                    }
+                }
                 has_value = 1;
             } else {
                 err = LCB_ERR_GENERIC;
@@ -88,7 +126,8 @@ static lcb_STATUS proc_http_results(zval *return_value, opcookie *cookie TSRMLS_
     return err;
 }
 
-void pcbc_http_request(zval *return_value, lcb_INSTANCE *conn, lcb_CMDHTTP *cmd, int json_response TSRMLS_DC)
+void pcbc_http_request(zval *return_value, lcb_INSTANCE *conn, lcb_CMDHTTP *cmd, int json_response,
+                       void(httpcb)(zval *, zval *) TSRMLS_DC)
 {
     lcb_STATUS err;
     opcookie *cookie;
@@ -99,10 +138,15 @@ void pcbc_http_request(zval *return_value, lcb_INSTANCE *conn, lcb_CMDHTTP *cmd,
     lcb_cmdhttp_destroy(cmd);
     if (err == LCB_SUCCESS) {
         lcb_wait(conn, LCB_WAIT_DEFAULT);
-        err = proc_http_results(return_value, cookie TSRMLS_CC);
+        err = proc_http_results(return_value, cookie, httpcb TSRMLS_CC);
     }
     opcookie_destroy(cookie);
-    if (err != LCB_SUCCESS) {
+
+    if (Z_TYPE_P(return_value) == IS_OBJECT &&
+        instanceof_function(Z_OBJCE_P(return_value), pcbc_default_exception_ce TSRMLS_CC)) {
+        zend_throw_exception_object(return_value TSRMLS_CC);
+        RETURN_NULL();
+    } else if (err != LCB_SUCCESS) {
         throw_lcb_exception(err, NULL);
     }
 }