PCBC-236: Throw exceptions from constructor

Change-Id: Icc79789124e0422e34ad119cb79f988d817a916a
Reviewed-on: http://review.couchbase.org/26666
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

Author: trondn

create.c

@@ -387,12 +387,6 @@ void php_couchbase_create_impl(INTERNAL_FUNCTION_PARAMETERS, int oo)
 			}
 		}
 
-		if ((retval = lcb_connect(handle)) != LCB_SUCCESS) {
-			php_error(E_WARNING,
-					  "Failed to connect libcouchbase to the server: %s",
-					  lcb_strerror(handle, retval));
-		}
-
 		php_couchbase_setup_callbacks(handle);
 
 		couchbase_res = calloc(1, sizeof(php_couchbase_res));
@@ -408,25 +402,33 @@ void php_couchbase_create_impl(INTERNAL_FUNCTION_PARAMETERS, int oo)
 		couchbase_res->compressor = COUCHBASE_G(compressor_real);
 		couchbase_res->ignoreflags = 0;
 
-		lcb_set_cookie(handle, (const void *)couchbase_res);
+		lcb_set_cookie(handle, couchbase_res);
 
-		/* wait for the connection established */
-		if (LCB_SUCCESS == retval) { /* earlier lcb_connect's retval */
-			lcb_wait(handle);
-		}
+		lcb_behavior_set_syncmode(handle, LCB_SYNCHRONOUS);
+		if ((retval = lcb_connect(handle)) != LCB_SUCCESS) {
+			if (couchbase_res->errinfo != NULL) {
+				couchbase_report_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, oo,
+									   cb_lcb_exception,
+									   "Failed to connect libcouchbase to the server: %s (%s)",
+									   lcb_strerror(handle, retval), couchbase_res->errinfo);
+			} else {
+				couchbase_report_error(INTERNAL_FUNCTION_PARAM_PASSTHRU, oo,
+									   cb_lcb_exception,
+									   "Failed to connect libcouchbase to the server: %s",
+									   lcb_strerror(handle, retval));
+			}
+			lcb_destroy(handle);
+			free(couchbase_res->bucket);
+			free(couchbase_res);
+			free_connparams(&cparams);
 
-		couchbase_res->seqno = 0;
-		if (LCB_SUCCESS != (retval = lcb_get_last_error(handle))) {
-			couchbase_res->rc = retval;
-			couchbase_res->is_connected = 0;
-			php_error(E_WARNING,
-					  "Failed to establish libcouchbase connection to server: %s",
-					  lcb_strerror(handle, retval));
-		} else {
-			couchbase_res->is_connected = 1;
+			return ;
 		}
 
-		if (persistent && couchbase_res->is_connected) {
+		lcb_behavior_set_syncmode(handle, LCB_ASYNCHRONOUS);
+		couchbase_res->seqno = 0;
+		couchbase_res->is_connected = 1;
+		if (persistent) {
 			zend_rsrc_list_entry le;
 			Z_TYPE(le) = le_pcouchbase;
 			le.ptr = couchbase_res;

tests/Connection.inc

@@ -116,23 +116,9 @@ class Connection extends CouchbaseTestCommon
                                 'bad-password',
                                 'does-not-exist');
 
-        } catch (Exception $e) {
+        } catch (CouchbaseLibcouchbaseException $e) {
             $this->assertRegExp('/failed/i', $e->getMessage());
         }
-
-        // now, make sure the object would support the given operations:
-        $this->setErrorsRaiseException(false);
-
-        $oo = new Couchbase('http://999.999.999.999:9999',
-                            'bad-user',
-                            'bad-password',
-                            'does-not-exist');
-
-        $this->assertGreaterThan(0, $oo->getResultCode());
-        $this->assertNotNull($oo->getResultMessage());
-        $this->assertNotEquals("", $oo->getResultMessage());
-
-        $this->setErrorsRaiseException(true);
     }
 
     function testConnectUri() {
@@ -170,7 +156,7 @@ class Connection extends CouchbaseTestCommon
                                      array($url),
                                      "/failed/i");
 
-		$this->assertExceptionRegexp(function ($u) { return new Couchbase($u); },
+                $this->assertExceptionRegexp(function ($u) { return new Couchbase($u); },
                                      array($url),
                                      "/failed/i");
 
@@ -179,15 +165,18 @@ class Connection extends CouchbaseTestCommon
         $h = couchbase_connect($url);
         $this->assertFalse($h);
 
-        $o = new Couchbase($url);
-        $this->assertEquals(24, $o->getResultCode()); // 24 = 0x18 = LCB_CONNECT_ERROR
-        $this->assertContains('Connection', $o->getResultMessage());
+        try {
+            $o = new Couchbase($url);
+            $this->assertNull("We should fail to connect");
+        } catch (CouchbaseLibcouchbaseException $e) {
+            $this->assertRegexp('/connect/i', $e->getMessage());
+        }
 
         # Try with a malformed uri
 
-	try {
-	    $cb = new Couchbase(array("http://"));
-            $his->assertNull("We should detect bogus url");
+        try {
+            $cb = new Couchbase(array("http://"));
+            $this->assertNull("We should detect bogus url");
         } catch (CouchbaseException $e) {
             $this->assertRegexp('/malformed/i', $e->getMessage());
         }
@@ -201,11 +190,13 @@ class Connection extends CouchbaseTestCommon
             $h = couchbase_connect($hosts);
             $this->assertFalse($h);
 
-            $o = new Couchbase($hosts);
-            $this->assertEquals(24, $o->getResultCode()); // see note above re: 24
-            $this->assertContains('Connection', $o->getResultMessage());
+            try {
+                $o = new Couchbase($hosts);
+                $this->assertNull("We should fail to connect");
+            } catch (CouchbaseLibcouchbaseException $e) {
+                $this->assertRegexp('/connect/i', $e->getMessage());
+            }
         }
-
     }
 
     /**