Revert "Revert "PCBC-227: Allow store of pure numeric keys""

This reverts commit afe5200.

Change-Id: Id5aab9c0b4a7009fd9b89fabe772bd903b863259
Reviewed-on: http://review.couchbase.org/29201
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

Author: trondn

store.c

@@ -687,8 +687,20 @@ void php_couchbase_store_multi_impl_oo(INTERNAL_FUNCTION_PARAMETERS)
 		char *payload;
 		unsigned int flags = 0;
 		zval **ppzval;
-
-		if (zend_hash_get_current_key_type(Z_ARRVAL_P(akeys)) != HASH_KEY_IS_STRING) {
+		int allocated_key = 0;
+
+		switch (zend_hash_get_current_key_type(Z_ARRVAL_P(akeys))) {
+		case HASH_KEY_IS_LONG: {
+			ulong kval;
+			zend_hash_get_current_key(Z_ARRVAL_P(akeys), &key, &kval, 0);
+			spprintf(&key, 0, "%llu", kval);
+			allocated_key = 1;
+		}
+		break;
+		case HASH_KEY_IS_STRING:
+			zend_hash_get_current_key(Z_ARRVAL_P(akeys), &key, NULL, 0);
+			break;
+		default: {
 			int xx;
 			for (xx = 0; xx < ii; ++xx) {
 				efree((void *)cmds[xx].v.v0.bytes);
@@ -703,9 +715,10 @@ void php_couchbase_store_multi_impl_oo(INTERNAL_FUNCTION_PARAMETERS)
 								 0 TSRMLS_CC);
 			return ;
 		}
+		}
 
-		zend_hash_get_current_key(Z_ARRVAL_P(akeys), &key, NULL, 0);
-		if ((klen = strlen(key)) == 0) {
+		klen = strlen(key);
+		if (klen == 0) {
 			int xx;
 			for (xx = 0; xx < ii; ++xx) {
 				efree((void *)cmds[xx].v.v0.bytes);
@@ -750,7 +763,9 @@ void php_couchbase_store_multi_impl_oo(INTERNAL_FUNCTION_PARAMETERS)
 
 		if (couchbase_res->prefix_key_len) {
 			char *new_key;
-			klen = spprintf(&new_key, 0, "%s_%s", couchbase_res->prefix_key, key);
+			allocated_key = 1;
+			klen = spprintf(&new_key, 0, "%s_%s", couchbase_res->prefix_key,
+							key);
 			key = new_key;
 		}
 
@@ -765,7 +780,7 @@ void php_couchbase_store_multi_impl_oo(INTERNAL_FUNCTION_PARAMETERS)
 		cmds[ii].v.v0.flags = flags;
 		cmds[ii].v.v0.exptime = exp;
 
-		if (couchbase_res->prefix_key_len) {
+		if (allocated_key) {
 			efree(key);
 		}
 	}

tests/Regression.inc

@@ -18,8 +18,6 @@ class Regression extends CouchbaseTestCommon {
         } catch (Exception $exp) {
            $msg = $exp->getMessage();
         }
-        $this->assertEquals("Invalid key specified (not a string)",
-                            $msg);
     }
 
     function testPCBC_218() {
@@ -48,4 +46,65 @@ class Regression extends CouchbaseTestCommon {
          $this->assertEquals("", $msg);
     }
 
+    function testPCBC_227() {
+       $oo = $this->oo;
+       $msg = "";
+
+
+       try {
+           couchbase_set($this->handle, "1234", "foo");
+       } catch (Exception $exp) {
+           $msg = $exp->getMessage();
+       }
+       $this->assertEquals("", $msg);
+
+       try {
+           couchbase_set($this->handle, 1234, "foo");
+       } catch (Exception $exp) {
+           $msg = $exp->getMessage();
+       }
+       $this->assertEquals("", $msg);
+
+       try {
+           couchbase_set_multi($this->handle, array("1234" =>  "foo"));
+       } catch (Exception $exp) {
+           $msg = $exp->getMessage();
+       }
+       $this->assertEquals("", $msg);
+
+       try {
+           couchbase_set_multi($this->handle, array(1234 =>  "foo"));
+       } catch (Exception $exp) {
+           $msg = $exp->getMessage();
+       }
+       $this->assertEquals("", $msg);
+
+       try {
+           $oo->set("1234", "foo");
+       } catch (Exception $exp) {
+           $msg = $exp->getMessage();
+       }
+       $this->assertEquals("", $msg);
+
+       try {
+           $oo->set(1234, "foo");
+       } catch (Exception $exp) {
+           $msg = $exp->getMessage();
+       }
+       $this->assertEquals("", $msg);
+
+       try {
+           $oo->setMulti(array("1234" =>  "foo"));
+       } catch (Exception $exp) {
+           $msg = $exp->getMessage();
+       }
+       $this->assertEquals("", $msg);
+
+       try {
+           $oo->setMulti(array(1234 =>  "foo"));
+       } catch (Exception $exp) {
+           $msg = $exp->getMessage();
+       }
+       $this->assertEquals("", $msg);
+    }
 }

tests/phpt/Regression/PCBC_227.phpt

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