Skip to content

Commit 8bedf78

Browse files
authored
Merge branch 'main' into security-sept25
2 parents a77c2b0 + 1d0c682 commit 8bedf78

File tree

6,607 files changed

+253863
-162921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,607 files changed

+253863
-162921
lines changed

docs/chdb/api/python.md

Lines changed: 3517 additions & 0 deletions
Large diffs are not rendered by default.

docs/chdb/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ You can use it when you want to get the power of ClickHouse in a programming lan
2727

2828
chDB has the following language bindings:
2929

30-
* [Python](install/python.md)
30+
* [Python](install/python.md) - [API Reference](api/python.md)
3131
* [Go](install/go.md)
3232
* [Rust](install/rust.md)
3333
* [NodeJS](install/nodejs.md)

docs/chdb/install/index.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ doc_type: 'landing-page'
88

99
Instructions for how to get setup with chDB are available below for the following languages and runtimes:
1010

11-
| Language |
12-
|----------------------------------------|
13-
| [Python](/chdb/install/python) |
14-
| [NodeJS](/chdb/install/nodejs) |
15-
| [Go](/chdb/install/go) |
16-
| [Rust](/chdb/install/rust) |
17-
| [Bun](/chdb/install/bun) |
18-
| [C and C++](/chdb/install/c) |
11+
| Language | API Reference |
12+
|----------------------------------------|-------------------------------------|
13+
| [Python](/chdb/install/python) | [Python API](/chdb/api/python) |
14+
| [NodeJS](/chdb/install/nodejs) | |
15+
| [Go](/chdb/install/go) | |
16+
| [Rust](/chdb/install/rust) | |
17+
| [Bun](/chdb/install/bun) | |
18+
| [C and C++](/chdb/install/c) | |
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
slug: /cloud/guides/sql-console/gather-connection-details
3+
sidebar_label: 'Gather your connection details'
4+
title: 'Gather your connection details'
5+
description: 'Gather your connection details'
6+
doc_type: 'guide'
7+
---
8+
9+
import ConnectionDetails from '@site/docs/_snippets/_gather_your_details_http.mdx';
10+
11+
<ConnectionDetails />

docs/cloud/guides/best_practices/usagelimits.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ or look together at how we can increase them in a controlled manner.
2929
| **Part size** | 150gb |
3030
| **Services per organization** | 20 (soft) |
3131
| **Services per warehouse** | 5 (soft) |
32+
| **Replicas per service** | 20 (soft) |
3233
| **Low cardinality** | 10k or less |
3334
| **Primary keys in a table** | 4-5 that sufficiently filter down the data |
3435
| **Query concurrency** | 1000 (per replica) |

docs/cloud/guides/index.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ title: 'Guides'
44
hide_title: true
55
description: 'Table of contents page for the ClickHouse Cloud guides section'
66
doc_type: 'landing-page'
7-
---
7+
---
8+
9+
<!--AUTOGENERATED_START-->
10+
<!--AUTOGENERATED_END-->

docs/cloud/onboard/02_migrate/01_migration_guides/03_bigquery/_04_sql_translation_reference.md

Whitespace-only changes.

docs/cloud/reference/03_billing/01_billing_overview.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ Best for: large scale, mission critical deployments that have stringent security
180180

181181
A ClickHouse Credit is a unit of credit toward Customer's usage of ClickHouse Cloud equal to one (1) US dollar, to be applied based on ClickHouse's then-current published price list.
182182

183+
### Where can I find legacy pricing? {#find-legacy-pricing}
184+
185+
Legacy pricing information can be found [here](https://clickhouse.com/pricing?legacy=true).
186+
183187
:::note
184188
If you are being billed through Stripe then you will see that 1 CHC is equal to \$0.01 USD on your Stripe invoice. This is to allow accurate billing on Stripe due to their limitation on not being able to bill fractional quantities of our standard SKU of 1 CHC = \$1 USD.
185189
:::

docs/cloud/reference/03_billing/02_marketplace/aws-marketplace-payg.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ Get started with ClickHouse Cloud on the [AWS Marketplace](https://aws.amazon.co
4747

4848
3. On the next screen, configure the contract:
4949
- **Length of contract** - PAYG contracts run month to month.
50-
- **Renewal settings** - You can set the contract to auto renew or not.
51-
Note that if you don't enable auto renewal, your organization is automatically put into a grace period at the end of the billing cycle and then decommissioned.
50+
- **Renewal settings** - You can set the contract to auto-renew or not.
51+
Note that we strongly recommend keeping your subscription set to auto-renew every month. However, if you don't enable auto renewal, your organization is automatically put into a grace period at the end of the billing cycle and then decommissioned.
5252

5353
- **Contract options** - You can input any number (or just 1) into this text box. This will not affect the price you pay as the price for these units for the public offer is $0. These units are usually used when accepting a private offer from ClickHouse Cloud.
5454

docs/deployment-guides/replication-sharding-examples/02_2_shards_1_replica.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -557,11 +557,7 @@ SHOW DATABASES;
557557

558558
## Create a table on the cluster {#creating-a-table}
559559

560-
Now that the database has been created, you will create a distributed table.
561-
Distributed tables are tables which have access to shards located on different
562-
hosts and are defined using the `Distributed` table engine. The distributed table
563-
acts as the interface across all the shards in the cluster.
564-
560+
Now that the database has been created, you will create a table.
565561
Run the following query from any of the host clients:
566562

567563
```sql
@@ -608,8 +604,6 @@ SHOW TABLES IN uk;
608604
└─────────────────────┘
609605
```
610606

611-
## Insert data into a distributed table {#inserting-data}
612-
613607
Before we insert the UK price paid data, let's perform a quick experiment to see
614608
what happens when we insert data into an ordinary table from either host.
615609

@@ -622,7 +616,7 @@ CREATE TABLE test.test_table ON CLUSTER cluster_2S_1R
622616
`id` UInt64,
623617
`name` String
624618
)
625-
ENGINE = ReplicatedMergeTree
619+
ENGINE = MergeTree()
626620
ORDER BY id;
627621
```
628622

@@ -654,16 +648,18 @@ SELECT * FROM test.test_table;
654648
-- └────┴────────────────────┘
655649
```
656650

657-
You will notice that only the row that was inserted into the table on that
651+
You will notice that unlike with a `ReplicatedMergeTree` table only the row that was inserted into the table on that
658652
particular host is returned and not both rows.
659653

660-
To read the data from the two shards we need an interface which can handle queries
654+
To read the data across the two shards, we need an interface which can handle queries
661655
across all the shards, combining the data from both shards when we run select queries
662-
on it, and handling the insertion of data to the separate shards when we run insert queries.
656+
on it or inserting data to both shards when we run insert queries.
663657

664-
In ClickHouse this interface is called a distributed table, which we create using
658+
In ClickHouse this interface is called a **distributed table**, which we create using
665659
the [`Distributed`](/engines/table-engines/special/distributed) table engine. Let's take a look at how it works.
666660

661+
## Create a distributed table {#create-distributed-table}
662+
667663
Create a distributed table with the following query:
668664

669665
```sql
@@ -674,8 +670,12 @@ ENGINE = Distributed('cluster_2S_1R', 'test', 'test_table', rand())
674670
In this example, the `rand()` function is chosen as the sharding key so that
675671
inserts are randomly distributed across the shards.
676672

677-
Now query the distributed table from either host and you will get back
678-
both of the rows which were inserted on the two hosts:
673+
Now query the distributed table from either host, and you will get back
674+
both of the rows which were inserted on the two hosts, unlike in our previous example:
675+
676+
```sql
677+
SELECT * FROM test.test_table_dist;
678+
```
679679

680680
```sql
681681
┌─id─┬─name───────────────┐
@@ -694,6 +694,8 @@ ON CLUSTER cluster_2S_1R
694694
ENGINE = Distributed('cluster_2S_1R', 'uk', 'uk_price_paid_local', rand());
695695
```
696696

697+
## Insert data into a distributed table {#inserting-data-into-distributed-table}
698+
697699
Now connect to either of the hosts and insert the data:
698700

699701
```sql

0 commit comments

Comments
 (0)