From 5bbae0953a748402aceab3e09566b3a7defaf8e1 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Tue, 6 Oct 2020 09:53:51 +0300
Subject: [PATCH] Fix order of resource destruction in
 SettingQuotaAndLimitsStep.

---
 src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp | 8 +++++---
 src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
index 5b05ad77d6c..588dd7599a1 100644
--- a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
+++ b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
@@ -30,20 +30,18 @@ SettingQuotaAndLimitsStep::SettingQuotaAndLimitsStep(
     std::shared_ptr<const EnabledQuota> quota_,
     std::shared_ptr<Context> context_)
     : ITransformingStep(input_stream_, input_stream_.header, getTraits())
+    , context(std::move(context_))
     , storage(std::move(storage_))
     , table_lock(std::move(table_lock_))
     , limits(limits_)
     , leaf_limits(leaf_limits_)
     , quota(std::move(quota_))
-    , context(std::move(context_))
 {
 }
 
 void SettingQuotaAndLimitsStep::transformPipeline(QueryPipeline & pipeline)
 {
     /// Table lock is stored inside pipeline here.
-    pipeline.addTableLock(table_lock);
-
     pipeline.setLimits(limits);
 
     /**
@@ -59,11 +57,15 @@ void SettingQuotaAndLimitsStep::transformPipeline(QueryPipeline & pipeline)
     if (quota)
         pipeline.setQuota(quota);
 
+    /// Order of resources below is important.
     if (context)
         pipeline.addInterpreterContext(std::move(context));
 
     if (storage)
         pipeline.addStorageHolder(std::move(storage));
+
+    if (table_lock)
+        pipeline.addTableLock(std::move(table_lock));
 }
 
 }
diff --git a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
index 7ec4cfa91c6..66e44e18cd4 100644
--- a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
+++ b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
@@ -33,12 +33,12 @@ public:
     void transformPipeline(QueryPipeline & pipeline) override;
 
 private:
+    std::shared_ptr<Context> context;
     StoragePtr storage;
     TableLockHolder table_lock;
     StreamLocalLimits limits;
     SizeLimits leaf_limits;
     std::shared_ptr<const EnabledQuota> quota;
-    std::shared_ptr<Context> context;
 };
 
 }