Merge branch 'ClickHouse:master' into opt_concat_blocks

Author: taiyang-li

CHANGELOG.md

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 3238 
+personal_ws-1.1 en 3238
 AArch
 ACLs
 ALTERs
@@ -1850,7 +1850,6 @@ formatter
 formatters
 fqdn
 frac
-freezed
 frictionless
 fromDaysSinceYearZero
 fromModifiedJulianDay
@@ -1961,6 +1960,7 @@ grpcio
 gtest
 gtid
 gzip
+gunzip
 gzipped
 hadoop
 halfMD
@@ -2345,6 +2345,8 @@ namespace
 namespaces
 natively
 nats
+ncat
+netcat
 ness
 nestjs
 netloc

ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt

@@ -327,8 +327,8 @@ find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' |
     echo "If an exception has LOGICAL_ERROR code, there is no need to include the text 'Logical error' in the exception message, because then the phrase 'Logical error' will be printed twice."
 
 PATTERN="allow_";
-DIFF=$(comm -3 <(grep -o "\b$PATTERN\w*\b" $ROOT_PATH/src/Core/Settings.cpp | sort -u) <(grep -o -h "\b$PATTERN\w*\b" $ROOT_PATH/src/Databases/enableAllExperimentalSettings.cpp $ROOT_PATH/utils/check-style/experimental_settings_ignore.txt | sort -u));
-[ -n "$DIFF" ] && echo "$DIFF" && echo "^^ Detected 'allow_*' settings that might need to be included in src/Databases/enableAllExperimentalSettings.cpp" && echo "Alternatively, consider adding an exception to utils/check-style/experimental_settings_ignore.txt"
+DIFF=$(comm -3 <(grep -o "\b$PATTERN\w*\b" $ROOT_PATH/src/Core/Settings.cpp | sort -u) <(grep -o -h "\b$PATTERN\w*\b" $ROOT_PATH/src/Databases/enableAllExperimentalSettings.cpp $ROOT_PATH/ci/jobs/scripts/check_style/experimental_settings_ignore.txt | sort -u));
+[ -n "$DIFF" ] && echo "$DIFF" && echo "^^ Detected 'allow_*' settings that might need to be included in src/Databases/enableAllExperimentalSettings.cpp" && echo "Alternatively, consider adding an exception to ci/jobs/scripts/check_style/experimental_settings_ignore.txt"
 
 # Don't allow the direct inclusion of magic_enum.hpp and instead point to base/EnumReflection.h
 find $ROOT_PATH/{src,base,programs,utils} -name '*.cpp' -or -name '*.h' | xargs grep -l "magic_enum.hpp" | grep -v EnumReflection.h | while read -r line;

ci/jobs/scripts/check_style/check_cpp.sh

@@ -7,8 +7,8 @@ ROOT_PATH="."
 #FIXME: check all (or almost all) repo
 codespell \
     --skip "*generated*,*gperf*,*.bin,*.mrk*,*.idx,checksums.txt,*.dat,*.pyc,*.kate-swp,*obfuscateQueries.cpp,d3-*.js,*.min.js,*.sum,${ROOT_PATH}/utils/check-style/aspell-ignore" \
-    --ignore-words "${ROOT_PATH}/utils/check-style/codespell-ignore-words.list" \
-    --exclude-file "${ROOT_PATH}/utils/check-style/codespell-ignore-lines.list" \
+    --ignore-words "${ROOT_PATH}/ci/jobs/scripts/check_style/codespell-ignore-words.list" \
+    --exclude-file "${ROOT_PATH}/ci/jobs/scripts/check_style/codespell-ignore-lines.list" \
     --quiet-level 2 \
     "$ROOT_PATH"/{src,base,programs,utils} \
     $@ | grep -P '.' \

ci/jobs/scripts/check_style/check_typos.sh

@@ -26,8 +26,8 @@ corr(x, y)
 
 **Arguments**
 
-- `x` — first variable. [(U)Int*](../../data-types/int-uint.md), [Float*](../../data-types/float.md), [Decimal](../../data-types/decimal.md).
-- `y` — second variable. [(U)Int*](../../data-types/int-uint.md), [Float*](../../data-types/float.md), [Decimal](../../data-types/decimal.md).
+- `x` — first variable. [(U)Int*](../../data-types/int-uint.md), [Float*](../../data-types/float.md).
+- `y` — second variable. [(U)Int*](../../data-types/int-uint.md), [Float*](../../data-types/float.md).
 
 **Returned Value**
 

utils/check-style/codespell-ignore-lines.list renamed to ci/jobs/scripts/check_style/codespell-ignore-lines.list

@@ -233,7 +233,7 @@ For more information about backups and restoring data, see the [Data Backup](/op
 ALTER TABLE table_name [ON CLUSTER cluster] UNFREEZE [PARTITION 'part_expr'] WITH NAME 'backup_name'
 ```
 
-Removes `freezed` partitions with the specified name from the disk. If the `PARTITION` clause is omitted, the query removes the backup of all partitions at once.
+Removes `frozen` partitions with the specified name from the disk. If the `PARTITION` clause is omitted, the query removes the backup of all partitions at once.
 
 ## CLEAR INDEX IN PARTITION {#clear-index-in-partition}