fredwang
89e18d27c9
Merge 'cnch_dev_fix_aeolus_check' into 'cnch-dev'
...
fix(clickhousech@m-5285120967): fix aeolus check with tenant id
See merge request: !24825
2024-10-09 03:24:11 +00:00
fredwang
d2397fa936
Merge 'cherry-pick-mr-24769' into 'cnch-dev'
...
fix(clickhousech@m-5285362786): [cp]rpc exception bug in getDedupImplVersion method
See merge request: !24778
2024-10-09 03:23:56 +00:00
fredwang
46564154e4
Merge branch '5285111076_fix' into 'cnch-dev'
...
fix(clickhousech@m-5285111076): check whether parent_path of src_path exists when applying UndoResourceType::FileSystem
See merge request dp/ClickHouse!24785
2024-10-09 03:23:42 +00:00
fredwang
0c028720eb
Merge branch 'cnch_add_write_part_throttle' into 'cnch-dev'
...
feat(clickhousech@m-5165686588): introduce simple parts throttle mechanism
See merge request dp/ClickHouse!24294
# Conflicts:
# src/Interpreters/ServerPartLog.cpp
# src/Interpreters/ServerPartLog.h
# src/Storages/MergeTree/MergeTreeSettings.h
# src/Storages/StorageDictCloudMergeTree.cpp
2024-10-09 03:19:38 +00:00
fredwang
6ddb50f726
Merge 'lta@fix_unique_table_attach_bug4cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-5260389562): fix detach/attach bug in part chain case
See merge request: !24742
2024-10-09 02:37:33 +00:00
fredwang
2a57ea3241
Merge branch 'jiashuo_support-s3-select-insert' into 'cnch-dev'
...
fix(clickhousech@m-5285081630): support insert-select and read from partition-write table for cnch s3/hdfs
See merge request dp/ClickHouse!24752
# Conflicts:
# src/Interpreters/DatabaseCatalog.cpp
# src/Interpreters/InterpreterInsertQuery.cpp
2024-10-09 02:37:11 +00:00
fredwang
19fd646417
Merge branch 'fix_system_log_core_dump' into 'cnch-dev'
...
fix(clickhousech@m-5285220418): minor fix coredump of SystemLog
See merge request dp/ClickHouse!24780
2024-10-09 02:35:07 +00:00
fredwang
1f6cf57569
Merge 'perf-getInMemoryMetadataCopy-cnch-dev' into 'cnch-dev'
...
perf(clickhousech@m-5285236195): rename getInMemoryMetadata to getInMemoryMetadataCopy
See merge request: !24767
# Conflicts:
# src/Common/AdditionalServices.cpp
2024-10-09 02:34:47 +00:00
fredwang
1ce78806bd
Merge 'fix_subcolumn_for_lowcard_nullable-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-4731033617): fix subcolumn for lowcard nullable cnch dev
See merge request: !24649
2024-10-09 02:34:10 +00:00
fredwang
4d7001970d
Merge 'bsp-schduler-test-cases' into 'cnch-dev'
...
feat(clickhousech@m-5285233154): scheduler test cases
See merge request: !24365
# Conflicts:
# src/Interpreters/DistributedStages/BSPScheduler.h
2024-10-09 02:33:34 +00:00
fredwang
974d11611f
fix compile error
2024-10-09 02:29:45 +00:00
fredwang
729fe1b74f
Merge 'bsp-new-schedule' into 'cnch-dev'
...
feat(clickhousech@m-5285231249): segment hash
See merge request: !24168
2024-10-09 02:23:33 +00:00
fredwang
4641303d86
Merge 'fky@cnch-dev@fix@minor-fix' into 'cnch-dev'
...
fix(clickhousech@m-5284220525): defend against empty txn.
See merge request: !24756
2024-10-09 02:23:16 +00:00
fredwang
99d96bcfe0
Merge 'turn_off_enable_push_topn_through_projection-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-5258695035): turn off enable push topn through projection cnch dev
See merge request: !24699
2024-10-09 02:23:00 +00:00
fredwang
8e640bc8fd
Merge 'zema/cnch-dev-fixAlterColumnDefaultTimestamp' into 'cnch-dev'
...
fix(clickhousech@m-4770074806): handle ALTER MODIFY COLUMN DEFAULT CURRENT_TIMESTAMP
See merge request: !24653
2024-10-09 02:22:46 +00:00
fredwang
cdf1e804ac
Merge 'zombie2' into 'cnch-dev'
...
fix(clickhousech@m-100000): Delete zombie codes 2
See merge request: !24694
# Conflicts:
# src/ResourceManagement/WorkerGroupResourceCoordinator.cpp
# src/ResourceManagement/WorkerGroupResourceCoordinator.h
2024-10-09 02:22:30 +00:00
fredwang
9ed214303f
Merge 'fix/fix_string_and_int_cast_in_predicate_pushdown_cnch_dev' into 'cnch-dev'
...
fix(optimizer@m-5285119002): fix PredicatePushdown convert filter to join condition don't check mysql dialect type cnch-dev
See merge request: !24729
2024-10-09 02:21:41 +00:00
fredwang
fd7c6223b2
Merge 'early_prepareQueryScope_cnch_dev' into 'cnch-dev'
...
fix(clickhousech@m-5267042622): 【CP】fix later prepare query_scope cause pref issue
See merge request: !24719
# Conflicts:
# src/Interpreters/ProcessList.cpp
# src/ResourceGroup/IResourceGroup.cpp
# src/ResourceGroup/IResourceGroup.h
2024-10-09 02:21:19 +00:00
fredwang
c929c8941d
Merge 'cherry-pick-8f525236' into 'cnch-dev'
...
fix(clickhousech@m-5251247583): fix if, from_unixtime and comparison with constant string
See merge request: !24506
2024-10-09 02:19:11 +00:00
fredwang
c321068b78
Merge 'fix_lost_data_or_core_cnch' into 'cnch-dev'
...
fix(clickhousech@m-5284168675): 【CP】fix core or lost data when exception in streaming
See merge request: !24714
2024-10-09 02:18:56 +00:00
fredwang
ae683e7ed5
Merge 'fix_core_for_bthread_exception' into 'cnch-dev'
...
fix(clickhousech@m-5284646552): fix bthread_exception infinite recursion
See merge request: !24695
2024-10-09 02:18:30 +00:00
fredwang
0716ad1b4a
Merge 'reader_without_progress' into 'cnch-dev'
...
feat(clickhousech@m-5251303542): use progress_callback instead of progress
See merge request: !24445
2024-10-09 02:16:20 +00:00
fredwang
72ee868729
fix link error about foundationdb
2024-10-09 02:15:10 +00:00
fredwang
f360e2691a
Revert "Revert "Merge 'cp_hms_token' into 'cnch-dev'""
...
This reverts commit 98846a30d3
.
2024-10-09 02:14:48 +00:00
Wei Wang
06d0da9ead
Merge pull request #1887 from ByConity/cp-1008
...
Cp 1008
2024-10-09 10:06:36 +08:00
fredwang
71e4d2e572
fix compile errors
2024-10-08 16:55:43 +08:00
fredwang
838e732ba9
fix link error about foundationdb
2024-10-08 08:29:57 +00:00
fredwang
0a12b6f069
Merge 'cnch_dev_optimize_unique_index_read' into 'cnch-dev'
...
fix(clickhousech@m-5283670005): optimize unique index remote reading
See merge request: !24592
2024-10-08 08:09:35 +00:00
fredwang
5c0ecf5b56
Merge 'inter_cache_unique_table_cnch' into 'cnch-dev'
...
feat(clickhousech@m-4655326085): intermediate result cache support unique table
See merge request: !24459
2024-10-08 08:02:58 +00:00
fredwang
c521bd346b
Merge 'hudi_s3' into 'cnch-dev'
...
feat(clickhousech@m-5284268006): Hudi MOR read support s3
See merge request: !24634
# Conflicts:
# build_bin.sh
# contrib/java-extensions
2024-10-08 08:02:42 +00:00
fredwang
b1010c9263
Merge branch 'cnch_dev_fix_merge_selector_coredump' into 'cnch-dev'
...
fix(clickhousech@m-4619293134): cnch dev fix merge selector coredump
See merge request dp/ClickHouse!24610
2024-10-08 08:02:00 +00:00
fredwang
72a089fac3
Merge branch 'cnch_backup' into 'cnch-dev'
...
feat(clickhousech@m-3000986284): Implement backup and restore in CNCH
See merge request dp/ClickHouse!21472
# Conflicts:
# src/CloudServices/CnchWorkerClient.cpp
# src/Parsers/ASTQueryWithTableAndOutput.cpp
# src/Storages/StorageCnchMergeTree.cpp
# src/Storages/StorageCnchMergeTree.h
2024-10-08 08:00:23 +00:00
fredwang
ef3e50d951
Merge branch 'add_prewhere_blacklist_cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-5267391009): add prewhere blacklist cnch dev
See merge request dp/ClickHouse!24488
2024-10-08 07:58:13 +00:00
fredwang
bf0e5a23fd
Merge 'fix/fix_distributed_aggregation_memory_efficient_in_optimizer_cnch_dev' into 'cnch-dev'
...
fix(optimizer@m-4872241544): fix distributed_aggregation_memory_efficient disabled in optimizer cnch-dev
See merge request: !24403
2024-10-08 07:55:23 +00:00
fredwang
441a0e6f0d
Merge 'cherry-pick-mr-24607-2' into 'cnch-dev'
...
fix(clickhousech@m-5283724588): 【CP】rebuild connection pool when ENOTCONN
See merge request: !24628
2024-10-08 07:55:09 +00:00
fredwang
2d79b4c259
Merge 'cherry-pick-commit-f62066fd' into 'cnch-dev'
...
fix(clickhousech@m-5266990544): share lock between different version of partition_info.
See merge request: !24602
2024-10-08 07:54:53 +00:00
fredwang
bf313feb0c
Merge 'zema/cnch-dev-fixTenantForUPDATE' into 'cnch-dev'
...
fix(clickhousech@m-4770074806): support tenant_id for UPDATE
See merge request: !24608
2024-10-08 07:54:38 +00:00
fredwang
127b109b38
Merge 'fix-hard-limit-query-exception-cnch-cp' into 'cnch-dev'
...
fix(clickhousech@m-4968990605): fix memory tracker and memory hard limit enhance & query exception fix
See merge request: !24149
2024-10-08 07:54:21 +00:00
fredwang
c6460dac8b
Merge 'cp-merge-cancel-cnch' into 'cnch-dev'
...
fix(clickhousech@m-4420692731): more cancel scenario support ref: #61992
See merge request: !24551
2024-10-08 07:54:07 +00:00
fredwang
37fbe0bd33
Merge branch 'fix_bitmap_index_partition_pruning_fail-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-3766286036): fix partition pruning when enable_partition_filter_push_down = 1
See merge request dp/ClickHouse!24292
# Conflicts:
# src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
2024-10-08 07:51:16 +00:00
fredwang
4d4cedcc10
Merge 'cnch_parts_columns_bugfix' into 'cnch-dev'
...
fix(clickhousech@m-5277855559): fix bug of system.cnch_parts_columns getting no parts
See merge request: !24563
2024-10-08 07:45:11 +00:00
fredwang
c34a7c8c19
Merge 'fix_execute_in_subquery_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-5165106472): fix early execute in subquery cnch-dev
See merge request: !24570
2024-10-08 06:58:16 +00:00
fredwang
b656422f39
Merge 'dog-cnch-dev-cps' into 'cnch-dev'
...
fix(optimizer@m-4676551021): cherry-pick statistics fixes
See merge request: !24550
# Conflicts:
# tests/queries/4_cnch_stateless_no_tenant/01721_join_implicit_cast_long.reference
# tests/queries/4_cnch_stateless_no_tenant/01721_join_implicit_cast_long.sql
2024-10-08 06:57:58 +00:00
fredwang
2efc8f6890
Merge 'zombie' into 'cnch-dev'
...
fix(clickhousech@m-100000): Delete zombie codes
See merge request: !24475
# Conflicts:
# src/ResourceManagement/QueryScheduler.cpp
# src/ResourceManagement/QueryScheduler.h
# src/ResourceManagement/ResourceManagerClient.cpp
2024-10-08 06:56:16 +00:00
fredwang
f94a45cd14
Merge 'zema/cnch-dev-avoidGenreateTwoMutationEntries' into 'cnch-dev'
...
fix(clickhousech@m-5266987651): avoid generating two mutation entries in one ALTER query
See merge request: !24509
2024-10-08 06:53:54 +00:00
fredwang
ca427ad4df
Merge branch 'cherry-pick-727f8310-2' into 'cnch-dev'
...
fix(clickhousech@m-5165199050): [cp] fix APIRequestHandler request path
See merge request dp/ClickHouse!24397
2024-10-08 06:53:37 +00:00
fredwang
e18e01a252
Merge branch 'cnch_dev_merge_control_write_amplification' into 'cnch-dev'
...
feat(clickhousech@m-4619293134): cnch dev support expected_parts_num
See merge request dp/ClickHouse!22941
# Conflicts:
# src/Core/Settings.h
# src/Storages/MergeTree/MergeSelector.h
# src/Storages/System/attachSystemTables.cpp
2024-10-08 06:53:19 +00:00
fredwang
8ec2394344
Merge 'hcf_cp_cnch_dev' into 'cnch-dev'
...
fix(clickhousech@m-4671081744): Fix datetime overflow when parse from string (cp cnch-dev)
See merge request: !24470
2024-10-08 06:50:41 +00:00
fredwang
850e28bf6b
Merge branch 'partition_operation' into 'cnch-dev'
...
feat(clickhousech@m-4724180009): enable copy for partition operations
See merge request dp/ClickHouse!24271
2024-10-08 06:50:23 +00:00
fredwang
5243171b2b
Merge branch 'jiashuo_support-query-settings-user' into 'cnch-dev'
...
fix(clickhousech@m-5251537070): support query setting storage_policy
See merge request dp/ClickHouse!24452
2024-10-08 06:50:05 +00:00