fix swoole#4070

matyhtf · matyhtf · commit 08ea20c7fc68 · 2021-03-04T16:34:00.000+08:00
diff --git a/ext-src/swoole_table.cc b/ext-src/swoole_table.cc
@@ -59,7 +59,6 @@ static inline void php_swoole_table_get_field_value(
     } else if (col->type == TableColumn::TYPE_FLOAT) {
         double dval = 0;
         row->get_value(col, &dval);
-        add_assoc_double_ex(return_value, col->name.c_str(), col->name.length(), dval);
         ZVAL_DOUBLE(return_value, dval);
     } else if (col->type == TableColumn::TYPE_INT) {
         long lval = 0;
diff --git a/tests/swoole_table/key_value.phpt b/tests/swoole_table/key_value.phpt
@@ -6,6 +6,9 @@ swoole_table: key-value operate
 <?php
 require __DIR__ . '/../include/bootstrap.php';
 
+const PI =  3.1415926;
+const NAME = 'rango';
+
 $table = new swoole_table(65536);
 
 $table->column('id', swoole_table::TYPE_INT);
@@ -16,7 +19,7 @@ if (!$table->create())
 {
     echo __LINE__." error";
 }
-if (!$table->set('test_key', array('id' => 1, 'name' => 'rango', 'num' => 3.1415926)))
+if (!$table->set('test_key', array('id' => 1, 'name' => NAME, 'num' =>PI)))
 {
     echo __LINE__." error";
 }
@@ -33,6 +36,13 @@ if (!($ret and $ret == 1))
     echo __LINE__." error";
 }
 
+Assert::eq($table->get('test_key', 'name'), NAME);
+Assert::eq($table->get('test_key', 'num'), PI);
+
+// field not exists
+Assert::false($table->get('test_key', 'id_no_exists'));
+Assert::false($table->get('test_key_no_exists', 'id_no_exists'));
+
 $ret = $table->exist('test_key');
 if (!($ret))
 {
@@ -82,7 +92,7 @@ if ($table->exist('test_key'))
 {
     echo __LINE__." error";
 }
-echo "SUCCESS";
+echo "SUCCESS\n";
 ?>
 --EXPECT--
 SUCCESS

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ swoole_table: key-value operate`
`6`	`6`	`<?php`
`7`	`7`	`require __DIR__ . '/../include/bootstrap.php';`
`8`	`8`
	`9`	`+const PI = 3.1415926;`
	`10`	`+const NAME = 'rango';`
	`11`	`+`
`9`	`12`	`$table = new swoole_table(65536);`
`10`	`13`
`11`	`14`	`$table->column('id', swoole_table::TYPE_INT);`
`@@ -16,7 +19,7 @@ if (!$table->create())`
`16`	`19`	`{`
`17`	`20`	`echo __LINE__." error";`
`18`	`21`	`}`
`19`		`-if (!$table->set('test_key', array('id' => 1, 'name' => 'rango', 'num' => 3.1415926)))`
	`22`	`+if (!$table->set('test_key', array('id' => 1, 'name' => NAME, 'num' =>PI)))`
`20`	`23`	`{`
`21`	`24`	`echo __LINE__." error";`
`22`	`25`	`}`
`@@ -33,6 +36,13 @@ if (!($ret and $ret == 1))`
`33`	`36`	`echo __LINE__." error";`
`34`	`37`	`}`
`35`	`38`
	`39`	`+Assert::eq($table->get('test_key', 'name'), NAME);`
	`40`	`+Assert::eq($table->get('test_key', 'num'), PI);`
	`41`	`+`
	`42`	`+// field not exists`
	`43`	`+Assert::false($table->get('test_key', 'id_no_exists'));`
	`44`	`+Assert::false($table->get('test_key_no_exists', 'id_no_exists'));`
	`45`	`+`
`36`	`46`	`$ret = $table->exist('test_key');`
`37`	`47`	`if (!($ret))`
`38`	`48`	`{`
`@@ -82,7 +92,7 @@ if ($table->exist('test_key'))`
`82`	`92`	`{`
`83`	`93`	`echo __LINE__." error";`
`84`	`94`	`}`
`85`		`-echo "SUCCESS";`
	`95`	`+echo "SUCCESS\n";`
`86`	`96`	`?>`
`87`	`97`	`--EXPECT--`
`88`	`98`	`SUCCESS`