b72de90382
Merge branch 'fix_cnch_bitmap_index' into 'cnch-dev'
...
fix(clickhousech@m-4548807740): fix bitmapindex if use reverse reader
See merge request dp/ClickHouse!23698
2024-10-07 07:06:40 +00:00
aff78f1426
Merge 'disable_modify_column_nullable_type' into 'cnch-dev'
...
fix(clickhousech@m-4716963947): disable alter column from Nullable(xxx) -> xxx
See merge request: !23316
2024-10-07 07:06:21 +00:00
2f581538f0
Merge 'enable-bsp-unit-tests' into 'cnch-dev'
...
fix(clickhousech@m-5165673730): enable bsp unit tests again
See merge request: !24246
2024-10-07 07:06:04 +00:00
474741e571
Merge 'fix-ctas-core-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-5036017307): fix CTAS coredump when not supported by optimizer
See merge request: !24255
2024-10-07 07:05:46 +00:00
91dbd15fd6
Merge 'fix/cnch-2-bitmapFromColumn_fix' into 'cnch-dev'
...
fix(clickhousech@m-5165182515): fix deserialization bug in bitmapFromColumn
See merge request: !24212
2024-10-07 07:05:27 +00:00
e8339d5ff5
Merge branch 'jiashuo_fix-bytes-reserved-dev' into 'cnch-dev'
...
fix(clickhousech@m-5036081708): fix reserved bytes failed
See merge request dp/ClickHouse!24122
2024-10-07 07:04:15 +00:00
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
343bd0e645
Merge 'sensitive-revoke' into 'cnch-dev'
...
fix(clickhousech@m-5036085262): fix multiple revokes
See merge request: !24165
2024-10-07 07:02:08 +00:00
944f46e180
Merge 'reinforce_eager_agg_cnchdev' into 'cnch-dev'
...
feat(optimizer@m-4548751529): reinforce push local agg
See merge request: !24164
2024-10-07 07:01:49 +00:00
6916b3bdb0
Merge 'dev_d7fcf966f842d2e100bc111a3946186b70da22e1' into 'cnch-dev'
...
fix(clickhousech@m-4872194523):fix session setting priority
See merge request: !24195
2024-10-07 07:01:34 +00:00
03d118df76
Merge '547/fix_tso_metrics' into 'cnch-dev'
...
fix(clickhousech@m-5158792584): fix tso metrics exporter not work
See merge request: !24189
2024-10-07 07:01:17 +00:00
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
61b45785f7
Merge 'fky@cnch-dev@fix@parts-info-thread-pool' into 'cnch-dev'
...
fix(clickhousech@m-5142630009): turn off shutdown_on_exception for background schedule pool.
See merge request: !24161
2024-10-07 07:00:23 +00:00
3837114275
Merge 'apply_dialect_settings_onlydialect_changes_cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-4970076673): apply dialect settings onlydialect changes cnch dev
See merge request: !24133
# Conflicts:
# tests/queries/4_cnch_stateless/20001_test_bitengine_encode.sql
# tests/queries/4_cnch_stateless/20010_test_dict_cache_update.sql
2024-10-07 07:00:07 +00:00
d48ce8f33c
Merge 'fix-remote' into 'cnch-dev'
...
fix(clickhousech@m-5034997189): fix compatability with clickhouse client after version 23.8
See merge request: !24117
2024-10-07 06:59:19 +00:00
c245cb9467
Merge 'cherry-pick-commit-d4799b04-2' into 'cnch-dev'
...
fix(clickhousech@m-4087770190): try capture bytekv lock timeout when write dict table
See merge request: !24157
# Conflicts:
# src/Transaction/CnchServerTransaction.cpp
2024-10-07 06:59:02 +00:00
a71d0f769d
Merge branch 'cherry-pick-4eefb224' into 'cnch-dev'
...
feat(clickhousech@m-4875289314): add support for on update with current_timestamp dev
See merge request dp/ClickHouse!23996
2024-10-07 06:57:30 +00:00
0361af4426
fix compile errors
2024-10-07 12:16:26 +08:00
c0cea3c109
Merge 'fix_cancel_segment_with_write_cache' into 'cnch-dev'
...
fix(clickhousech@m-4874782005): 【CP】fix cancel by exchange cause early finish for cache
See merge request: !24113
2024-10-07 03:40:48 +00:00
7b5765f727
Merge branch 'send_status_async' into 'cnch-dev'
...
feat(clickhousech@m-5036005622): send status async
See merge request dp/ClickHouse!24094
2024-10-07 03:40:33 +00:00
c74d319d06
Merge branch 'cnch-nestloop-cp-fix' into 'cnch-dev'
...
fix(clickhousech@m-4875276812): fix nestloop join cannot cancel and kill
See merge request dp/ClickHouse!24053
2024-10-07 03:40:17 +00:00
024bf337bd
Merge 'cp_paimon' into 'cnch-dev'
...
fix(clickhousech@m-4670741761): Fix Paimon S3 params compatibility (cherry-pick)
See merge request: !23941
# Conflicts:
# build_bin.sh
# contrib/java-extensions
# src/Storages/HDFS/HDFSConfigManager.cpp
# src/Storages/HDFS/HDFSConfigManager.h
2024-10-07 03:40:01 +00:00
69fa3aa7bf
Merge 'cnch_dev_multi_index' into 'cnch-dev'
...
feat(clickhousech@m-4731444631): Allow using multiple skip index to filter mark ranges in single pass
See merge request: !23907
# Conflicts:
# src/QueryPlan/ReadFromMergeTree.cpp
# src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
2024-10-07 03:37:24 +00:00
b73c4614d0
Merge 'fix_same_alias_in_array_join_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-4872204002): fix same alias in arrayJoin
See merge request: !24098
2024-10-07 03:35:34 +00:00
ac2b382966
Merge 'reduce_memory_usage_for_01603' into 'cnch-dev'
...
fix(clickhousech@m-4968280049): Reduce memory usage for 01603_read_with_backoff_bug.sql
See merge request: !24020
2024-10-07 03:35:19 +00:00
c883682516
Merge 'skip_write_cache' into 'cnch-dev'
...
fix(clickhousech@m-4811829835): 【CP】skip write cache
See merge request: !23730
2024-10-07 03:34:53 +00:00
4f8250690f
Merge 'fix_subquery_in_lambda_check-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-4968956256): fix subquery in lambda check cnch dev
See merge request: !24072
2024-10-07 03:33:48 +00:00
e21acd59ba
Merge 'youzhiyuan_fix_noexcept_cdw' into 'cnch-dev'
...
fix(clickhousech@m-4970037630): fix recv noexcept core
See merge request: !24021
2024-10-07 03:33:28 +00:00
0ac5148f5d
Merge 'youzhiyuan_increase_rpc_timeout' into 'cnch-dev'
...
feat(clickhousech@m-5036063015): increase rpc timeout
See merge request: !24084
2024-10-07 03:33:11 +00:00
fa06d5f763
Merge 'cnch_gwmh_fix_partial_update' into 'cnch-dev'
...
fix(clickhousech@m-3000709386): [cp fix] partial update for cnch unique table
See merge request: !24087
2024-10-07 03:32:55 +00:00
1b04443303
Merge 'support_hybrid_mutation_part_dev' into 'cnch-dev'
...
feat(clickhousech@m-4209967307): [TO CNCHdev] Support hybrid mutation part
See merge request: !24066
2024-10-07 03:32:41 +00:00
98d10cb74c
Merge 'fix_time_zone_dev' into 'cnch-dev'
...
fix(clickhousech@m-4970018225):[To cnch-dev] Session timezone should not put into storage Cache
See merge request: !24068
# Conflicts:
# src/Catalog/Catalog.cpp
2024-10-07 03:32:23 +00:00
8ad1de14d1
Merge branch 'cnch_dev_catalogv2_manifest_cache' into 'cnch-dev'
...
feat(clickhousech@m-4812129501): catalogv2 support manifest cache
See merge request dp/ClickHouse!23568
# Conflicts:
# src/CloudServices/CnchWorkerServiceImpl.cpp
# src/CloudServices/CnchWorkerServiceImpl.h
2024-10-07 03:31:30 +00:00
231939365b
Merge 'print_rpc_name' into 'cnch-dev'
...
fix(clickhousech@m-4968929765): print method name when rpc failed
See merge request: !24060
2024-10-07 03:30:04 +00:00
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
182027b9a8
Merge branch 'topn_filtering_support_more_patterns-cnch-dev' into 'cnch-dev'
...
fix(clickhousech@m-4172565620): topn filtering support more patterns cnch dev
See merge request dp/ClickHouse!24040
2024-10-07 03:28:27 +00:00
200f91a6aa
Merge 'virtual-logger-cnch-dev' into 'cnch-dev'
...
perf(clickhousech@m-4968955020): VirtualLogger
See merge request: !24002
# Conflicts:
# programs/udf/manager/Init.h
# programs/udf/srvstub/UDFImpl.h
# src/Analyzers/QueryRewriter.cpp
# src/CloudServices/CnchWorkerServiceImpl.cpp
# src/CloudServices/CnchWorkerServiceImpl.h
# src/Common/AdditionalServices.cpp
# src/Common/CGroup/CGroupManagerFactory.cpp
# src/Common/Exception.h
# src/Common/Trace/DirectSystemLogExporter.cpp
# src/Common/Trace/Telemetry.cpp
# src/DaemonManager/BGJobStatusInCatalog.h
# src/DataStreams/ReadDictInputStream.cpp
# src/DataStreams/ReadDictInputStream.h
# src/DataStreams/RemoteQueryExecutor.cpp
# src/DataStreams/RemoteQueryExecutor.h
# src/DataStreams/UnionBlockInputStream.h
# src/Disks/DiskByteS3.cpp
# src/Functions/FunctionFactory.cpp
# src/Functions/FunctionsBitEngineHelper.h
# src/Functions/IP2GeoUDF.h
# src/Functions/UserDefined/UserDefinedExternalFunctionFactory.cpp
# src/Functions/UserDefined/UserDefinedExternalFunctionFactory.h
# src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp
# src/Functions/UserDefined/UserDefinedSQLFunctionFactory.h
# src/Functions/UserDefined/UserDefinedSQLObjectsLoader.cpp
# src/Functions/UserDefined/UserDefinedSQLObjectsLoader.h
# src/IO/CloudFS/CloudFS.cpp
# src/IO/CloudFS/CloudFS.h
# src/IO/CloudFS/ReadBufferFromCFS.h
# src/IO/CloudFS/WriteBufferFromCFS.cpp
# src/IO/CloudFS/WriteBufferFromCFS.h
# src/Interpreters/ANNHelper.h
# src/Interpreters/DistributedStages/PlanSegmentManagerRpcService.h
# src/Interpreters/InterpreterCreateFunctionQuery.h
# src/Interpreters/InterpreterDropFunctionQuery.h
# src/Interpreters/InterpreterSelectQuery.cpp
# src/Interpreters/TreeRewriter.cpp
# src/MergeTreeCommon/GlobalGCManager.h
# src/Optimizer/Rewriter/BitEngineUseLocalDictionary.cpp
# src/Optimizer/Rewriter/EliminateJoinByForeignKey.cpp
# src/Storages/BitEngine/BitEngineDictionaryManager.cpp
# src/Storages/BitEngine/BitEngineDictionaryManager.h
# src/Storages/BitEngine/BitEngineHelper.cpp
# src/Storages/BitEngineEncodePartitionHelper.cpp
# src/Storages/HDFS/HDFSAuth.cpp
# src/Storages/HDFS/HDFSConfigManager.h
# src/Storages/Hive/HiveSchemaConverter.h
# src/Storages/Kafka/KafkaCommon.cpp
# src/Storages/MemoryDict.h
# src/Storages/MemoryDictCache.h
# src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
# src/Storages/MergeTree/MergeTreeDataPartWriterCompact.h
# src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
# src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
# src/Storages/MergeTree/MergeTreeIndexDiskANN.cpp
# src/Storages/MergeTree/MergeTreeIndexDiskANN.h
# src/Storages/MergeTree/MergeTreeIndexFaiss.cpp
# src/Storages/MergeTree/MergeTreeIndexFaiss.h
# src/Storages/MergeTree/MergeTreeIndexHNSW.cpp
# src/Storages/MergeTree/MergeTreeIndexHNSW.h
# src/Storages/MergeTree/MergeTreeSelectWithSearchProcessor.cpp
# src/Storages/MergeTree/MergeTreeSelectWithSearchProcessor.h
# src/Storages/MergeTree/MergeTreeSequentialSource.cpp
# src/Storages/MergeTree/MergeTreeSequentialSource.h
# src/Storages/MergeTree/MergeTreeVectorSearchExecutor.cpp
# src/Storages/MergeTree/MergeTreeVectorSearchExecutor.h
# src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
# src/Storages/MergeTree/S3PartsAttachMeta.h
# src/Storages/MergeTree/VectorIndex/ANNWhereCondition.cpp
# src/Storages/MergeTree/VectorIndex/VectorIndexCache.h
# src/Storages/StorageCnchMergeTree.cpp
2024-10-07 03:26:22 +00:00
97cc7fcbef
Merge 'fix_optimizer_join_on_condition_cnchdev' into 'cnch-dev'
...
fix(optimizer@m-4874825265): Do not check function type in join condition when using optimizer cnch-dev
See merge request: !23965
# Conflicts:
# src/Interpreters/TreeRewriter.cpp
2024-10-07 03:00:23 +00:00
61c3726ecc
Merge 'perf-opt-clean-resource-cnch-dev' into 'cnch-dev'
...
perf(clickhousech@m-4874734124): prune nodes when clean resource
See merge request: !23888
# Conflicts:
# src/CloudServices/CnchServerResource.cpp
2024-10-07 02:58:49 +00:00
bcab4828be
Merge branch 'jiashuo_fix-gc-disk-name-not-found' into 'cnch-dev'
...
fix(clickhousech@m-4872376514): undobuffer clean can't find history disk name should throw exception
See merge request dp/ClickHouse!23809
2024-10-07 02:52:36 +00:00
70708611d8
Merge branch 'jiashuo_fix-gc-disk-name-not-found' into 'cnch-dev'
...
fix(clickhousech@m-4872376514): undobuffer clean can't find history disk name
See merge request dp/ClickHouse!23792
2024-10-07 02:52:09 +00:00
32c7737244
Merge pull request #1884 from ByConity/cp-1002
...
Cp 1002
2024-10-04 17:59:50 +08:00
a173b9813d
fix ci due to wrong conflict resolution
2024-10-04 16:34:25 +08:00
599d13a51d
fix ci
2024-10-04 14:55:14 +08:00
57c281cdb0
remove paimon java dependencies
2024-10-03 15:46:03 +08:00
9d4862c367
fix compile errors
2024-10-03 15:01:08 +08:00
aaf9b70ae5
Merge 'fky@cnch-dev@fix@txn-clean' into 'cnch-dev'
...
fix(clickhousech@m-4770366732): resolve live lock in txn cleaner w/ multi table.
See merge request: !23635
# Conflicts:
# src/Catalog/Catalog.h
# src/CloudServices/CnchServerClient.cpp
# src/CloudServices/CnchServerClient.h
# src/CloudServices/CnchServerServiceImpl.cpp
# src/Protos/cnch_server_rpc.proto
# src/Transaction/TransactionCleaner.h
2024-10-03 12:30:05 +08:00
cd4b016b04
Merge branch 'cherry-pick-1ba8c804-3' into 'cnch-dev'
...
fix(clickhousech@m-4789434239): set correct relative path for UndoResourceType::Part
See merge request dp/ClickHouse!23599
2024-10-02 16:46:42 +08:00
de9ea37007
Merge 'fky@cnch-dev@aggressive-gc' into 'cnch-dev'
...
fix(clickhousech@m-4691924501): more aggressive search that only regress after a whole round.
See merge request: !23069
# Conflicts:
# src/Storages/MergeTree/MergeTreeSettings.h
2024-10-02 16:45:30 +08:00
68ac11de08
Merge branch 'cnch_bugfix_bigmem_when_max_joined_block_rows' into 'cnch-dev'
...
fix(clickhousech@m-4968928566): cnch_bugfix_bigmem_when_max_joined_block_rows
See merge request dp/ClickHouse!23978
2024-10-02 06:25:25 +00:00
fredwang