Skip to content

Commit 8c5f391

Browse files
SmitaRKulkarniSmitaRKulkarni
committed
Merge branch 'master' into 44532_Persistent_virtual_column__block_number
2 parents 9ae8713 + 1556cdd commit 8c5f391

File tree

630 files changed

+13157
-4800
lines changed

Some content is hidden

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

630 files changed

+13157
-4800
lines changed

‎.clang-format‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ IndentWidth: 4
7979
IndentWrappedFunctionNames: false
8080
MacroBlockBegin: ''
8181
MacroBlockEnd: ''
82-
NamespaceIndentation: Inner
82+
NamespaceIndentation: None
8383
ObjCBlockIndentWidth: 4
8484
ObjCSpaceAfterProperty: true
8585
ObjCSpaceBeforeProtocolList: true
@@ -89,6 +89,7 @@ PenaltyBreakFirstLessLess: 120
8989
PenaltyBreakString: 1000
9090
PenaltyExcessCharacter: 1000000
9191
PenaltyReturnTypeOnItsOwnLine: 60
92+
RemoveBracesLLVM: true
9293
SpaceAfterCStyleCast: false
9394
SpaceBeforeAssignmentOperators: true
9495
SpaceBeforeParens: ControlStatements

‎.github/workflows/auto_release.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: AutoRelease
2+
3+
env:
4+
# Force the stdout and stderr streams to be unbuffered
5+
PYTHONUNBUFFERED: 1
6+
7+
concurrency:
8+
group: auto-release
9+
on: # yamllint disable-line rule:truthy
10+
# schedule:
11+
# - cron: '0 10-16 * * 1-5'
12+
workflow_dispatch:
13+
14+
jobs:
15+
CherryPick:
16+
runs-on: [self-hosted, style-checker-aarch64]
17+
steps:
18+
- name: Set envs
19+
# https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions#multiline-strings
20+
run: |
21+
cat >> "$GITHUB_ENV" << 'EOF'
22+
TEMP_PATH=${{runner.temp}}/cherry_pick
23+
ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
24+
${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
25+
RCSK
26+
REPO_OWNER=ClickHouse
27+
REPO_NAME=ClickHouse
28+
REPO_TEAM=core
29+
EOF
30+
- name: Check out repository code
31+
uses: ClickHouse/checkout@v1
32+
with:
33+
clear-repository: true
34+
token: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}}
35+
fetch-depth: 0
36+
- name: Auto-release
37+
run: |
38+
cd "$GITHUB_WORKSPACE/tests/ci"
39+
python3 auto_release.py --release-after-days=3
40+
- name: Cleanup
41+
if: always()
42+
run: |
43+
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
44+
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
45+
sudo rm -fr "$TEMP_PATH"

‎cmake/limit_jobs.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if (CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO" AND ENABLE_THINLTO AND PARALLE
4747
set (PARALLEL_LINK_JOBS 2)
4848
endif()
4949

50-
message(STATUS "Building sub-tree with ${PARALLEL_COMPILE_JOBS} compile jobs and ${PARALLEL_LINK_JOBS} linker jobs (system: ${NUMBER_OF_LOGICAL_CORES} cores, ${TOTAL_PHYSICAL_MEMORY} MB DRAM, 'OFF' means the native core count).")
50+
message(STATUS "Building sub-tree with ${PARALLEL_COMPILE_JOBS} compile jobs and ${PARALLEL_LINK_JOBS} linker jobs (system: ${NUMBER_OF_LOGICAL_CORES} cores, ${TOTAL_PHYSICAL_MEMORY} MB RAM, 'OFF' means the native core count).")
5151

5252
if (PARALLEL_COMPILE_JOBS LESS NUMBER_OF_LOGICAL_CORES)
5353
set(CMAKE_JOB_POOL_COMPILE compile_job_pool${CMAKE_CURRENT_SOURCE_DIR})

‎contrib/abseil-cpp‎

Submodule abseil-cpp updated 828 files

‎contrib/abseil-cpp-cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(ABSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
2-
set(BUILD_TESTING OFF)
2+
33
set(ABSL_PROPAGATE_CXX_STD ON)
44
add_subdirectory("${ABSL_ROOT_DIR}" "${ClickHouse_BINARY_DIR}/contrib/abseil-cpp")
55

‎contrib/re2‎

‎contrib/re2-cmake/CMakeLists.txt‎

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# Copyright 2015 The RE2 Authors. All Rights Reserved.
2-
# Use of this source code is governed by a BSD-style
3-
# license that can be found in the LICENSE file.
4-
5-
# This file was edited for ClickHouse
6-
7-
string(FIND ${CMAKE_CURRENT_BINARY_DIR} " " _have_space)
8-
if(_have_space GREATER 0)
9-
message(FATAL_ERROR "Using spaces in build path [${CMAKE_CURRENT_BINARY_DIR}] highly not recommended. Library re2st will be disabled.")
10-
endif()
11-
121
set(SRC_DIR "${ClickHouse_SOURCE_DIR}/contrib/re2")
132

143
set(RE2_SOURCES
@@ -35,33 +24,9 @@ set(RE2_SOURCES
3524
${SRC_DIR}/util/rune.cc
3625
${SRC_DIR}/util/strutil.cc
3726
)
38-
add_library(re2 ${RE2_SOURCES})
39-
target_include_directories(re2 PUBLIC "${SRC_DIR}")
40-
target_link_libraries(re2 ch_contrib::abseil_str_format)
41-
42-
# Building re2 which is thread-safe and re2_st which is not.
43-
# re2 changes its state during matching of regular expression, e.g. creates temporary DFA.
44-
# It uses RWLock to process the same regular expression object from different threads.
45-
# In order to avoid redundant locks in some cases, we use not thread-safe version of the library (re2_st).
46-
47-
add_library(re2_st ${RE2_SOURCES})
48-
target_compile_definitions (re2_st PRIVATE NDEBUG NO_THREADS re2=re2_st)
49-
target_include_directories (re2_st PRIVATE .)
50-
target_include_directories (re2_st SYSTEM PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
51-
target_include_directories (re2_st SYSTEM BEFORE PUBLIC ${SRC_DIR})
52-
target_link_libraries (re2_st ch_contrib::abseil_str_format)
5327

54-
file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/re2_st)
55-
foreach (FILENAME filtered_re2.h re2.h set.h stringpiece.h)
56-
add_custom_command (OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/re2_st/${FILENAME}"
57-
COMMAND ${CMAKE_COMMAND} -DSOURCE_FILENAME="${SRC_DIR}/re2/${FILENAME}"
58-
-DTARGET_FILENAME="${CMAKE_CURRENT_BINARY_DIR}/re2_st/${FILENAME}"
59-
-P "${CMAKE_CURRENT_SOURCE_DIR}/re2_transform.cmake"
60-
COMMENT "Creating ${FILENAME} for re2_st library.")
61-
add_custom_target (transform_${FILENAME} DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/re2_st/${FILENAME}")
62-
add_dependencies (re2_st transform_${FILENAME})
63-
endforeach ()
28+
add_library(_re2 ${RE2_SOURCES})
29+
target_include_directories(_re2 PUBLIC "${SRC_DIR}")
30+
target_link_libraries(_re2 ch_contrib::abseil_str_format)
6431

65-
# NOTE: you should not change name of library here, since it is used to generate required header (see above)
66-
add_library(ch_contrib::re2 ALIAS re2)
67-
add_library(ch_contrib::re2_st ALIAS re2_st)
32+
add_library(ch_contrib::re2 ALIAS _re2)

‎contrib/re2-cmake/re2_transform.cmake‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎contrib/s2geometry‎

Submodule s2geometry updated 365 files

‎contrib/s2geometry-cmake/CMakeLists.txt‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ endif()
77

88
set(S2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/s2geometry/src")
99

10-
set(ABSL_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/abseil-cpp")
11-
if(NOT EXISTS "${ABSL_SOURCE_DIR}/CMakeLists.txt")
12-
message(FATAL_ERROR " submodule contrib/abseil-cpp is missing. To fix try run: \n git submodule update --init --recursive")
13-
endif()
14-
15-
1610
set(S2_SRCS
1711
"${S2_SOURCE_DIR}/s2/encoded_s2cell_id_vector.cc"
1812
"${S2_SOURCE_DIR}/s2/encoded_s2point_vector.cc"
@@ -58,7 +52,9 @@ set(S2_SRCS
5852
"${S2_SOURCE_DIR}/s2/s2edge_crossings.cc"
5953
"${S2_SOURCE_DIR}/s2/s2edge_distances.cc"
6054
"${S2_SOURCE_DIR}/s2/s2edge_tessellator.cc"
55+
"${S2_SOURCE_DIR}/s2/s2error.cc"
6156
"${S2_SOURCE_DIR}/s2/s2furthest_edge_query.cc"
57+
"${S2_SOURCE_DIR}/s2/s2hausdorff_distance_query.cc"
6258
"${S2_SOURCE_DIR}/s2/s2latlng.cc"
6359
"${S2_SOURCE_DIR}/s2/s2latlng_rect.cc"
6460
"${S2_SOURCE_DIR}/s2/s2latlng_rect_bounder.cc"
@@ -93,59 +89,58 @@ set(S2_SRCS
9389
"${S2_SOURCE_DIR}/s2/s2shape_index_buffered_region.cc"
9490
"${S2_SOURCE_DIR}/s2/s2shape_index_measures.cc"
9591
"${S2_SOURCE_DIR}/s2/s2shape_measures.cc"
92+
"${S2_SOURCE_DIR}/s2/s2shape_nesting_query.cc"
9693
"${S2_SOURCE_DIR}/s2/s2shapeutil_build_polygon_boundaries.cc"
9794
"${S2_SOURCE_DIR}/s2/s2shapeutil_coding.cc"
9895
"${S2_SOURCE_DIR}/s2/s2shapeutil_contains_brute_force.cc"
9996
"${S2_SOURCE_DIR}/s2/s2shapeutil_conversion.cc"
10097
"${S2_SOURCE_DIR}/s2/s2shapeutil_edge_iterator.cc"
10198
"${S2_SOURCE_DIR}/s2/s2shapeutil_get_reference_point.cc"
102-
"${S2_SOURCE_DIR}/s2/s2shapeutil_range_iterator.cc"
10399
"${S2_SOURCE_DIR}/s2/s2shapeutil_visit_crossing_edge_pairs.cc"
104100
"${S2_SOURCE_DIR}/s2/s2text_format.cc"
105101
"${S2_SOURCE_DIR}/s2/s2wedge_relations.cc"
106102
"${S2_SOURCE_DIR}/s2/s2winding_operation.cc"
107-
"${S2_SOURCE_DIR}/s2/strings/serialize.cc"
108103
"${S2_SOURCE_DIR}/s2/util/bits/bit-interleave.cc"
109-
"${S2_SOURCE_DIR}/s2/util/bits/bits.cc"
110104
"${S2_SOURCE_DIR}/s2/util/coding/coder.cc"
111105
"${S2_SOURCE_DIR}/s2/util/coding/varint.cc"
112106
"${S2_SOURCE_DIR}/s2/util/math/exactfloat/exactfloat.cc"
113107
"${S2_SOURCE_DIR}/s2/util/math/mathutil.cc"
114108
"${S2_SOURCE_DIR}/s2/util/units/length-units.cc"
115-
116109
)
117110

118111
add_library(_s2 ${S2_SRCS})
119112
add_library(ch_contrib::s2 ALIAS _s2)
120113

121-
set_property(TARGET _s2 PROPERTY CXX_STANDARD 17)
122-
123114
if (TARGET OpenSSL::SSL)
124115
target_link_libraries(_s2 PRIVATE OpenSSL::Crypto OpenSSL::SSL)
125116
endif()
126117

127118
# Copied from contrib/s2geometry/CMakeLists
128119
target_link_libraries(_s2 PRIVATE
129-
absl::base
130-
absl::btree
131-
absl::config
132-
absl::core_headers
133-
absl::dynamic_annotations
134-
absl::endian
135-
absl::fixed_array
136-
absl::flat_hash_map
137-
absl::flat_hash_set
138-
absl::hash
139-
absl::inlined_vector
140-
absl::int128
141-
absl::log_severity
142-
absl::memory
143-
absl::span
144-
absl::str_format
145-
absl::strings
146-
absl::type_traits
147-
absl::utility
148-
)
120+
absl::base
121+
absl::btree
122+
absl::check
123+
absl::config
124+
absl::core_headers
125+
absl::dynamic_annotations
126+
absl::endian
127+
absl::fixed_array
128+
absl::flags
129+
absl::flat_hash_map
130+
absl::flat_hash_set
131+
absl::hash
132+
absl::inlined_vector
133+
absl::int128
134+
absl::log
135+
absl::log_severity
136+
absl::memory
137+
absl::span
138+
absl::status
139+
absl::str_format
140+
absl::strings
141+
absl::type_traits
142+
absl::utility
143+
)
149144

150145
target_include_directories(_s2 SYSTEM BEFORE PUBLIC "${S2_SOURCE_DIR}/")
151146
target_include_directories(_s2 SYSTEM PUBLIC "${ABSL_SOURCE_DIR}")

0 commit comments

Comments
 (0)