thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 11:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Complain about std::make_pair/tuple (check-style)"

Browse Source 
This reverts commit 3a4da94126.
This commit is contained in:
Robert Schulze 2022-05-08 08:36:05 +02:00
parent a6e22c9379
commit e8809e9f86
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/AsynchronousInsertQueue.h
View File

@ -141,7 +141,7 @@ public:
auto getQueueLocked() const
{
std::shared_lock lock(rwlock);
return std::make_pair(std::ref(queue), std::move(lock)); // NOLINT(style-check-make-pair-tuple)
return std::make_pair(std::ref(queue), std::move(lock));
}
};

3
utils/check-style/check-style
View File

@ -228,9 +228,6 @@ find $ROOT_PATH -name '.gitmodules' | while read i; do grep -F 'url = ' $i | gre
# There shouldn't be any code snippets under GPL or LGPL
find $ROOT_PATH/{src,base,programs} -name '*.h' -or -name '*.cpp' 2>/dev/null | xargs grep -i -F 'General Public License' && echo "There shouldn't be any code snippets under GPL or LGPL"
# std::make_tuple/pair was superseded by std::pair/tuple, use "// NOLINT(style-check-make-pair-tuple)" to suppress the check
find $ROOT_PATH/{src,base,programs} -name '*.h' -or -name '*.cpp' 2>/dev/null | xargs grep -P 'std::make_(pair|tuple).*(?<!NOLINT\(style-check-make-pair-tuple\))$' && echo "std::make_pair/make_tuple should be replaced by std::pair/tuple"
# There shouldn't be any docker containers outside docker directory
find $ROOT_PATH -not -path $ROOT_PATH'/tests/ci*' -not -path $ROOT_PATH'/docker*' -not -path $ROOT_PATH'/contrib*' -name Dockerfile -type f 2>/dev/null | xargs --no-run-if-empty -n1 echo "Please move Dockerfile to docker directory:"