Skip to content

Commit 75feed1

Browse files
committed
Merge main branch into add_laion5b branch to fix spell check issue unrelated to this PR
2 parents b4b34eb + 0cb51a4 commit 75feed1

File tree

10 files changed

+673
-13
lines changed

10 files changed

+673
-13
lines changed

docs/cloud/manage/billing/marketplace/azure-marketplace-payg.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ You will receive an email like the one below with details on configuring your ac
114114

115115
<br />
116116

117-
12. You will be redirected to the ClickHouse Cloud sign up or sign in page. You can either sign up using a new account or sign in using an existing account. Once you are signed in, a new organization will be created that is ready to be used and billed via the Azure Marketplace.
117+
12. You will be redirected to the ClickHouse Cloud sign up or sign in page. Once you redirect to ClickHouse Cloud, you can either login with an existing account, or register with a new account. This step is very important so we can bind your ClickHouse Cloud organization to the Azure Marketplace billing.
118118

119-
13. You will need to answer a few questions - address and company details - before you can proceed.
119+
13. Note that if you are a new user, you will also need to provide some basic information about your business. See the screenshots below.
120120

121121
<br />
122122

@@ -128,7 +128,7 @@ You will receive an email like the one below with details on configuring your ac
128128

129129
<br />
130130

131-
14. Once you hit **Complete sign up**, you will be taken to your organization within ClickHouse Cloud where you can view the billing screen to ensure you are being billed via the Azure Marketplace and can create services.
131+
Once you hit **Complete sign up**, you will be taken to your organization within ClickHouse Cloud where you can view the billing screen to ensure you are being billed via the Azure Marketplace and can create services.
132132

133133
<br />
134134

@@ -144,4 +144,4 @@ You will receive an email like the one below with details on configuring your ac
144144

145145
<br />
146146

147-
15. If you run into any issues, please do not hesitate to contact [our support team](https://clickhouse.com/support/program).
147+
14. If you run into any issues, please do not hesitate to contact [our support team](https://clickhouse.com/support/program).

docs/cloud/security/cmek.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Enhanced encryption is currently available in AWS and GCP services. Azure is com
1919

2020
## Transparent Data Encryption (TDE) {#transparent-data-encryption-tde}
2121

22-
TDE must be enabled on service creation. Existing services cannot be encrypted after creation.
22+
TDE must be enabled on service creation. Existing services cannot be encrypted after creation. Once TDE is enabled, it cannot be disabled. All data in the service will remain encrypted. If you want to disable TDE after it has been enabled, you must create a new service and migrate your data there.
2323

2424
1. Select `Create new service`
2525
2. Name the service

docs/guides/examples/aggregate_function_combinators/sumForEach.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
slug: '/examples/aggregate-function-combinators/sumForEach'
33
title: 'sumForEach'
4-
description: 'Example of using the sumArray combinator'
5-
keywords: ['sum', 'array', 'combinator', 'examples', 'sumArray']
6-
sidebar_label: 'sumArray'
4+
description: 'Example of using the sumForEach aggregate function'
5+
keywords: ['sum', 'ForEach', 'combinator', 'examples', 'sumForEach']
6+
sidebar_label: 'sumForEach'
77
---
88

9-
# sumArray {#sumforeach}
9+
# sumForEach {#sumforeach}
1010

1111
## Description {#description}
1212

@@ -45,4 +45,4 @@ ORDER BY hour_of_day;
4545

4646
## See also {#see-also}
4747
- [`sum`](/sql-reference/aggregate-functions/reference/sum)
48-
- [`ForEach combinator`](/sql-reference/aggregate-functions/combinators#-foreach)
48+
- [`ForEach` combinator](/sql-reference/aggregate-functions/combinators#-foreach)

docs/integrations/data-ingestion/apache-spark/spark-native-connector.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ If you want to avoid copying the JAR files to your Spark client node, you can us
137137

138138
```text
139139
--repositories https://{maven-central-mirror or private-nexus-repo} \
140-
--packages com.clickhouse.spark:clickhouse-spark-runtime-{{ spark_binary_version }}_{{ scala_binary_version }}:{{ stable_version }},com.clickhouse:clickhouse-jdbc:{{ clickhouse_jdbc_version }}:all
140+
--packages com.clickhouse.spark:clickhouse-spark-runtime-{{ spark_binary_version }}_{{ scala_binary_version }}:{{ stable_version }},com.clickhouse:clickhouse-jdbc:{{ clickhouse_jdbc_version }}
141141
```
142142

143143
Note: For SQL-only use cases, [Apache Kyuubi](https://github.com/apache/kyuubi) is recommended
@@ -476,7 +476,7 @@ ClickHouse.
476476
Spark SQL allows you to write queries exactly as you would in ClickHouse,
477477
so you can directly execute commands such as CREATE TABLE, TRUNCATE, and more - without modification, for instance:
478478

479-
note:::
479+
:::note
480480
When using Spark SQL, only one statement can be executed at a time.
481481
:::
482482

docs/integrations/index.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ We are actively compiling this list of ClickHouse integrations below, so it's no
246246
|Redis|<Redissvg alt="Redis logo" style={{width: '3rem', 'height': '3rem'}}/>|Data ingestion|Allows ClickHouse to use [Redis](https://redis.io/) as a dictionary source.|[Documentation](/sql-reference/dictionaries/index.md#redis)|
247247
|Redpanda|<Image img={redpanda} alt="Redpanda logo" size="logo"/>|Data ingestion|Redpanda is the streaming data platform for developers. It's API-compatible with Apache Kafka, but 10x faster, much easier to use, and more cost effective|[Blog](https://redpanda.com/blog/real-time-olap-database-clickhouse-redpanda)|
248248
|REST Catalog||Data ingestion|Integration with REST Catalog specification for Iceberg tables, supporting multiple catalog providers including Tabular.io.|[Documentation](/use-cases/data-lake/rest-catalog)|
249+
|Lakekeeper||Data ingestion|Integration with Lakekeeper, an open-source REST catalog implementation for Apache Iceberg with multi-tenant support.|[Documentation](/use-cases/data-lake/lakekeeper-catalog)|
250+
|Nessie||Data ingestion|Integration with Nessie, an open-source transactional catalog for data lakes with Git-like data version control.|[Documentation](/use-cases/data-lake/nessie-catalog)|
249251
|Rust|<Image img={rust} size="logo" alt="Rust logo"/>|Language client|A typed client for ClickHouse|[Documentation](/integrations/language-clients/rust.md)|
250252
|SQLite|<Sqlitesvg alt="Sqlite logo" style={{width: '3rem', 'height': '3rem'}}/>|Data ingestion|Allows to import and export data to SQLite and supports queries to SQLite tables directly from ClickHouse.|[Documentation](/engines/table-engines/integrations/sqlite)|
251253
|Superset|<Supersetsvg alt="Superset logo" style={{width: '3rem'}}/>|Data visualization|Explore and visualize your ClickHouse data with Apache Superset.|[Documentation](/integrations/data-visualization/superset-and-clickhouse.md)|

docs/use-cases/data_lake/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ ClickHouse supports integration with multiple catalogs (Unity, Glue, REST, Polar
1414
| [Querying data in S3 using ClickHouse and the Glue Data Catalog](/use-cases/data-lake/glue-catalog) | Query your data in S3 buckets using ClickHouse and the Glue Data Catalog. |
1515
| [Querying data in S3 using ClickHouse and the Unity Data Catalog](/use-cases/data-lake/unity-catalog) | Query your using the Unity Catalog. |
1616
| [Querying data in S3 using ClickHouse and the REST Catalog](/use-cases/data-lake/rest-catalog) | Query your data using the REST Catalog (Tabular.io). |
17+
| [Querying data in S3 using ClickHouse and the Lakekeeper Catalog](/use-cases/data-lake/lakekeeper-catalog) | Query your data using the Lakekeeper Catalog. |
18+
| [Querying data in S3 using ClickHouse and the Nessie Catalog](/use-cases/data-lake/nessie-catalog) | Query your data using the Nessie Catalog with Git-like data version control. |

0 commit comments

Comments
 (0)