Browse Source

Separate /db and /queries logic to fix Sinatra validation errors

Ben Browning 11 years ago
parent
commit
4780ad3f68
2 changed files with 9 additions and 3 deletions
  1. 2 2
      sinatra/benchmark_config
  2. 7 1
      sinatra/hello_world.rb

+ 2 - 2
sinatra/benchmark_config

@@ -5,7 +5,7 @@
       "setup_file": "setup_ruby",
       "json_url": "/json",
       "db_url": "/db",
-      "query_url": "/db?queries=",
+      "query_url": "/queries?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
@@ -26,7 +26,7 @@
       "setup_file": "setup_jruby",
       "json_url": "/json",
       "db_url": "/db",
-      "query_url": "/db?queries=",
+      "query_url": "/queries?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",

+ 7 - 1
sinatra/hello_world.rb

@@ -42,6 +42,12 @@ get '/plaintext' do
 end
 
 get '/db' do
+  ActiveRecord::Base.connection_pool.with_connection do
+    json(World.find(Random.rand(10000) + 1))
+  end
+end
+
+get '/queries' do
   queries = (params[:queries] || 1).to_i
   queries = 1 if queries < 1
   queries = 500 if queries > 500
@@ -51,6 +57,6 @@ get '/db' do
       World.find(Random.rand(10000) + 1)
     end
 
-    results.length == 1 ? json(results.first) : json(results)
+    json(results)
   end
 end