Update ubiquity (#5372)

* spec pk for queries

* Update Db controllers (no view)

* update to swoole 4.4.14

frameworks/PHP/ubiquity/app/controllers/Db.php

@@ -7,32 +7,38 @@ use models\World;
 /**
  * Bench controller.
  */
-class Db extends \Ubiquity\controllers\Controller {
+class Db extends \Ubiquity\controllers\SimpleViewController {
 
 	public function initialize() {
 		\header('Content-Type: application/json');
 		\Ubiquity\cache\CacheManager::startProd(\Ubiquity\controllers\Startup::$config);
 		DAO::setModelDatabase(World::class);
 	}
-	
+
 	public function index() {
-		echo \json_encode((DAO::getById(World::class, \mt_rand(1, 10000), false))->_rest);
+		echo \json_encode((DAO::getById(World::class, [
+			'id' => \mt_rand(1, 10000)
+		], false))->_rest);
 	}
-	
+
 	public function query($queries = 1) {
 		$worlds = [];
 		$queries = \min(\max($queries, 1), 500);
 		for ($i = 0; $i < $queries; ++ $i) {
-			$worlds[] = (DAO::getById(World::class, \mt_rand(1, 10000), false))->_rest;
+			$worlds[] = (DAO::getById(World::class, [
+				'id' => \mt_rand(1, 10000)
+			], false))->_rest;
 		}
 		echo \json_encode($worlds);
 	}
-	
+
 	public function update($queries = 1) {
 		$worlds = [];
 		$queries = \min(\max($queries, 1), 500);
 		for ($i = 0; $i < $queries; ++ $i) {
-			$world = DAO::getById(World::class, \mt_rand(1, 10000), false);
+			$world = DAO::getById(World::class, [
+				'id' => \mt_rand(1, 10000)
+			], false);
 			$world->randomNumber = \mt_rand(1, 10000);
 			DAO::update($world);
 			$worlds[] = $world->_rest;

frameworks/PHP/ubiquity/app/controllers/SwooleDb.php

@@ -7,34 +7,37 @@ use models\World;
 /**
  * Bench controller.
  */
-class SwooleDb extends \Ubiquity\controllers\Controller
-{
-	
-	public function initialize()
-	{
+class SwooleDb extends \Ubiquity\controllers\SimpleViewController {
+
+	public function initialize() {
 		\Ubiquity\utils\http\UResponse::setContentType('application/json');
 	}
-	
-	public function index()
-	{
-		$world = DAO::getById(World::class, \mt_rand(1, 10000), false);
+
+	public function index() {
+		$world = DAO::getById(World::class, [
+			'id' => \mt_rand(1, 10000)
+		], false);
 		echo \json_encode($world->_rest);
 	}
-	
-	public function query($queries = 1){
+
+	public function query($queries = 1) {
 		$worlds = [];
 		$queries = \min(\max($queries, 1), 500);
 		for ($i = 0; $i < $queries; ++ $i) {
-			$worlds[] = (DAO::getById(World::class, \mt_rand(1, 10000), false))->_rest;
+			$worlds[] = (DAO::getById(World::class, [
+				'id' => \mt_rand(1, 10000)
+			], false))->_rest;
 		}
 		echo \json_encode($worlds);
 	}
-	
-	public function update($queries = 1){
+
+	public function update($queries = 1) {
 		$worlds = [];
 		$queries = \min(\max($queries, 1), 500);
 		for ($i = 0; $i < $queries; ++ $i) {
-			$world = DAO::getById(World::class, \mt_rand(1, 10000), false);
+			$world = DAO::getById(World::class, [
+				'id' => \mt_rand(1, 10000)
+			], false);
 			$world->randomNumber = \mt_rand(1, 10000);
 			DAO::toUpdate($world);
 			$worlds[] = $world->_rest;

frameworks/PHP/ubiquity/app/controllers/WorkerDb.php

@@ -7,34 +7,40 @@ use models\World;
 /**
  * Bench controller.
  */
-class WorkerDb extends \Ubiquity\controllers\Controller {
+class WorkerDb extends \Ubiquity\controllers\SimpleViewController {
 
 	public function initialize() {
 		\Ubiquity\utils\http\UResponse::setContentType('application/json');
 	}
-	
+
 	public function index() {
-		$world = DAO::getById(World::class, \mt_rand(1, 10000), false);
+		$world = DAO::getById(World::class, [
+			'id' => \mt_rand(1, 10000)
+		], false);
 		echo \json_encode($world->_rest);
 	}
-	
+
 	public function query($queries = 1) {
 		$worlds = [];
 		$queries = \min(\max($queries, 1), 500);
 		for ($i = 0; $i < $queries; ++ $i) {
-			$worlds[] = (DAO::getById(World::class, \mt_rand(1, 10000), false))->_rest;
+			$worlds[] = (DAO::getById(World::class, [
+				'id' => \mt_rand(1, 10000)
+			], false))->_rest;
 		}
 		echo \json_encode($worlds);
 	}
-	
+
 	public function update($queries = 1) {
 		$worlds = [];
 		$queries = \min(\max($queries, 1), 500);
 		for ($i = 0; $i < $queries; ++ $i) {
-			$world = DAO::getById(World::class, \mt_rand(1, 10000), false);
+			$world = DAO::getById(World::class, [
+				'id' => \mt_rand(1, 10000)
+			], false);
 			$world->randomNumber = \mt_rand(1, 10000);
 			DAO::toUpdate($world);
-			$worlds[]=$world->_rest;
+			$worlds[] = $world->_rest;
 		}
 		DAO::flushUpdates();
 		echo \json_encode($worlds);

frameworks/PHP/ubiquity/ubiquity-swoole.dockerfile

@@ -2,7 +2,7 @@ FROM php:7.4
 
 RUN apt-get update > /dev/null
 
-RUN pecl install swoole-4.4.7 > /dev/null && \
+RUN pecl install swoole-4.4.14 > /dev/null && \
     docker-php-ext-enable swoole
 
 RUN apt-get install -y libpq-dev \