Merge pull request #193 from rails/find-by-sql

Use find_by_sql for SQL lookups

Author: djmb

app/models/solid_cache/entry.rb

@@ -20,13 +20,12 @@ def write_multi(payloads)
       end
 
       def read(key)
-        result = select_all_no_query_cache(get_sql, key_hash_for(key)).first
+        result = select_all_no_query_cache([key]).first
         result[1] if result&.first == key
       end
 
       def read_multi(keys)
-        key_hashes = keys.map { |key| key_hash_for(key) }
-        results = select_all_no_query_cache(get_all_sql(key_hashes), key_hashes).to_h
+        results = select_all_no_query_cache(keys).to_h
         results.except!(results.keys - keys)
       end
 
@@ -107,36 +106,21 @@ def upsert_update_only
           [ :key, :value, :byte_size ]
         end
 
-        def get_sql
-          @get_sql ||= build_sql(where(key_hash: 1).select(:key, :value))
-        end
-
-        def get_all_sql(key_hashes)
-          @get_all_sql ||= {}
-          @get_all_sql[key_hashes.count] ||= build_sql(where(key_hash: key_hashes).select(:key, :value))
-        end
-
-        def build_sql(relation)
-          collector = Arel::Collectors::Composite.new(
-            Arel::Collectors::SQLString.new,
-            Arel::Collectors::Bind.new,
-          )
-
-          connection.visitor.compile(relation.arel.ast, collector)[0]
-        end
-
-        def select_all_no_query_cache(query, values)
+        def select_all_no_query_cache(keys)
           uncached do
-            if connection.prepared_statements?
-              result = connection.select_all(sanitize_sql(query), "#{name} Load", Array(values), preparable: true)
-            else
-              result = connection.select_all(sanitize_sql([ query, *values ]), "#{name} Load", Array(values), preparable: false)
-            end
-
-            result.cast_values(SolidCache::Entry.attribute_types)
+            find_by_sql([select_sql(keys), *key_hashes_for(keys)]).pluck(:key, :value)
           end
         end
 
+        def select_sql(keys)
+          @get_sql ||= {}
+          @get_sql[keys.count] ||= \
+            where(key_hash: [ "1111", "2222" ])
+              .select(:key, :value)
+              .to_sql
+              .gsub("1111, 2222", (["?"] * keys.count).join(", "))
+        end
+
         def delete_no_query_cache(attribute, values)
           uncached do
             relation = where(attribute => values)
@@ -160,6 +144,10 @@ def key_hash_for(key)
           Digest::SHA256.digest(key.to_s).unpack("q>").first
         end
 
+        def key_hashes_for(keys)
+          keys.map { |key| key_hash_for(key) }
+        end
+
         def byte_size_for(payload)
           payload[:key].to_s.bytesize + payload[:value].to_s.bytesize + ESTIMATED_ROW_OVERHEAD
         end

gemfiles/rails_main.gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/rails/rails.git
-  revision: ea0f0a2c964659aa2f9ead9ba999f53a6cc39366
+  revision: d7f93473682d9b64ab268a6736d5af2853e97ce2
   branch: main
   specs:
     actionpack (8.0.0.alpha)
@@ -36,7 +36,9 @@ GIT
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     railties (8.0.0.alpha)
       actionpack (= 8.0.0.alpha)
@@ -65,48 +67,49 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    builder (3.2.4)
-    concurrent-ruby (1.3.1)
+    builder (3.3.0)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
     drb (2.2.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
+    logger (1.6.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.23.1)
-    mocha (2.3.0)
+    minitest (5.24.1)
+    mocha (2.4.5)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.2)
     mysql2 (0.5.6)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.2.0)
+    parallel (1.26.2)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
-    pg (1.5.6)
+    pg (1.5.7)
     psych (5.1.2)
       stringio
-    racc (1.8.0)
-    rack (3.0.11)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -126,51 +129,52 @@ GEM
     rdoc (6.7.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rubocop (1.64.0)
+    rexml (3.3.5)
+      strscan
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.0)
       parser (>= 3.3.1.0)
     rubocop-md (1.2.2)
       rubocop (>= 1.0)
-    rubocop-minitest (0.35.0)
+    rubocop-minitest (0.35.1)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    securerandom (0.3.1)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    sqlite3 (2.0.2-arm64-darwin)
-    sqlite3 (2.0.2-x86_64-darwin)
-    sqlite3 (2.0.2-x86_64-linux-gnu)
-    stringio (3.1.0)
+    sqlite3 (2.0.3-arm64-darwin)
+    sqlite3 (2.0.3-x86_64-darwin)
+    sqlite3 (2.0.3-x86_64-linux-gnu)
+    stringio (3.1.1)
     strscan (3.1.0)
     thor (1.3.1)
     timeout (0.4.1)
@@ -179,7 +183,7 @@ GEM
     unicode-display_width (2.5.0)
     useragent (0.16.10)
     webrick (1.8.1)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   arm64-darwin-21