Browse Source

Simplify Kumbia-raw (#4599)

* Delete unnecessary comparison

* Simplify kumbia-raw

* Simplify fortune-raw
Joan Miquel 6 years ago
parent
commit
8af50bcd9c

+ 2 - 2
frameworks/PHP/kumbiaphp/bench/app/controllers/db_controller.php

@@ -15,7 +15,7 @@ class DbController extends AppController
 
     public function queries($count = 1)
     {
-        $count = is_numeric($count) ? min(max($count, 1), 500) : 1;
+        $count = min(max($count, 1), 500);
         $worlds = [];
         for ($i = 0; $i < $count; ++$i) {
             $worlds[] = World::byId(mt_rand(1, 10000));
@@ -25,7 +25,7 @@ class DbController extends AppController
 
     public function update($count = 1)
     {
-        $count = is_numeric($count) ? min(max($count, 1), 500) : 1;
+        $count = min(max($count, 1), 500);
         $worlds = [];
         for ($i = 0; $i < $count; ++$i) {
             $row = World::byId(mt_rand(1, 10000));

+ 7 - 11
frameworks/PHP/kumbiaphp/bench/app/controllers/raw_controller.php

@@ -16,29 +16,25 @@ class RawController extends AppController
 
     public function index()
     {
-        $res = $this->pdo->prepare('SELECT randomNumber FROM World WHERE id = ?');
-        $id = mt_rand(1, 10000);
-        $res->execute(array($id));
-        echo json_encode(['id' => $id, 'randomNumber' => $res->fetchColumn()]);
+        $statement = $this->pdo->query( 'SELECT id,randomNumber FROM World WHERE id = '. mt_rand(1, 10000) );
+        echo json_encode($statement->fetch(PDO::FETCH_ASSOC));
     }
 
     public function queries($count = 1)
     {
-        //$queries = ($queries < 1) ? 1 : (($queries > 500) ? 500 : $queries);
-        $count = is_numeric($count) ? min(max($count, 1), 500) : 1;
-        $res = $this->pdo->prepare('SELECT randomNumber FROM World WHERE id = ?');
+        $count = min(max($count, 1), 500);
+        $res = $this->pdo->prepare('SELECT id,randomNumber FROM World WHERE id = ?');
         $worlds = [];
         for ($i = 0; $i < $count; ++$i) {
-            $id = mt_rand(1, 10000);
-            $res->execute(array($id));
-            $worlds[] = array('id' => $id, 'randomNumber' => $res->fetchColumn());
+            $res->execute([mt_rand(1, 10000)]);
+            $worlds[] = $res->fetch(PDO::FETCH_ASSOC);
         }
         echo json_encode($worlds);
     }
 
     public function update($count = 1)
     {
-        $count = is_numeric($count) ? min(max($count, 1), 500) : 1;
+        $count = min(max($count, 1), 500);
         $worlds = [];
         
         $sth = $this->pdo->prepare('SELECT * FROM World WHERE id = ?');

+ 6 - 8
frameworks/PHP/kumbiaphp/bench/app/controllers/raw_fortune_controller.php

@@ -5,16 +5,14 @@ class RawFortuneController extends AppController
     public function index()
     {
         View::select(null,'raw');
-        $pdo = new PDO('mysql:host=tfb-database;dbname=hello_world', 'benchmarkdbuser', 'benchmarkdbpass', array(
+        $pdo = new PDO('mysql:host=tfb-database;dbname=hello_world', 'benchmarkdbuser', 'benchmarkdbpass', [
             PDO::ATTR_PERSISTENT => true
-        ));
-        $res = $pdo->query('SELECT id, message FROM Fortune', PDO::FETCH_ASSOC);
-        $data = $res->fetchAll();
+        ]);
+        $data = $pdo->query('SELECT id, message FROM Fortune', PDO::FETCH_KEY_PAIR)->fetchAll();
+
+        $data[0] = 'Additional fortune added at request time.';
+        asort($data);       
         
-        array_push($data, array('id'=> 0, 'message' => 'Additional fortune added at request time.'));
-        usort($data, function($left, $right) {
-            return strcmp($left['message'], $right['message']);
-        });
         $this->data = $data;
     }
 }

+ 2 - 2
frameworks/PHP/kumbiaphp/bench/app/views/_shared/templates/raw.phtml

@@ -1,4 +1,4 @@
 <!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>
-<?php foreach ($data as $key => $value) : ?>
-<tr><td><?= $value['id'] ?></td><td><?= h($value['message']) ?></td></tr>
+<?php foreach ($data as $id => $value) : ?>
+<tr><td><?= $id ?></td><td><?= h($value) ?></td></tr>
 <?php endforeach ?></table></body></html>