PCBC-251: Add missing prefix for incr/decr/unlock

Change-Id: I350d2492f5a5eb196d1474650be138a842348920
Reviewed-on: http://review.couchbase.org/29246
Reviewed-by: Brett Lawson <brett19@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

Author: trondn

arithmetic.c

@@ -70,6 +70,10 @@ void php_couchbase_arithmetic_impl(INTERNAL_FUNCTION_PARAMETERS, char op, int oo
 	memset(&cookie, 0, sizeof(cookie));
 	delta = (op == '+') ? offset : -offset;
 
+	if (couchbase_res->prefix_key_len) {
+		klen = spprintf(&key, 0, "%s_%s", couchbase_res->prefix_key, key);
+	}
+
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.v.v0.key = key;
 	cmd.v.v0.nkey = klen;
@@ -82,6 +86,10 @@ void php_couchbase_arithmetic_impl(INTERNAL_FUNCTION_PARAMETERS, char op, int oo
 	retval = lcb_arithmetic(instance, &cookie, 1, commands);
 	lcb_behavior_set_syncmode(instance, LCB_ASYNCHRONOUS);
 
+	if (couchbase_res->prefix_key_len) {
+		efree(key);
+	}
+
 	if (retval == LCB_SUCCESS) {
 		retval = cookie.error ;
 	}

remove.c

@@ -105,9 +105,17 @@ void php_couchbase_remove_impl(INTERNAL_FUNCTION_PARAMETERS, int oo)
 		}
 	}
 
+	if (couchbase_res->prefix_key_len) {
+		klen = spprintf(&key, 0, "%s_%s", couchbase_res->prefix_key, key);
+	}
+
 	retval = do_remove(couchbase_res->handle, key, klen, &cas_v);
 	couchbase_res->rc = retval;
 
+	if (couchbase_res->prefix_key_len) {
+		efree(key);
+	}
+
 	switch (retval) {
 	case LCB_SUCCESS:
 		Z_TYPE_P(return_value) = IS_STRING;

tests/Regression.inc

@@ -107,4 +107,36 @@ class Regression extends CouchbaseTestCommon {
        }
        $this->assertEquals("", $msg);
     }
+
+    function testPCBC_251() {
+       $handle = $this->handle;
+       couchbase_set_option($handle, Couchbase::OPT_PREFIX_KEY, "PCBC-251");
+       couchbase_delete($handle, "counter");
+       couchbase_add($handle, "counter", 2);
+       $this->assertEquals(1, couchbase_decrement($handle, "counter"));
+       $this->assertEquals(0, couchbase_decrement($handle, "counter"));
+       $lock = 0;
+       $this->assertEquals(0, couchbase_get_and_lock($handle, "counter", $lock, 1));
+       $this->assertTrue(couchbase_unlock($handle, "counter", $lock));
+       # decr 0 -> 0
+       $this->assertEquals(0, couchbase_decrement($handle, "counter"));
+       couchbase_set_option($handle, Couchbase::OPT_PREFIX_KEY, "");
+    }
+
+    function testPCBC_251_oo() {
+       $oo = $this->oo;
+       $oo->setOption(Couchbase::OPT_PREFIX_KEY, "PCBC-251");
+       $oo->delete("counter");
+       $oo->add("counter", 2);
+       $this->assertEquals(1, $oo->decrement("counter"));
+       $this->assertEquals(0, $oo->decrement("counter"));
+       $lock = 0;
+       $this->assertEquals(0, $oo->getAndLock("counter", $lock, 1));
+       $this->assertTrue($oo->unlock("counter", $lock));
+
+       # decr 0 -> 0
+       $this->assertEquals(0, $oo->decrement("counter"));
+       $oo->setOption(Couchbase::OPT_PREFIX_KEY, "");
+    }
+
 }

tests/phpt/Regression/PCBC_251.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Regression - PCBC_251
+
+--SKIPIF--
+<?php
+include dirname(__FILE__)."/../../cbtestframework/cbtest-phpt-loader.inc";
+couchbase_phpt_skipif("Regression", "testPCBC_251");
+
+--FILE--
+<?php
+include dirname(__FILE__)."/../../cbtestframework/cbtest-phpt-loader.inc";
+couchbase_phpt_runtest("Regression", "testPCBC_251");
+--EXPECT--
+PHP_COUCHBASE_OK

tests/phpt/Regression/PCBC_251_oo.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Regression - PCBC_251_oo
+
+--SKIPIF--
+<?php
+include dirname(__FILE__)."/../../cbtestframework/cbtest-phpt-loader.inc";
+couchbase_phpt_skipif("Regression", "testPCBC_251_oo");
+
+--FILE--
+<?php
+include dirname(__FILE__)."/../../cbtestframework/cbtest-phpt-loader.inc";
+couchbase_phpt_runtest("Regression", "testPCBC_251_oo");
+--EXPECT--
+PHP_COUCHBASE_OK

unlock.c

@@ -85,9 +85,18 @@ void php_couchbase_unlock_impl(INTERNAL_FUNCTION_PARAMETERS, int oo)
 		return;
 	}
 
+
+	if (couchbase_res->prefix_key_len) {
+		klen = spprintf(&key, 0, "%s_%s", couchbase_res->prefix_key, key);
+	}
+
 	retval = do_unlock(couchbase_res->handle, key, klen, cas_v);
 	couchbase_res->rc = retval;
 
+	if (couchbase_res->prefix_key_len) {
+		efree(key);
+	}
+
 	if (retval == LCB_SUCCESS) {
 		RETVAL_TRUE;
 	} else {