Browse Source

Fixed db error issues with laravel
fixed routing problem that caused warning

Nate Brady 9 years ago
parent
commit
84294ae555

+ 15 - 3
frameworks/PHP/laravel/app/routes.php

@@ -21,16 +21,28 @@ Route::get('/plaintext', function()
     return "Hello, World!";
 });
 
-Route::get('/db', function()
+Route::get('/query', function()
 {
     $queries = Input::get('queries', 1);
+
+    if (!is_numeric($queries) || $queries <= 1) {
+    	$queries = 1;
+    }
+    else if ($queries > 500) {
+        $queries = 500;
+    }
+
     $worlds = array();
 
-    for($i = 0; $i < $queries; ++$i) {
+    for($i = 0; $i < $queries; $i++) {
         $worlds[] = DB::table('World')->find(mt_rand(1, 10000));
     }
-
     return Response::json($worlds);
 });
 
+Route::get('/db', function()
+{
+    return Response::json(DB::table('World')->find(mt_rand(1, 10000)));
+});
+
 Route::get('/fortunes', 'BenchController@fortunes');

+ 4 - 4
frameworks/PHP/laravel/benchmark_config.json

@@ -23,7 +23,7 @@
     "raw": {
       "setup_file": "setup",
       "db_url": "/db",
-      "query_url": "/db?queries=",
+      "query_url": "/query?queries=",
       "fortune_url": "/fortunes",
       "port": 8080,
       "approach": "Realistic",
@@ -36,7 +36,7 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "laravel",
+      "display_name": "laravel-raw",
       "notes": "",
       "versus": "php"
     },
@@ -62,7 +62,7 @@
     "hhvm-raw": {
       "setup_file": "setup_hhvm",
       "db_url": "/db",
-      "query_url": "/db?queries=",
+      "query_url": "/query?queries=",
       "fortune_url": "/fortunes",
       "port": 8080,
       "approach": "Realistic",
@@ -101,7 +101,7 @@
     "php5-raw": {
       "setup_file": "setup_php5",
       "db_url": "/db",
-      "query_url": "/db?queries=",
+      "query_url": "/query?queries=",
       "fortune_url": "/fortunes",
       "port": 8080,
       "approach": "Realistic",