fredwang
|
e652822e0d
|
Merge branch 'max.chenxi/dev' into 'cnch-dev'
fix(clickhousech@m-3000508658): fix for asan build
See merge request dp/ClickHouse!24466
|
2024-10-08 02:06:10 +00:00 |
fredwang
|
5b1afb856e
|
Merge 'cp_hms_token' into 'cnch-dev'
feat(clickhousech@m-3597120625): Support token for hive metastore client(cp cnch-dev)
See merge request: !24210
|
2024-10-07 07:04:00 +00:00 |
fredwang
|
115c0dea82
|
Merge 'fky@cnch-dev@build@compile-option-11' into 'cnch-dev'
build(clickhousech@m-4968916875): fix compile compatibility for 11
See merge request: !24169
|
2024-10-07 07:01:01 +00:00 |
fredwang
|
950b468516
|
Merge 'fky@cnch-dev@build@compile-option-fix' into 'cnch-dev'
build(clickhousech@m-4968916875): set -Wno-unused-but-set-variable for contribs
See merge request: !24059
|
2024-10-07 03:29:45 +00:00 |
fredwang
|
59ebcaeb14
|
Merge 'cp_paimon' into 'cnch-dev'
feat(clickhousech@m-4670741761): Support paimon (1-3, Cherry-pick)
See merge request: !23742
# Conflicts:
# build_bin.sh
# build_bin_tob.sh
# contrib/java-extensions
# programs/CMakeLists.txt
# src/CMakeLists.txt
# src/Common/ErrorCodes.cpp
# src/Interpreters/DistributedStages/PlanSegmentSplitter.cpp
# src/Storages/DataLakes/StorageCnchLas.cpp
# src/Storages/Hive/StorageCnchHive.cpp
|
2024-10-02 05:27:19 +00:00 |
fredwang
|
f8ae1b37de
|
Merge 'parquet-performance-cnch' into 'cnch-dev'
feat(clickhousech@m-4670764750): hive performance
See merge request: !23506
# Conflicts:
# src/Core/Settings.h
# src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
# src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
# tests/queries/0_ce_problematic_stateless/01461_query_start_time_microseconds.sql
# tests/queries/0_ce_problematic_stateless/01473_event_time_microseconds.sql
|
2024-09-27 07:43:36 +00:00 |
fredwang
|
1664fd4a65
|
Merge 'fky@cnch-dev@feat@support-llvm16' into 'cnch-dev'
feat(clickhousech@m-4724041502): support llvm-16 in cnch
See merge request: !23227
# Conflicts:
# CMakeLists.txt
# build_bin.sh
# cmake/warnings.cmake
# contrib/udns-cmake/CMakeLists.txt
# programs/udf/pysrv/pycolumn.cpp
# src/Common/StringUtils/StringUtils.cpp
# src/Common/Trace/BRPCCarrierV2.h
# src/Common/Trace/ExporterFactory.cpp
# src/Common/Trace/Telemetry.cpp
# src/Common/Trace/Telemetry.h
# src/Common/Trace/TracerOptions.h
# src/Functions/UserDefined/UserDefinedExternalFunctionFactory.cpp
# src/MergeTreeCommon/MergeTreeMetaBase.cpp
# src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
# src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
# src/Storages/MergeTree/VectorIndex/VectorIndexConfig.h
|
2024-09-27 03:16:47 +00:00 |
fredwang
|
e4f4b75917
|
fix ci
|
2024-09-20 06:29:38 +00:00 |
fredwang
|
48b757ed26
|
Merge branch 'cnch_hualloc_pick_fix' into 'cnch-dev'
fix(clickhousech@m-4717110049): fix hualloc config reload
See merge request dp/ClickHouse!23412
|
2024-09-11 09:31:32 +00:00 |
fredwang
|
6cfb0ac87a
|
add contrib cmake files for folly, glog and libevent
|
2024-09-04 15:38:53 +08:00 |
fredwang
|
e4668192f6
|
fix compile error
|
2024-09-04 13:54:17 +08:00 |
fredwang
|
db468653d4
|
Merge branch 'add_io_uring' into 'cnch-dev'
feat(clickhousech@m-4505484237): Add io_uring for file-reading
See merge request dp/ClickHouse!22471
# Conflicts:
# .gitmodules
# contrib/CMakeLists.txt
# contrib/folly
# contrib/folly-cmake/CMakeLists.txt
# contrib/glog
# contrib/glog-cmake/CMakeLists.txt
# src/CMakeLists.txt
# src/Common/CurrentMetrics.cpp
# src/Common/ProfileEvents.cpp
# src/Common/config.h.in
# src/Core/Settings.h
# src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
|
2024-09-04 03:19:20 +00:00 |
fredwang
|
cabd36f7bf
|
Merge 'brpc-latency-ms' into 'cnch-dev'
feat(clickhousech@m-4345251299): brpc latency default unit change to ms
See merge request: !22150
|
2024-09-03 02:49:35 +00:00 |
fredwang
|
67a543aa4c
|
sync aws submodule
|
2024-09-02 09:48:55 +00:00 |
fredwang
|
d5499e4384
|
Merge 'cherry-pick-mr-22640' into 'cnch-2.2'
feat(clickhousech@m-4655966021): Merge 'brpc-overcrowded' into 'cnch-2.2'
See merge request: !22640
|
2024-09-02 06:06:37 +00:00 |
fredwang
|
f4dc292e89
|
Merge branch 'orc-native-cnch' into 'cnch-dev'
feat(clickhousech@m-3986743070): Orc native cnch
See merge request dp/ClickHouse!21863
# Conflicts:
# .gitmodules
# src/CMakeLists.txt
# src/DataTypes/IDataType.h
# src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
# src/Storages/MergeTree/KeyCondition.cpp
# src/Storages/MergeTree/KeyCondition.h
|
2024-07-24 06:52:00 +00:00 |
rmq
|
13237896bd
|
update libhdfs3 to fix dtor order when io_context exits
|
2024-06-04 20:56:17 +08:00 |
fanqi1909
|
981165eb0f
|
Merge branch 'cnch_hualloc_test' into 'cnch-dev'
feat(clickhousech@m-3348167131): cnch-hualloc
See merge request dp/ClickHouse!20751
# Conflicts:
# build_bin.sh
# src/Common/config.h.in
# src/Storages/System/attachSystemTables.cpp
|
2024-05-13 17:29:51 +08:00 |
Amos Bird
|
3077b250eb
|
Enhance build support for ldb_toolchain >= v0.20
|
2024-03-27 19:54:36 +08:00 |
Dao
|
688c4e026b
|
Merge 'feat/cnch-2.0-spark_hash_align' into 'cnch-dev'
feat(clickhousech@m-3011597342): add function sparkHashSimple to align with Spark
See merge request: https://code.byted.org/dp/ClickHouse/merge_requests/19889
|
2024-03-27 14:36:56 +08:00 |
Dao
|
3cde4d9c60
|
Merge branch 'youzhiyuan_fix_brpc_exception_handler' into 'cnch-dev'
fix(clickhousech@m-14726232): use per bthread exception handler to fix ASAN build
See merge request dp/ClickHouse!19502
# Conflicts:
# .gitignore
|
2024-03-07 11:06:13 +08:00 |
Dao Minh Thuc
|
de5bd273f9
|
Daily cherry-pick from internal (#1099)
* Merge branch 'support_json_type' into 'cnch-ce-merge'
feat(clickhousech@m-13539135):support json type
See merge request dp/ClickHouse!15288
# Conflicts:
# src/Analyzers/QueryRewriter.cpp
# src/Catalog/Catalog.cpp
# src/Catalog/Catalog.h
# src/CloudServices/CnchServerServiceImpl.cpp
# src/CloudServices/CnchWorkerResource.cpp
# src/CloudServices/CnchWorkerServiceImpl.cpp
# src/Common/config.h.in
# src/DataStreams/ReadDictInputStream.cpp
# src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
# src/Interpreters/DatabaseCatalog.cpp
# src/Interpreters/TreeRewriter.cpp
# src/MergeTreeCommon/MergeTreeMetaBase.h
# src/Protos/DataModelHelpers.cpp
# src/Protos/cnch_worker_rpc.proto
# src/QueryPlan/PlanSegmentSourceStep.cpp
# src/QueryPlan/TableScanStep.cpp
# src/Storages/BitEngine/BitEngineHelper.cpp
# src/Storages/BitEngineEncodePartitionHelper.cpp
# src/Storages/MergeTree/MergeTreeSequentialSource.cpp
# src/Storages/StorageCnchMergeTree.cpp
# src/Storages/StorageCnchMergeTree.h
# src/WorkerTasks/MergeTreeDataMerger.cpp
# tests/queries/0_ce_problematic_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
|
2024-01-26 10:38:39 +08:00 |
Dao
|
bbf99a1176
|
Merge branch 'las-integ' into 'cnch-ce-merge'
fix(clickhousech@m-16576383): Las integ
See merge request dp/ClickHouse!17691
|
2024-01-21 18:23:58 +08:00 |
Dao
|
6282e4860e
|
fix build
|
2024-01-19 20:39:07 +08:00 |
Dao
|
52cbe1c4fa
|
Merge branch 'cnch_ck23p3_alignment_4jan' into 'cnch-ce-merge'
feat(clickhousech@m-16749763): Cnch ck23p3 alignment
See merge request dp/ClickHouse!18366
|
2024-01-19 16:10:28 +08:00 |
Dao
|
850aee4a71
|
Merge branch 'cherry-pick-18cde4e2-4' into 'cnch-ce-merge'
fix(clickhousech@m-14314476): [cp] Fix aarch64 build for libunwind-old
See merge request dp/ClickHouse!18412
|
2024-01-12 11:00:59 +08:00 |
Dao
|
0c68af176f
|
Merge branch 'cherry-pick-jeprof-backtrace-cnch-ce' into 'cnch-ce-merge'
fix(clickhousech@m-14314476): [cp] Use old libunwind for jeprof backtrace
See merge request dp/ClickHouse!18362
|
2024-01-09 15:54:13 +08:00 |
Dao
|
fd0f5ec786
|
Merge branch 'feat/cnch-2.0-bitmap-memory-tracker' into 'cnch-ce-merge'
feat(clickhousech@m-17036745): Attempt to add memory tracking to CRoaring
See merge request dp/ClickHouse!17706
|
2023-12-14 20:56:04 +08:00 |
Dao
|
d3adac3ac1
|
Merge branch 'update_ivt_idx_test' into 'cnch-ce-merge'
fix(clickhousech@m-17081574): Update inverted index test cases
See merge request dp/ClickHouse!17792
|
2023-12-13 13:59:09 +08:00 |
Dao
|
7e369d6f03
|
update croaring
|
2023-12-12 14:04:46 +08:00 |
Dao
|
5d72c2d8f8
|
Merge branch 'full-textsearch-cnch-ce-merge-pick' into 'cnch-ce-merge'
feat(clickhousech@m-16675959): fulltext search cnch ce merge pick
See merge request dp/ClickHouse!17712
|
2023-12-12 14:04:46 +08:00 |
Dao
|
4793ec3ad1
|
add install rules for breakpad
|
2023-12-07 19:37:41 +08:00 |
Dao
|
23ce6e2f4f
|
Merge branch 'cch_cnch-ce-merge-pick-s3' into 'cnch-ce-merge'
feat(clickhousech@m-12768966): [cherry]S3 Storage support
See merge request dp/ClickHouse!13455
|
2023-11-21 16:23:20 +08:00 |
Dao
|
ca97fa9101
|
Merge branch 'update_aws_2.0' into 'cnch-ce-merge'
feat(clickhousech@m-15087452):[To cnch-2.0] Update aws-cpp-sdk and submodules, Using CrtHttpClient
See merge request dp/ClickHouse!16410
# Conflicts:
# contrib/aws-core-cmake/CMakeLists.txt
# contrib/aws-glue-cmake/CMakeLists.txt
# src/Common/ProfileEvents.cpp
# src/Core/Settings.h
# src/Storages/Hive/examples/glue_client.cpp
|
2023-11-20 18:47:13 +08:00 |
Dao
|
6dd936111c
|
Merge branch 'fix-warnings-dbg-mode' into 'cnch-ce-merge'
feat(clickhousech@m-16123768): fix errors in debug mode
See merge request dp/ClickHouse!16926
|
2023-11-16 10:51:37 +08:00 |
Dao
|
f1cc236742
|
Merge branch 'fix-warnings' into 'cnch-ce-merge'
feat(clickhousech@m-16123768): clean up all warnings and treat warning as error
See merge request dp/ClickHouse!16839
|
2023-11-07 16:19:27 +08:00 |
Dao
|
eff2bdb941
|
Merge branch 'update_brpc' into 'cnch-ce-merge'
fix(clickhousech@m-10351646): Update brpc version to avoid some bugs
See merge request dp/ClickHouse!16732
# Conflicts:
# contrib/incubator-brpc
|
2023-10-30 14:25:26 +08:00 |
Dao
|
f6d568af0c
|
Merge branch 'fky-cnch-ce-merge-cp-upgrade-breakpad' into 'cnch-ce-merge'
fix(clickhousech@m-15178388): update breakpad to the latest version
See merge request dp/ClickHouse!16275
# Conflicts:
# contrib/breakpad
|
2023-10-16 15:16:16 +08:00 |
Dao
|
c3f435d318
|
add msgpack
|
2023-09-29 13:16:45 +08:00 |
Dao
|
db91c028fd
|
Merge branch 'hybrid_cache' into 'cnch-ce-merge'
feat(clickhousech@m-14941343): Hybrid cache of BigHash
See merge request dp/ClickHouse!15890
# Conflicts:
# src/Common/ProfileEvents.cpp
|
2023-09-26 20:08:47 +08:00 |
Dao
|
224c3cb1bc
|
Merge branch 'cherry-pick-e9c31d61' into 'cnch-ce-merge'
fix(clickhousech@m-13231495): [cp cnch-ce-merge] fix core dump of simdjson
See merge request dp/ClickHouse!15206
|
2023-09-22 10:33:43 +08:00 |
Dao
|
890605940a
|
fix build
|
2023-09-21 18:33:59 +08:00 |
Dao
|
59cc005413
|
Merge branch 'dog-cnch-ce-dev-hive-stats' into 'cnch-ce-merge'
feat(optimizer@m-14103225): support hive stats
See merge request dp/ClickHouse!14837
# Conflicts:
# contrib/CMakeLists.txt
# contrib/aws-core-cmake/CMakeLists.txt
# contrib/aws-glue-cmake/CMakeLists.txt
# contrib/aws-s3-cmake/CMakeLists.txt
# src/Statistics/CatalogAdaptorCnch.cpp
# src/Statistics/HiveConverter.cpp
# src/Statistics/StatisticsCollector.cpp
# src/Storages/Hive/Metastore/HiveMetastore.cpp
# src/Storages/Hive/Metastore/HiveMetastore.h
# src/Storages/Hive/Metastore/IMetaClient.h
# src/Storages/Hive/StorageCloudHive.cpp
# src/Storages/Hive/StorageCnchHive.cpp
# src/Storages/Hive/StorageCnchHive.h
# src/Storages/Hive/examples/CMakeLists.txt
# src/Storages/Hive/examples/hive_metastore_client.cpp
|
2023-09-21 16:25:25 +08:00 |
魏祥威
|
d989cfca75
|
Merge branch 'change_vetos_sdk' into 'cnch-ce-merge'
fix(clickhousech@m-13542384): change ve-tos export sdk from ve-tos-cpp-sdk to aws s3
See merge request dp/ClickHouse!14469
|
2023-09-20 17:21:33 +08:00 |
Dao
|
cae95d5a02
|
Merge branch 'cch_cnch-ce-merge-outfile-support' into 'cnch-ce-merge'
feat(clickhousech@m-12393399): cherry pick outfile to cnch-ce-merge
See merge request dp/ClickHouse!13732
|
2023-09-19 20:52:47 +08:00 |
张斯琪
|
e89fe27b36
|
external catalog
|
2023-09-14 18:01:08 +08:00 |
ByConityBot
|
0827157dfd
|
Merge branch 'master' of https://github.com/ByConity/ByConity into bridge_branch-20230911
# Conflicts:
# src/Core/Settings.h
|
2023-09-11 11:13:52 +08:00 |
littlecongbro
|
84c757396f
|
Merge pull request #665 from ByConity/hudi-mor
Hudi mor
|
2023-09-08 17:26:27 +08:00 |
ByConityBot
|
da5831f628
|
Optimizer Related Pick + Bug Fix (#659)
* Merge branch 'cnch-20-fix-insert-select' into 'cnch-ce-merge'
fix(clickhousech@m-14794765): disable explain insert select values
See merge request dp/ClickHouse!15514
* Merge branch 'fix/cte_build_ce_merge' into 'cnch-ce-merge'
fix(optimizer@m-12021726): fix and refactor cte explore in cascades cnch-ce-merge
See merge request dp/ClickHouse!13864
# Conflicts:
# src/Optimizer/QueryUseOptimizerChecker.cpp
# src/Optimizer/QueryUseOptimizerChecker.h
* Merge branch 'dog-cnch-ce-dev-support-component' into 'cnch-ce-merge'
feat(optimizer@m-13248462): support component and bucket table in optimizer
See merge request dp/ClickHouse!14095
* Merge branch 'fix_mv_core' into 'cnch-ce-merge'
fix(optimizer@m-13608392): fix INSERT SELECT fail
See merge request dp/ClickHouse!14286
* Merge branch 'fix_cnch_ce_prop_bugs' into 'cnch-ce-merge'
fix(optimizer@m-13072225): fix prop bugs
See merge request dp/ClickHouse!14357
* Merge branch 'cnch-20-session-context' into 'cnch-ce-merge'
fix(clickhousech@m-13725707): fix worker selection when insert
See merge request dp/ClickHouse!14407
# Conflicts:
# src/Interpreters/trySetVirtualWarehouse.cpp
# src/Storages/StorageCnchMergeTree.cpp
* fix
* fix
* Merge branch 'doggie_quickfix' into 'cnch-ce-merge'
fix(clickhousech@m-13479904): use the right function in periodical task
See merge request dp/ClickHouse!14354
* fix
* Merge branch 'improve_injective_in_cnch_ce' into 'cnch-ce-merge'
feat(optimizer@m-13068041): injective function property optimization
See merge request dp/ClickHouse!14551
# Conflicts:
# src/Optimizer/ExpressionRewriter.cpp
# tests/queries/4_cnch_problematic_stateless/40003_bucket_table_join.reference
# tests/queries/4_cnch_problematic_stateless/40003_bucket_table_join.sql
* Revert "Merge branch 'improve_injective_in_cnch_ce' into 'cnch-ce-merge'"
This reverts commit b1151021e1 .
* Merge branch 'add_grouping_compatibility' into 'cnch-ce-merge'
fix(clickhousech@m-14545851):add grouping function compatibility
See merge request dp/ClickHouse!15215
# Conflicts:
# src/Core/Settings.h
# tests/queries/4_cnch_stateless/40047_grouping_functions.reference
# tests/queries/4_cnch_stateless/40047_grouping_functions.sql
* Merge branch 'dog-cnch-ce-fix-SegmentScheduler' into 'cnch-ce-merge'
fix(optimizer@m-14710914): fix SegmentScheduler core due to mutex misuse
See merge request dp/ClickHouse!15444
* Merge branch 'retry_cnch-ce-merge' into 'cnch-ce-merge'
fix(clickhousech@m-14820115):ignore warning and fix retry_2[cnch-ce-merge]
See merge request dp/ClickHouse!15518
# Conflicts:
# tests/clickhouse-test
* Merge branch 'cnch_2.0_fix_schema_data_race' into 'cnch-ce-merge'
fix(clickhousech@m-14632809): fix data race for PB schema
See merge request dp/ClickHouse!15313
* Merge branch 'cherry-pick-e9c31d61' into 'cnch-ce-merge'
fix(clickhousech@m-13231495): [cp cnch-ce-merge] fix core dump of simdjson
See merge request dp/ClickHouse!15206
|
2023-09-08 17:08:43 +08:00 |
ByConityBot
|
83e69d8f6f
|
hive support hudi cow simple
support jni lib
init hudi table
rework jni framework
add log4j config
hudi mor reader supports
remove unnecessary files
fix build
|
2023-09-08 16:06:10 +08:00 |