Skip to content

Commit

Permalink
Merge branch '22.3' into local_engine_with_columnar_shuffle_no_rebase
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/backport_branches.yml
#	.github/workflows/release_branches.yml
#	.gitmodules
#	base/base/unit.h
#	base/common/arithmeticOverflow.h
#	base/mysqlxx/Query.cpp
#	cmake/autogenerated_versions.txt
#	cmake/find/cxx.cmake
#	debian/changelog
#	docker/builder/Dockerfile
#	docker/client/Dockerfile
#	docker/images.json
#	docker/packager/binary/Dockerfile
#	docker/packager/deb/Dockerfile
#	docker/packager/packager
#	docker/packager/unbundled/Dockerfile
#	docker/server/Dockerfile
#	docker/test/Dockerfile
#	docker/test/base/Dockerfile
#	docker/test/codebrowser/Dockerfile
#	docker/test/coverage/Dockerfile
#	docker/test/fasttest/Dockerfile
#	docker/test/fasttest/run.sh
#	docker/test/fuzzer/Dockerfile
#	docker/test/integration/base/Dockerfile
#	docker/test/integration/kerberized_hadoop/Dockerfile
#	docker/test/integration/runner/Dockerfile
#	docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
#	docker/test/keeper-jepsen/Dockerfile
#	docker/test/performance-comparison/Dockerfile
#	docker/test/pvs/Dockerfile
#	docker/test/split_build_smoke_test/Dockerfile
#	docker/test/sqlancer/Dockerfile
#	docker/test/stateful/Dockerfile
#	docker/test/stateless/Dockerfile
#	docker/test/stateless/run.sh
#	docker/test/stateless_pytest/Dockerfile
#	docker/test/stateless_unbundled/Dockerfile
#	docker/test/stress/Dockerfile
#	docker/test/stress/README.md
#	docker/test/test_runner.sh
#	docker/test/testflows/runner/Dockerfile
#	docker/test/unit/Dockerfile
#	programs/keeper/CMakeLists.txt
#	programs/server/Server.cpp
#	src/Access/EnabledQuota.cpp
#	src/Access/ReplicatedAccessStorage.cpp
#	src/AggregateFunctions/AggregateFunctionAvg.h
#	src/Common/ConcurrentBoundedQueue.h
#	src/Common/LRUCache.h
#	src/Common/Stopwatch.h
#	src/Common/StringSearcher.h
#	src/Common/ZooKeeper/ZooKeeperImpl.cpp
#	src/Common/ZooKeeper/ZooKeeperImpl.h
#	src/Compression/LZ4_decompress_faster.cpp
#	src/Coordination/Changelog.cpp
#	src/Coordination/Changelog.h
#	src/Coordination/KeeperServer.h
#	src/Coordination/KeeperStateMachine.cpp
#	src/Coordination/KeeperStateMachine.h
#	src/Coordination/KeeperStorage.cpp
#	src/Coordination/KeeperStorage.h
#	src/Coordination/KeeperStorageDispatcher.cpp
#	src/Coordination/SessionExpiryQueue.cpp
#	src/Coordination/tests/gtest_coordination.cpp
#	src/Core/QualifiedTableName.h
#	src/Core/Settings.h
#	src/DataStreams/NativeBlockInputStream.cpp
#	src/Databases/DatabaseMemory.cpp
#	src/Databases/DatabaseOnDisk.cpp
#	src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
#	src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
#	src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
#	src/Dictionaries/HashedDictionary.cpp
#	src/Disks/DiskEncrypted.cpp
#	src/Disks/HDFS/DiskHDFS.cpp
#	src/Disks/S3/DiskS3.cpp
#	src/Disks/S3/DiskS3.h
#	src/Disks/tests/gtest_disk_encrypted.cpp
#	src/Formats/MySQLSource.cpp
#	src/Formats/ProtobufSerializer.cpp
#	src/Functions/FunctionJoinGet.cpp
#	src/Functions/FunctionsJSON.h
#	src/Functions/ReplaceRegexpImpl.h
#	src/Functions/array/arrayCompact.cpp
#	src/Functions/array/arrayCumSumNonNegative.cpp
#	src/Functions/array/arrayDifference.cpp
#	src/Functions/formatRow.cpp
#	src/Functions/transform.cpp
#	src/IO/Bzip2ReadBuffer.cpp
#	src/IO/ZlibInflatingReadBuffer.cpp
#	src/Interpreters/AddDefaultDatabaseVisitor.h
#	src/Interpreters/Aggregator.cpp
#	src/Interpreters/Aggregator.h
#	src/Interpreters/Context.cpp
#	src/Interpreters/DDLWorker.cpp
#	src/Interpreters/DatabaseCatalog.h
#	src/Interpreters/DuplicateOrderByVisitor.cpp
#	src/Interpreters/ExpressionAnalyzer.cpp
#	src/Interpreters/ExternalDictionariesLoader.cpp
#	src/Interpreters/GlobalSubqueriesVisitor.h
#	src/Interpreters/InterpreterCreateQuery.cpp
#	src/Interpreters/InterpreterGrantQuery.cpp
#	src/Interpreters/JIT/CHJIT.cpp
#	src/Interpreters/LogicalExpressionsOptimizer.cpp
#	src/Interpreters/MergeJoin.cpp
#	src/Interpreters/MutationsInterpreter.cpp
#	src/Interpreters/PredicateRewriteVisitor.cpp
#	src/Interpreters/PredicateRewriteVisitor.h
#	src/Interpreters/Session.cpp
#	src/Interpreters/Session.h
#	src/Interpreters/SystemLog.h
#	src/Interpreters/TreeOptimizer.cpp
#	src/Interpreters/TreeRewriter.cpp
#	src/Interpreters/join_common.cpp
#	src/Parsers/ASTSelectIntersectExceptQuery.h
#	src/Parsers/ExpressionElementParsers.cpp
#	src/Processors/Formats/Impl/JSONEachRowWithProgressRowOutputFormat.h
#	src/Processors/Transforms/JoiningTransform.cpp
#	src/Processors/Transforms/TotalsHavingTransform.cpp
#	src/Processors/Transforms/WindowTransform.cpp
#	src/Server/GRPCServer.cpp
#	src/Server/KeeperTCPHandler.cpp
#	src/Server/TCPHandler.cpp
#	src/Storages/Distributed/DistributedSink.cpp
#	src/Storages/HDFS/HDFSCommon.cpp
#	src/Storages/HDFS/HDFSCommon.h
#	src/Storages/HDFS/StorageHDFS.cpp
#	src/Storages/MergeTree/BackgroundJobsExecutor.cpp
#	src/Storages/MergeTree/IMergeTreeDataPart.cpp
#	src/Storages/MergeTree/IMergeTreeDataPart.h
#	src/Storages/MergeTree/IMergeTreeReader.cpp
#	src/Storages/MergeTree/KeyCondition.cpp
#	src/Storages/MergeTree/MergeList.h
#	src/Storages/MergeTree/MergeTreeData.cpp
#	src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
#	src/Storages/MergeTree/MergeTreeDataMergerMutator.h
#	src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
#	src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
#	src/Storages/MergeTree/MergeTreeDataWriter.cpp
#	src/Storages/MergeTree/MergeTreeDataWriter.h
#	src/Storages/MergeTree/MergeTreeReaderCompact.cpp
#	src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
#	src/Storages/MergeTree/MergedBlockOutputStream.h
#	src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
#	src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
#	src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
#	src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
#	src/Storages/ProjectionsDescription.cpp
#	src/Storages/ProjectionsDescription.h
#	src/Storages/SelectQueryInfo.h
#	src/Storages/StorageDictionary.cpp
#	src/Storages/StorageDistributed.cpp
#	src/Storages/StorageFile.cpp
#	src/Storages/StorageJoin.cpp
#	src/Storages/StorageJoin.h
#	src/Storages/StorageLog.cpp
#	src/Storages/StorageLog.h
#	src/Storages/StorageMerge.cpp
#	src/Storages/StorageMerge.h
#	src/Storages/StorageMergeTree.cpp
#	src/Storages/StorageReplicatedMergeTree.cpp
#	src/Storages/StorageSet.cpp
#	src/Storages/StorageStripeLog.cpp
#	src/Storages/System/StorageSystemContributors.generated.cpp
#	src/Storages/tests/gtest_transform_query_for_external_database.cpp
#	tests/ci/ast_fuzzer_check.py
#	tests/ci/build_check.py
#	tests/ci/build_download_helper.py
#	tests/ci/build_report_check.py
#	tests/ci/ccache_utils.py
#	tests/ci/cherry_pick.py
#	tests/ci/cherry_pick_utils/backport.py
#	tests/ci/cherry_pick_utils/cherrypick.py
#	tests/ci/cherry_pick_utils/local.py
#	tests/ci/cherry_pick_utils/parser.py
#	tests/ci/cherry_pick_utils/query.py
#	tests/ci/ci_config.json
#	tests/ci/ci_config.py
#	tests/ci/clickhouse_helper.py
#	tests/ci/commit_status_helper.py
#	tests/ci/compatibility_check.py
#	tests/ci/compress_files.py
#	tests/ci/docker_images_check.py
#	tests/ci/docker_pull_helper.py
#	tests/ci/docs_check.py
#	tests/ci/docs_release.py
#	tests/ci/fast_test_check.py
#	tests/ci/finish_check.py
#	tests/ci/functional_test_check.py
#	tests/ci/get_robot_token.py
#	tests/ci/integration_test_check.py
#	tests/ci/metrics_lambda/app.py
#	tests/ci/pr_info.py
#	tests/ci/push_to_artifactory.py
#	tests/ci/report.py
#	tests/ci/rerun_helper.py
#	tests/ci/run_check.py
#	tests/ci/s3_helper.py
#	tests/ci/split_build_smoke_check.py
#	tests/ci/ssh.py
#	tests/ci/stopwatch.py
#	tests/ci/stress_check.py
#	tests/ci/style_check.py
#	tests/ci/tee_popen.py
#	tests/ci/termination_lambda/app.py
#	tests/ci/token_lambda/app.py
#	tests/ci/unit_tests_check.py
#	tests/ci/upload_result_helper.py
#	tests/ci/version_helper.py
#	tests/ci/workflow_approve_rerun_lambda/app.py
#	tests/clickhouse-test
#	tests/integration/ci-runner.py
#	tests/integration/helpers/client.py
#	tests/integration/helpers/cluster.py
#	tests/integration/helpers/network.py
#	tests/integration/runner
#	tests/integration/test_attach_partition_with_large_destination/configs/config.xml
#	tests/integration/test_attach_partition_with_large_destination/test.py
#	tests/integration/test_distributed_inter_server_secret/test.py
#	tests/integration/test_grpc_protocol/test.py
#	tests/integration/test_keeper_back_to_back/test.py
#	tests/integration/test_library_bridge/test.py
#	tests/integration/test_lost_part/test.py
#	tests/integration/test_lost_part_during_startup/test.py
#	tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
#	tests/integration/test_materialized_mysql_database/test.py
#	tests/integration/test_partition/test.py
#	tests/integration/test_postgresql_replica_database_engine/test.py
#	tests/integration/test_replicated_merge_tree_compatibility/test.py
#	tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
#	tests/integration/test_restart_server/test.py
#	tests/integration/test_sharding_key_from_default_column/configs/test_cluster.xml
#	tests/integration/test_sharding_key_from_default_column/test.py
#	tests/integration/test_storage_kafka/message_with_repeated_pb2.py
#	tests/integration/test_storage_kafka/test.py
#	tests/integration/test_storage_mysql/test.py
#	tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.reference
#	tests/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh
#	tests/queries/0_stateless/01020_function_array_compact.sql
#	tests/queries/0_stateless/01155_rename_move_materialized_view.sql
#	tests/queries/0_stateless/01165_lost_part_empty_partition.sql
#	tests/queries/0_stateless/01410_nullable_key_and_index.sql
#	tests/queries/0_stateless/01591_window_functions.reference
#	tests/queries/0_stateless/01591_window_functions.sql
#	tests/queries/0_stateless/01710_projection_vertical_merges.sql
#	tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
#	tests/queries/0_stateless/01763_max_distributed_depth.sql
#	tests/queries/0_stateless/01915_json_extract_raw_string.reference
#	tests/queries/0_stateless/01915_json_extract_raw_string.sql
#	tests/queries/0_stateless/02013_zlib_read_after_eof.sh
#	tests/queries/0_stateless/02017_create_distributed_table_coredump.sql
#	tests/queries/0_stateless/02033_join_engine_deadlock_long.sh
#	tests/queries/0_stateless/02097_default_dict_get_add_database.sql
#	tests/queries/0_stateless/02100_replaceRegexpAll_bug.reference
#	tests/queries/0_stateless/02100_replaceRegexpAll_bug.sql
#	tests/queries/0_stateless/02114_hdfs_bad_url.sh
#	tests/queries/0_stateless/02125_constant_if_condition_and_not_existing_column.sql
#	tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
#	tests/testflows/rbac/rbac_env/clickhouse-service.yml
  • Loading branch information
liuneng1994 committed Apr 13, 2022
2 parents 43acb9b + df57f8e commit 8c6bb93
Show file tree
Hide file tree
Showing 10,511 changed files with 440,588 additions and 170,235 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 0 additions & 12 deletions .arcignore

This file was deleted.

1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ BraceWrapping:
AfterUnion: true
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: true
IndentBraces: false
BreakConstructorInitializersBeforeComma: false
Cpp11BracedListStyle: true
Expand Down
7 changes: 7 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ Checks: '-*,
performance-no-automatic-move,
performance-trivially-destructible,
performance-unnecessary-copy-initialization,
performance-noexcept-move-constructor,
performance-move-const-arg,
readability-avoid-const-params-in-decls,
readability-const-return-type,
Expand Down Expand Up @@ -142,6 +144,7 @@ Checks: '-*,
clang-analyzer-cplusplus.PlacementNewChecker,
clang-analyzer-cplusplus.SelfAssignment,
clang-analyzer-deadcode.DeadStores,
clang-analyzer-cplusplus.Move,
clang-analyzer-optin.cplusplus.VirtualCall,
clang-analyzer-security.insecureAPI.UncheckedReturn,
clang-analyzer-security.insecureAPI.bcmp,
Expand Down Expand Up @@ -203,3 +206,7 @@ CheckOptions:
value: CamelCase
- key: readability-identifier-naming.UsingCase
value: CamelCase
- key: modernize-loop-convert.UseCxx20ReverseRanges
value: false
- key: performance-move-const-arg.CheckTriviallyCopyableMove
value: false
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
contrib/* linguist-vendored
*.h linguist-language=C++
# to avoid frequent conflicts
tests/queries/0_stateless/arcadia_skip_list.txt text merge=union
tests/queries/0_stateless/data_json/* binary
4 changes: 1 addition & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
docs/* @ClickHouse/docs
docs/zh/* @ClickHouse/docs-zh
website/* @ClickHouse/docs

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/85_bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assignees: ''

> You have to provide the following information whenever possible.
**Describe the bug**
**Describe what's wrong**

> A clear and concise description of what works not as it is supposed to.
Expand Down
13 changes: 1 addition & 12 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):
- New Feature
- Improvement
- Bug Fix
- Bug Fix (user-visible misbehaviour in official stable or prestable release)
- Performance Improvement
- Backward Incompatible Change
- Build/Testing/Packaging Improvement
Expand All @@ -15,13 +13,4 @@ Changelog entry (a user-readable short description of the changes that goes to C
...


Detailed description / Documentation draft:
...


> By adding documentation, you'll allow users to try your new feature immediately, not when someone else will have time to document it later. Documentation is necessary for all features that affect user experience in any way. You can add brief documentation draft above, or add documentation right into your patch as Markdown files in [docs](https://github.com/ClickHouse/ClickHouse/tree/master/docs) folder.
> If you are doing this for the first time, it's recommended to read the lightweight [Contributing to ClickHouse Documentation](https://github.com/ClickHouse/ClickHouse/tree/master/docs/README.md) guide first.

> Information about CI checks: https://clickhouse.tech/docs/en/development/continuous-integration/
9 changes: 9 additions & 0 deletions .github/actionlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
self-hosted-runner:
labels:
- builder
- func-tester
- func-tester-aarch64
- fuzzer-unit-tester
- stress-tester
- style-checker
- style-checker-aarch64
17 changes: 0 additions & 17 deletions .github/codecov.yml

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/anchore-analysis.yml

This file was deleted.

43 changes: 43 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CherryPick

env:
# Force the stdout and stderr streams to be unbuffered
PYTHONUNBUFFERED: 1

concurrency:
group: cherry-pick
on: # yamllint disable-line rule:truthy
schedule:
- cron: '0 */3 * * *'
jobs:
CherryPick:
runs-on: [self-hosted, style-checker]
steps:
- name: Set envs
# https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions#multiline-strings
run: |
cat >> "$GITHUB_ENV" << 'EOF'
TEMP_PATH=${{runner.temp}}/cherry_pick
ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
RCSK
REPO_OWNER=ClickHouse
REPO_NAME=ClickHouse
REPO_TEAM=core
EOF
- name: Check out repository code
uses: actions/checkout@v2
with:
token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
fetch-depth: 0
- name: Cherry pick
run: |
sudo pip install GitPython
cd "$GITHUB_WORKSPACE/tests/ci"
python3 cherry_pick.py
- name: Cleanup
if: always()
run: |
docker kill "$(docker ps -q)" ||:
docker rm -f "$(docker ps -a -q)" ||:
sudo rm -fr "$TEMP_PATH"
Loading

0 comments on commit 8c6bb93

Please sign in to comment.