Commit Graph

3 Commits

Author SHA1 Message Date
fredwang 3e617d334f Merge 'support_timezone_2.2' into 'cnch-2.2'
feat(clickhousech@m-4692103199): [TO CNCH-2.2] Support session level timezone

See merge request: !23614
# Conflicts:
#	.gitmodules
#	contrib/bytehouse-gis
#	programs/client/Client.cpp
#	src/Core/Settings.h
#	src/Processors/Exchange/DataTrans/Brpc/BrpcRemoteBroadcastReceiver.cpp
2024-08-05 08:43:53 +00:00
Dao b60328f8a9 Merge branch 'hybrid_cache' into 'cnch-ce-merge'
feat(clickhousech@m-14941343): nvm_cache impl and integrate with mark_cache & uncompressed_cache

See merge request dp/ClickHouse!16992
# Conflicts:
#	src/Common/ProfileEvents.cpp
2023-11-21 17:37:37 +08:00
Maksim Kita a276b6d426 Merge ext into common 2021-06-16 23:28:41 +03:00