Commit Graph

26 Commits

Author SHA1 Message Date
fredwang d44e8fc44b Merge '547/cnch_metrics_ci' into 'cnch-dev'
ci(clickhousech@m-4770399785): add ci metric case

See merge request: !23853
# Conflicts:
#	docker/docker-compose/byconity-simple-cluster/worker.yml
2024-10-02 02:49:01 +00:00
fredwang e5d4fe7297 Merge branch 'jiashuo_add-all-preload-index-dev' into 'cnch-dev'
fix(clickhousech@m-4770084743): support multi index preload

See merge request dp/ClickHouse!23524
# Conflicts:
#	docker/docker-compose/byconity-simple-cluster/worker.yml
#	src/Interpreters/PartLog.h
#	src/Storages/DiskCache/MetaFileDiskCacheSegment.cpp
#	src/Storages/MergeTree/MergeTreeDataPartCNCH.cpp
2024-09-27 07:43:48 +00:00
fredwang 6f2ca30ca5 Merge 'fky@cnch-dev@fix@tr-gc-with-sd-local' into 'cnch-dev'
fix(clickhousech@m-5165139004): sd local mode will lead to falsely deleting TR.

See merge request: !24184
2024-09-11 07:41:20 +00:00
fredwang eb47ebbbe6 Merge branch 'feat-sensitive-permissions-dev' into 'cnch-dev'
feat(clickhousech@m-17322645): RBAC Sensitive Permissions

See merge request dp/ClickHouse!20380
# Conflicts:
#	programs/server/config.xml
#	src/Catalog/MetastoreProxy.h
2024-07-11 08:55:11 +00:00
fredwang 3761483b46 Merge branch 'fix-security' into 'cnch-dev'
fix(clickhousech@m-3878496073): move restrict tenant users to use certain functions out to become a cluster config

See merge request dp/ClickHouse!21508
# Conflicts:
#	docker/CI/multi-servers/server.yml
#	docker/CI/multi-servers/worker.yml
#	docker/CI/multi-workers/server.yml
#	docker/CI/s3/server.yml
#	docker/CI/s3/worker.yml
#	docker/docker-compose/byconity-multiworkers-cluster/server.yml
#	docker/docker-compose/byconity-simple-cluster/server.yml
#	docker/docker-compose/byconity-simple-cluster/worker.yml
#	programs/server/Server.cpp
2024-07-11 08:36:36 +00:00
skyoct 07c4e7f264 fix docker-compose docs 2024-06-27 12:14:30 +00:00
fanqi1909 b6e69fbf70 Merge 'cnch_dev_unique_table_support_system_log' into 'cnch-dev'
feat(clickhousech@m-3047891595): unique table support system log

See merge request: https://code.byted.org/dp/ClickHouse/merge_requests/20683
 Conflicts:
	.codebase/ci_scripts/cnch_config/1_single_server/config/server.xml
	.codebase/ci_scripts/cnch_config/1_single_server/config/worker0.xml
	.codebase/ci_scripts/cnch_config/1_single_server/config/worker1.xml
	.codebase/ci_scripts/cnch_config/2_backward_compability/config/server.xml
	.codebase/ci_scripts/cnch_config/2_backward_compability/config/worker1.xml
	.codebase/ci_scripts/cnch_config/3_multiple_server/config/server0.xml
	.codebase/ci_scripts/cnch_config/3_multiple_server/config/server1.xml
	.codebase/ci_scripts/cnch_config/3_multiple_server/config/worker0.xml
	.codebase/ci_scripts/cnch_config/3_multiple_server/config/worker1.xml
	deploy/template/byconity-worker.xml
	docker/CI/multi-servers/server.yml
	docker/CI/s3/server.yml
	docker/docker-compose/byconity-multiworkers-cluster/server.yml
	docker/docker-compose/byconity-simple-cluster/server.yml
	docker/docker-compose/byconity-simple-cluster/worker.yml
	programs/server/cnch-server.xml
2024-05-13 17:29:50 +08:00
fanqi1909 3c04794769 Revert "Merge branch 'zy_system_disable' into 'cnch-dev'"
This reverts commit f8da9209e7.
2024-05-06 17:30:20 +08:00
fanqi1909 da4d92aea6 Merge branch 'cch-cnch_dev-ingest-with-bucket' into 'cnch-dev'
feat(clickhousech@m-3348298112): Ingest with bucket

See merge request dp/ClickHouse!20774
# Conflicts:
#	docker/CI/docker-compose-s3.yml
#	docker/CI/docker-compose-single.yml
#	docker/CI/docker-compose.yml
#	docker/CI/multi-servers/cnch-config.yml
#	docker/CI/multi-servers/daemon-manager.yml
#	docker/CI/multi-servers/server.yml
#	docker/CI/multi-servers/tso.yml
#	docker/CI/multi-servers/worker.yml
#	docker/CI/s3/daemon-manager.yml
#	docker/CI/s3/docker-compose-patch.yml
#	docker/CI/s3/server.yml
#	docker/CI/s3/tso.yml
#	docker/CI/s3/worker.yml
#	docker/CI/single-server/cnch-config.yml
#	docker/CI/single-server/daemon-manager.yml
#	docker/CI/single-server/tso.yml
#	docker/docker-compose/byconity-multi-cluster/resource-manager.yml
#	docker/docker-compose/byconity-multiworkers-cluster/resource-manager.yml
#	docker/docker-compose/byconity-simple-cluster/resource-manager.yml
#	docker/docker-compose/byconity-simple-cluster/server.yml
#	docker/docker-compose/byconity-simple-cluster/worker.yml
#	src/Storages/IngestColumnCnch/IngestColumnCnch.cpp
2024-04-26 17:35:32 +08:00
Dao f8da9209e7 Merge branch 'zy_system_disable' into 'cnch-dev'
feat(clickhousech@m-3265377520): do not show information for system tables without rbac check

See merge request dp/ClickHouse!20474
# Conflicts:
#	.codebase/ci_scripts/cnch_config/1_single_server/config/server.xml
#	.codebase/ci_scripts/cnch_config/3_multiple_server/config/server0.xml
#	.codebase/ci_scripts/cnch_config/3_multiple_server/config/server1.xml
#	deploy/template/byconity-server.xml
#	docker/CI/multi-servers/server.yml
#	docker/CI/multi-workers/server.yml
#	docker/CI/s3/server.yml
#	docker/CI/s3/worker.yml
#	docker/docker-compose/byconity-multiworkers-cluster/server.yml
#	docker/docker-compose/byconity-simple-cluster/server.yml
#	docker/docker-compose/byconity-simple-cluster/worker.yml
#	src/Storages/System/StorageSystemExternalTables.cpp
2024-04-02 10:35:36 +08:00
Dao b71032b25c Merge branch 'fky@cnch-dev@feat@additional-services' into 'cnch-dev'
feat(clickhousech@m-3011528179): support additional-services for fulltext search.

See merge request dp/ClickHouse!19761
# Conflicts:
#	docker/CI/multi-servers/worker.yml
#	docker/CI/s3/worker.yml
#	docker/docker-compose/byconity-multiworkers-cluster/server.yml
#	docker/docker-compose/byconity-simple-cluster/worker.yml
2024-03-13 15:32:58 +08:00
Dao 230ab989d6 fix: fix docker compose 2024-03-11 17:19:50 +08:00
Dao 4e18b43578 fix: fix docker compose 2024-02-21 16:24:05 +08:00
Dao 4bfea6e863 Merge branch 'cnch-mysql-sync' into 'cnch-dev'
feat(clickhousech@m-3000223500): MySQL BI compatibility improvements

See merge request dp/ClickHouse!18833
# Conflicts:
#	docker/CI/s3/server.yml
#	docker/docker-compose/byconity-simple-cluster/server.yml
#	docker/docker-compose/byconity-simple-cluster/worker.yml
#	programs/server/config.xml
#	src/Common/ErrorCodes.cpp
#	src/Server/MySQLHandler.cpp
2024-01-31 20:08:17 +08:00
Dao 040aa53196 Merge branch 'jiacheng.sun-add-information-schema-cnch' into 'cnch-dev'
feat(clickhousech@m-3000223371): add information schema

See merge request dp/ClickHouse!18538
2024-01-30 11:08:54 +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
skyoct cc4285fd1d fix docker-compose daemon manage config error 2023-12-25 19:16:21 +08:00
Dao Minh Thuc 641b91ff7f
fix: RBAC Update (#916)
* Merge branch 'feat-rbac' into 'cnch-ce-merge'

feat(clickhousech@m-13555440): RBAC

See merge request dp/ClickHouse!14213

---------

Co-authored-by: Vivek <67144643+vivek-debug@users.noreply.github.com>
Co-authored-by: vivek-debug <vivek.lakshmanan.v@bytedance.com>
2023-12-05 06:43:24 +00:00
shaoqian.zhang 1ee0d6c73d fix: docker-compose daemon-manager not found error 2023-11-15 15:13:53 +08:00
Dao 2318eaed2a Merge branch 'enable_tenanted_systemdb' into 'cnch-ce-merge'
fix(clickhousech@m-10516076): enable visit tenanted system database

See merge request dp/ClickHouse!16593
# Conflicts:
#	programs/server/Server.cpp
2023-10-23 19:56:32 +08:00
chen 9b3d46fcca
Update .env.tpl (#781) 2023-10-17 02:02:23 +00:00
yuan.zhu 294e9331a2 adjust leader election configure into cnch_config 2023-10-11 17:45:52 +08:00
yuan.zhu be444054c3 docker compose multi-nodes configure template 2023-10-11 17:45:52 +08:00
rmq 327658832e support MOR table in external catalog 2023-09-20 13:35:29 +08:00
张斯琪 e89fe27b36 external catalog 2023-09-14 18:01:08 +08:00
clarkcaoliu 51849822ca
docker dev image and docker-compose for development (#680)
* update dockerfile

* update docker-compose

* integrate with hive

* add build instructions

* do not use root user
2023-09-14 17:51:01 +08:00