Merge branch 'ce-to-ee-2018-02-21' into 'master'

CE upstream - 2018-02-21 12:31 UTC

See merge request gitlab-org/gitlab-ee!4648

lib/gitlab/query_limiting/active_support_subscriber.rb

@@ -3,9 +3,11 @@ module Gitlab
     class ActiveSupportSubscriber < ActiveSupport::Subscriber
       attach_to :active_record
 
-      def sql(*)
+      def sql(event)
+        unless event.payload[:name] == 'CACHE'
           Transaction.current&.increment
         end
       end
     end
+  end
 end

spec/lib/gitlab/query_limiting/active_support_subscriber_spec.rb

 require 'spec_helper'
 
 describe Gitlab::QueryLimiting::ActiveSupportSubscriber do
-  describe '#sql' do
-    it 'increments the number of executed SQL queries' do
-      transaction = double(:transaction)
+  let(:transaction) { instance_double(Gitlab::QueryLimiting::Transaction, increment: true) }
 
+  before do
     allow(Gitlab::QueryLimiting::Transaction)
       .to receive(:current)
       .and_return(transaction)
+  end
+
+  describe '#sql' do
+    it 'increments the number of executed SQL queries' do
+      User.count
 
       expect(transaction)
-        .to receive(:increment)
-        .at_least(:once)
+        .to have_received(:increment)
+        .once
+    end
 
+    context 'when the query is actually a rails cache hit' do
+      it 'does not increment the number of executed SQL queries' do
+        ActiveRecord::Base.connection.cache do
+          User.count
           User.count
         end
+
+        expect(transaction)
+          .to have_received(:increment)
+          .once
+      end
+    end
   end
 end

yarn.lock

@@ -7304,6 +7304,19 @@ resolve-dir@^1.0.0:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-dir@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"