From cd08057285ab5d844f8c280e3aca3d9369a48865 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Mon, 4 Oct 2021 15:02:11 +0300
Subject: [PATCH] better arguments

---
 src/Columns/ColumnConst.cpp    |  2 +-
 src/Columns/ColumnFunction.cpp |  2 +-
 src/Columns/ColumnsCommon.h    | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Columns/ColumnConst.cpp b/src/Columns/ColumnConst.cpp
index 692e4b3c760..080a5086d0a 100644
--- a/src/Columns/ColumnConst.cpp
+++ b/src/Columns/ColumnConst.cpp
@@ -93,7 +93,7 @@ ColumnPtr ColumnConst::replicate(const Offsets & offsets) const
 
 ColumnPtr ColumnConst::permute(const Permutation & perm, size_t limit) const
 {
-    limit = getLimitForPermutation(*this, perm, limit);
+    limit = getLimitForPermutation(size(), perm.size(), limit);
     return ColumnConst::create(data, limit);
 }
 
diff --git a/src/Columns/ColumnFunction.cpp b/src/Columns/ColumnFunction.cpp
index 6be68c43978..09a3dbad242 100644
--- a/src/Columns/ColumnFunction.cpp
+++ b/src/Columns/ColumnFunction.cpp
@@ -93,7 +93,7 @@ void ColumnFunction::expand(const Filter & mask, bool inverted)
 
 ColumnPtr ColumnFunction::permute(const Permutation & perm, size_t limit) const
 {
-    limit = getLimitForPermutation(*this, perm, limit);
+    limit = getLimitForPermutation(size(), perm.size(), limit);
 
     ColumnsWithTypeAndName capture = captured_columns;
     for (auto & column : capture)
diff --git a/src/Columns/ColumnsCommon.h b/src/Columns/ColumnsCommon.h
index c3fb946fdaa..c6c2e1ddd45 100644
--- a/src/Columns/ColumnsCommon.h
+++ b/src/Columns/ColumnsCommon.h
@@ -72,17 +72,16 @@ ColumnPtr selectIndexImpl(const Column & column, const IColumn & indexes, size_t
                         ErrorCodes::LOGICAL_ERROR);
 }
 
-template <typename Column>
-size_t getLimitForPermutation(const Column & column, const IColumn::Permutation & perm, size_t limit)
+size_t getLimitForPermutation(size_t column_size, size_t perm_size, size_t limit)
 {
     if (limit == 0)
-        limit = column.size();
+        limit = column_size;
     else
-        limit = std::min(column.size(), limit);
+        limit = std::min(column_size, limit);
 
-    if (perm.size() < limit)
+    if (perm_size < limit)
         throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
-            "Size of permutation ({}) is less than required ({})", perm.size(), limit);
+            "Size of permutation ({}) is less than required ({})", perm_size, limit);
 
     return limit;
 }
@@ -90,7 +89,7 @@ size_t getLimitForPermutation(const Column & column, const IColumn::Permutation
 template <typename Column>
 ColumnPtr permuteImpl(const Column & column, const IColumn::Permutation & perm, size_t limit)
 {
-    limit = getLimitForPermutation(column, perm, limit);
+    limit = getLimitForPermutation(column.size(), perm.size(), limit);
     return column.indexImpl(perm, limit);
 }