Skip to content

Commit 85757ed

Browse files
committed
Merge remote-tracking branch 'origin/master' into yarik/fix-comparison-conversion
2 parents 5f428f4 + c81bec3 commit 85757ed

File tree

316 files changed

+7060
-3805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

316 files changed

+7060
-3805
lines changed

.github/ISSUE_TEMPLATE/85_bug-report.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ body:
3838
> Change "enabled" to true in "send_crash_reports" section in `config.xml`:
3939
```xml
4040
<send_crash_reports>
41-
<!-- Changing <enabled> to true allows sending crash reports to -->
42-
<!-- the ClickHouse core developers team via Sentry https://sentry.io -->
43-
<enabled>false</enabled>
41+
<!-- Changing <enabled> to true allows sending crash reports to -->
42+
<!-- the ClickHouse core developers team. -->
43+
<enabled>true</enabled>
4444
</send_crash_reports>
4545
```
4646
-----

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@
137137
[submodule "contrib/fmtlib"]
138138
path = contrib/fmtlib
139139
url = https://github.com/fmtlib/fmt
140-
[submodule "contrib/sentry-native"]
141-
path = contrib/sentry-native
142-
url = https://github.com/ClickHouse/sentry-native
143140
[submodule "contrib/krb5"]
144141
path = contrib/krb5
145142
url = https://github.com/ClickHouse/krb5

CHANGELOG.md

Lines changed: 190 additions & 0 deletions
Large diffs are not rendered by default.

ci/docker/fasttest/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN apt-get update \
1414
apt-utils \
1515
ca-certificates \
1616
curl \
17+
netcat-openbsd \
1718
gnupg \
1819
lsb-release \
1920
wget \

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
personal_ws-1.1 en 3238
1+
personal_ws-1.1 en 3238
22
AArch
33
ACLs
44
ALTERs
@@ -1850,7 +1850,6 @@ formatter
18501850
formatters
18511851
fqdn
18521852
frac
1853-
freezed
18541853
frictionless
18551854
fromDaysSinceYearZero
18561855
fromModifiedJulianDay
@@ -1961,6 +1960,7 @@ grpcio
19611960
gtest
19621961
gtid
19631962
gzip
1963+
gunzip
19641964
gzipped
19651965
hadoop
19661966
halfMD
@@ -2209,9 +2209,13 @@ mapAll
22092209
mapApply
22102210
mapConcat
22112211
mapContains
2212+
mapContainsKey
22122213
mapContainsKeyLike
2214+
mapContainsValue
2215+
mapContainsValueLike
22132216
mapExists
22142217
mapExtractKeyLike
2218+
mapExtractValueLike
22152219
mapFilter
22162220
mapFromArrays
22172221
mapKeys
@@ -2341,6 +2345,8 @@ namespace
23412345
namespaces
23422346
natively
23432347
nats
2348+
ncat
2349+
netcat
23442350
ness
23452351
nestjs
23462352
netloc

ci/jobs/scripts/check_style/check_cpp.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' |
327327
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."
328328

329329
PATTERN="allow_";
330-
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));
331-
[ -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"
330+
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));
331+
[ -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"
332332

333333
# Don't allow the direct inclusion of magic_enum.hpp and instead point to base/EnumReflection.h
334334
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_typos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ROOT_PATH="."
77
#FIXME: check all (or almost all) repo
88
codespell \
99
--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" \
10-
--ignore-words "${ROOT_PATH}/utils/check-style/codespell-ignore-words.list" \
11-
--exclude-file "${ROOT_PATH}/utils/check-style/codespell-ignore-lines.list" \
10+
--ignore-words "${ROOT_PATH}/ci/jobs/scripts/check_style/codespell-ignore-words.list" \
11+
--exclude-file "${ROOT_PATH}/ci/jobs/scripts/check_style/codespell-ignore-lines.list" \
1212
--quiet-level 2 \
1313
"$ROOT_PATH"/{src,base,programs,utils} \
1414
$@ | grep -P '.' \

0 commit comments

Comments
 (0)