Merge pull request #2 from liuneng1994/local_engine_with_columnar_shu…

…ffle_no_rebase

Merge ClickHouse 22.3

.clang-format

@@ -12,6 +12,7 @@ BraceWrapping:
     AfterUnion: true
     BeforeCatch: true
     BeforeElse: true
+    BeforeLambdaBody: true
     IndentBraces: false
 BreakConstructorInitializersBeforeComma: false
 Cpp11BracedListStyle: true

.clang-tidy

@@ -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,
@@ -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,
@@ -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

.gitattributes

@@ -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

.github/CODEOWNERS

@@ -1,3 +1 @@
-docs/* @ClickHouse/docs
-docs/zh/* @ClickHouse/docs-zh
-website/* @ClickHouse/docs
+

.github/ISSUE_TEMPLATE/10_question.md

@@ -7,6 +7,6 @@ assignees: ''
 
 ---
 
-Make sure to check documentation https://clickhouse.yandex/docs/en/ first. If the question is concise and probably has a short answer, asking it in Telegram chat https://telegram.me/clickhouse_en is probably the fastest way to find the answer. For more complicated questions, consider asking them on StackOverflow with "clickhouse" tag https://stackoverflow.com/questions/tagged/clickhouse 
+> Make sure to check documentation https://clickhouse.yandex/docs/en/ first. If the question is concise and probably has a short answer, asking it in Telegram chat https://telegram.me/clickhouse_en is probably the fastest way to find the answer. For more complicated questions, consider asking them on StackOverflow with "clickhouse" tag https://stackoverflow.com/questions/tagged/clickhouse 
 
-If you still prefer GitHub issues, remove all this text and ask your question here.
+> If you still prefer GitHub issues, remove all this text and ask your question here.

.github/ISSUE_TEMPLATE/20_feature-request.md

@@ -7,16 +7,20 @@ assignees: ''
 
 ---
 
-(you don't have to strictly follow this form)
+> (you don't have to strictly follow this form)
 
 **Use case**
-A clear and concise description of what is the intended usage scenario is.
+
+> A clear and concise description of what is the intended usage scenario is.
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+
+> A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+
+> A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+
+> Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/50_build-issue.md

@@ -7,10 +7,11 @@ assignees: ''
 
 ---
 
-Make sure that `git diff` result is empty and you've just pulled fresh master. Try cleaning up cmake cache. Just in case, official build instructions are published here: https://clickhouse.yandex/docs/en/development/build/
+> Make sure that `git diff` result is empty and you've just pulled fresh master. Try cleaning up cmake cache. Just in case, official build instructions are published here: https://clickhouse.yandex/docs/en/development/build/
 
 **Operating system**
-OS kind or distribution, specific version/release, non-standard kernel if any. If you are trying to build inside virtual machine, please mention it too.
+
+> OS kind or distribution, specific version/release, non-standard kernel if any. If you are trying to build inside virtual machine, please mention it too.
 
 **Cmake version**
 

.github/ISSUE_TEMPLATE/85_bug-report.md

@@ -0,0 +1,50 @@
+---
+name: Bug report
+about: Wrong behaviour (visible to users) in official ClickHouse release.
+title: ''
+labels: 'potential bug'
+assignees: ''
+
+---
+
+> You have to provide the following information whenever possible.
+
+**Describe what's wrong**
+
+> A clear and concise description of what works not as it is supposed to.
+
+**Does it reproduce on recent release?**
+
+[The list of releases](https://github.com/ClickHouse/ClickHouse/blob/master/utils/list-versions/version_date.tsv)
+
+**Enable crash reporting**
+
+> If possible, change "enabled" to true in "send_crash_reports" section in `config.xml`:
+
+```
+<send_crash_reports>
+        <!-- Changing <enabled> to true allows sending crash reports to -->
+        <!-- the ClickHouse core developers team via Sentry https://sentry.io -->
+        <enabled>false</enabled>
+```
+
+**How to reproduce**
+
+* Which ClickHouse server version to use
+* Which interface to use, if matters
+* Non-default settings, if any
+* `CREATE TABLE` statements for all tables involved
+* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
+* Queries to run that lead to unexpected result
+
+**Expected behavior**
+
+> A clear and concise description of what you expected to happen.
+
+**Error message and/or stacktrace**
+
+> If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+
+> Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -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
@@ -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/
+> Information about CI checks: https://clickhouse.tech/docs/en/development/continuous-integration/

.github/actionlint.yml

@@ -0,0 +1,9 @@
+self-hosted-runner:
+  labels:
+    - builder
+    - func-tester
+    - func-tester-aarch64
+    - fuzzer-unit-tester
+    - stress-tester
+    - style-checker
+    - style-checker-aarch64

.github/workflows/backport.yml

@@ -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"