1594e184f5
Merge branch 'zichun_add_nexusfs_p2' into 'cnch-dev'
...
feat(clickhousech@m-3000508658): add BufferManager and InodeManager to NexusFS
See merge request dp/ClickHouse!24109
# Conflicts:
# .codebase/pipelines/ci.yaml
# src/Disks/CloudFS/DiskCloudFS.cpp
# src/Disks/DiskByteS3.cpp
# src/Disks/HDFS/DiskByteHDFS.cpp
# tests/queries/4_cnch_stateless/00474_readonly_settings.sh
2024-10-11 04:38:22 +00:00
1e42b7e5dd
Merge 'fix_read_rowcount_property_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-5306761016): fix ReadStorageRowCount property cnch-dev
See merge request: !25101
2024-10-11 04:32:58 +00:00
e2d0e31357
Merge 'fix_cnch_bitmap_index' into 'cnch-dev'
...
fix(clickhousech@m-5289086041): fix arraySetCheck with empty array
See merge request: !25096
2024-10-11 04:32:43 +00:00
1bebd94c09
Merge 'fix-callid-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-5311374540): fix worker resource not found when catalog_enable_multiple_threads = 1
See merge request: !25048
# Conflicts:
# src/CloudServices/CnchServerResource.cpp
2024-10-11 04:31:24 +00:00
0fc930fdde
Merge branch 'not_set_inline_expression_for_external_table-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-5298285524): not set inline expression for external table cnch dev
See merge request dp/ClickHouse!24998
2024-10-11 04:29:36 +00:00
4b3ebc8831
Merge 'fix_plan_cache_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-5288941504): fix plan cache cnch-dev
See merge request: !24966
# Conflicts:
# src/Optimizer/QueryUseOptimizerChecker.cpp
2024-10-11 04:29:20 +00:00
fadc9fdf38
Merge 'fix_least_greatest_for_short_circuit' into 'cnch-dev'
...
fix(clickhousech@m-5311363515): fix least/greatest for short circuit
See merge request: !25037
2024-10-11 04:27:25 +00:00
3fb06399ee
Merge 'youzhiyuan_change_worker_user' into 'cnch-dev'
...
feat(clickhousech@m-5297946141): change remote worker user to internal communication user
See merge request: !25029
# Conflicts:
# src/Core/Settings.h
2024-10-11 04:27:06 +00:00
48482a1c13
Merge branch 'jiashuo_support-s3-clear-on-server' into 'cnch-dev'
...
fix(clickhousech@m-5285018386): support s3 engine insert overwrite SQL
See merge request dp/ClickHouse!24784
2024-10-11 04:20:34 +00:00
2019e53b4b
Merge 'fix/mv_core_cnch_dev' into 'cnch-dev'
...
fix(optimizer@m-5285163712): fix core dump and exceptions in materialized view rewrite for join and union rewriting cnch-dev
See merge request: !24906
# Conflicts:
# src/Optimizer/Rewriter/MaterializedViewRewriter.cpp
2024-10-11 04:20:18 +00:00
afdfee06b0
Merge 'partial_update_optimize4cnch-dev' into 'cnch-dev'
...
perf(clickhousech@m-4670802048): optimize partial update perf and impl ETL optimize 2.0
See merge request: !24288
# Conflicts:
# src/CloudServices/CnchDedupHelper.cpp
# src/MergeTreeCommon/MergeTreeDataDeduper.cpp
2024-10-09 08:18:58 +00:00
e51ea5104a
Merge 'zfw/cnch-dev-99' into 'cnch-dev'
...
feat(clickhousech@m-4724032097): remove redundant cases
See merge request: !24948
# Conflicts:
# .codebase/pipelines/ci.yaml
# tests/queries/0_ce_stateless/00001_select_1.sql
# tests/queries/4_cnch_stateless/01882_bubble_pk_in_set.reference
2024-10-09 08:17:48 +00:00
d872e836fe
Merge branch 'support_s3_parallel_write_dev' into 'cnch-dev'
...
feat(clickhousech@m-5285222427): [TO cnch-dev] Support S3 upload part concurrently
See merge request dp/ClickHouse!24858
# Conflicts:
# src/Core/Settings.h
# src/Disks/DiskByteS3.cpp
# src/Optimizer/QueryUseOptimizerChecker.cpp
# src/Server/TCPHandler.cpp
2024-10-09 08:09:03 +00:00
5852b2a829
Merge 'log_explain_analyze_cnchdev' into 'cnch-dev'
...
feat(optimizer@m-4968286642): log explain analyze cnch-dev
See merge request: !24893
# Conflicts:
# src/Interpreters/executeQuery.cpp
2024-10-09 07:13:23 +00:00
f8714a51a4
Merge 'implicit_arg_type_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-5285078797): fix enable_implicit_arg_type_convert cnch-dev
See merge request: !24898
2024-10-09 07:12:36 +00:00
a9484473dd
Merge branch 'not_evaluate_getMapKeys_in_optimizer-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-5285221241): not evaluate getMapKeys in optimizer cnch dev
See merge request dp/ClickHouse!24852
2024-10-09 07:10:00 +00:00
789a1794e0
Merge 'fix_partial_distinct_cnch_dev' into 'cnch-dev'
...
fix(clickhousech@m-4831453832): push topn distinct cnch dev
See merge request: !24811
2024-10-09 03:31:06 +00:00
a7f9d0bebc
Merge 'fix/read_storage_row_count_node_plan_segment_splitter_cnch_dev' into 'cnch-dev'
...
fix(optimizer@m-5285192359): fix ReadStorageRowCountNode return wrong shard num in PlanSegmentSplitter
See merge request: !24787
2024-10-09 03:30:52 +00:00
8c7aab37a4
Merge 'sst_gin_dict' into 'cnch-dev'
...
feat(clickhousech@m-4812088098): Support use sstable as dict
See merge request: !24472
# Conflicts:
# src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
# src/Storages/examples/CMakeLists.txt
2024-10-09 03:30:32 +00:00
ced6ed0efc
Merge branch 'fix-mysql-insert-core' into 'cnch-dev'
...
feat(clickhousech@m-4345257817): return affected rows to mysql client
See merge request dp/ClickHouse!23893
# Conflicts:
2024-10-09 03:26:45 +00:00
65ec51131d
Merge 'fix_default_null_cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-5285128088): Fix non nullable type with deafult null cnch-dev
See merge request: !24802
2024-10-09 03:24:27 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
005475b739
Merge 'dog-cnch-dev-fix-left-any-join' into 'cnch-dev'
...
fix(optimizer@m-5266967197): ban left any join to inner
See merge request: !24508
2024-10-08 06:49:40 +00:00
57e1dc4a70
Merge 'fix_expand_distinct_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-5158780031): MultipleDistinctAggregationToExpandAggregate process normal agg with multiple arguments cnch-dev
See merge request: !24404
# Conflicts:
# src/Interpreters/executeQuery.cpp
2024-10-08 02:17:56 +00:00
874ef7aa5e
Merge 'fix_optimize_read_in_order_with_enable_sorting_property_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-5260420737): fix sorting_property when optimizer_in_order = 0
See merge request: !24478
2024-10-08 02:16:25 +00:00
c41b238490
Merge branch 'cherry-pick-eab18ceb-4' into 'cnch-dev'
...
fix(clickhousech@m-5251516614): Fix toDatetime64ornull with Time Type cnch dev
See merge request dp/ClickHouse!24439
2024-10-08 02:15:34 +00:00
50d4589991
Merge 'optimizer_fully_support_subquery' into 'cnch-dev'
...
feat(clickhousech@m-5165217262): refine subquery
See merge request: !24343
# Conflicts:
# src/Interpreters/InterpreterCreateQuery.cpp
# src/Statistics/SubqueryHelper.cpp
2024-10-08 02:05:42 +00:00
cb6e38545a
Merge branch 'fix-profile' into 'cnch-dev'
...
fix(clickhousech@m-4970049069): fix query with profile
See merge request dp/ClickHouse!24437
2024-10-08 02:00:13 +00:00
0da5ba8cf9
Merge 'add_map_check_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-4281348766): optimizer add allow_map_access_without_key check cnch-dev
See merge request: !24370
2024-10-08 01:59:57 +00:00
410eb53016
Merge 'remove_use_test' into 'cnch-dev'
...
feat(clickhousech@m-5165832635): remove use test avoid conflict
See merge request: !24379
# Conflicts:
# tests/queries/4_cnch_stateless/11000_2_udf_check_format.sql
# tests/queries/4_cnch_stateless/11000_alias_and_recursive_udf.sql
# tests/queries/4_cnch_stateless/11000_lambda_udf_1.sql
# tests/queries/4_cnch_stateless/11000_lambda_udf_2.sql
# tests/queries/4_cnch_stateless/11000_python_udf_10_expression.sql
# tests/queries/4_cnch_stateless/11000_python_udf_11_limit_by.sql
# tests/queries/4_cnch_stateless/11000_python_udf_12_join_distinct.sql
# tests/queries/4_cnch_stateless/11000_python_udf_13_check_update.sql
# tests/queries/4_cnch_stateless/11000_python_udf_4.sql
# tests/queries/4_cnch_stateless/11000_python_udf_5_uint.sql
# tests/queries/4_cnch_stateless/11000_python_udf_6_int.sql
# tests/queries/4_cnch_stateless/11000_python_udf_7_float.sql
# tests/queries/4_cnch_stateless/11000_python_udf_8_datetime.sql
# tests/queries/4_cnch_stateless/11000_python_udf_9_string.sql
# tests/queries/4_cnch_stateless/11000_show_udf.sql
# tests/queries/4_cnch_stateless/11000_udf_fixedString.sql
# tests/queries/4_cnch_stateless/11000_udf_nullable.sql
# tests/queries/4_cnch_stateless/20000_test_bitengine_cluster_by_clause.sql
# tests/queries/4_cnch_stateless/20001_test_bitengine_buckets_encode.sql
# tests/queries/4_cnch_stateless/20002_test_bitengine_buckets_encode_2.sql
# tests/queries/4_cnch_stateless/20003_test_bitengine_buckets_encode_3.sql
# tests/queries/4_cnch_stateless/20004_bitengine_constraint.sql
# tests/queries/4_cnch_stateless/20005_bitengine_insert_select.sql
# tests/queries/4_cnch_stateless/20007_test_bitmap_or.sql
# tests/queries/4_cnch_stateless/20008_insert_bitengine_with_multiple_splits.sql
# tests/queries/4_cnch_stateless/20009_test_encode_decode_performance.sql
# tests/queries/4_cnch_stateless/20010_test_dict_cache_update.sql
# tests/queries/4_cnch_stateless/20011_parallel_load_dict_and_cache.sql
# tests/queries/4_cnch_stateless/20012_test_bitengine_preattach_partition.sql
# tests/queries/4_cnch_stateless/20013_test_drop_memoy_dict_cache.sql
# tests/queries/4_cnch_stateless/40022_topn_filtering_opt.sql
# tests/queries/4_cnch_stateless/66000_gis_type.sql
# tests/queries/4_cnch_stateless/udf/11000_alias_and_recursive_udf.sql
# tests/queries/4_cnch_stateless/udf/11000_lambda_udf_1.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_10_expression.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_11_limit_by.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_12_join_distinct.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_13_check_update.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_4.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_5_uint.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_6_int.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_7_float.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_8_datetime.sql
# tests/queries/4_cnch_stateless/udf/11000_python_udf_9_string.sql
# tests/queries/4_cnch_stateless/udf/11000_udf_nullable.sql
2024-10-08 01:58:29 +00:00
4a8b540139
Merge 'ctas_opt' into 'cnch-dev'
...
fix(clickhousech@m-4789676157): enable optimizer in ctas by default
See merge request: !23563
2024-10-08 01:14:51 +00:00
fredwang