Skip to content

Commit 4839aef

Browse files
KochetovNicolaiKochetovNicolai
committed
Merge branch 'master' into projection-index-4-pre
2 parents c5912d3 + cf88198 commit 4839aef

168 files changed

Lines changed: 3190 additions & 984 deletions

File tree

Some content is hidden

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

‎.snyk‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎contrib/libarchive‎

Submodule libarchive updated 409 files

‎contrib/update-submodules.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ git config --file .gitmodules --get-regexp '.*path' | sed 's/[^ ]* //' | xargs -
2424
# We don't want to depend on any third-party CMake files.
2525
# To check it, find and delete them.
2626
grep -o -P '"contrib/[^"]+"' .gitmodules |
27-
grep -v -P 'contrib/(llvm-project|google-protobuf|grpc|abseil-cpp|corrosion|aws-crt-cpp|google-cloud-cpp)' |
27+
grep -v -P 'contrib/(llvm-project|google-protobuf|grpc|abseil-cpp|corrosion|aws-crt-cpp|google-cloud-cpp|rust_vendor)' |
2828
xargs -I@ find @ \
2929
-'(' -name 'CMakeLists.txt' -or -name '*.cmake' -')' -and -not -name '*.h.cmake' \
3030
-delete

‎docs/en/engines/database-engines/atomic.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ On ClickHouse Cloud, the `Replicated` database engine is used by default.
1919
## Creating a Database {#creating-a-database}
2020

2121
```sql
22-
CREATE DATABASE test [ENGINE = Atomic];
22+
CREATE DATABASE test [ENGINE = Atomic] [SETTINGS disk=...];
2323
```
2424

2525
## Specifics and Recommendations {#specifics-and-recommendations}
@@ -72,6 +72,16 @@ EXCHANGE TABLES new_table AND old_table;
7272

7373
For [`ReplicatedMergeTree`](/engines/table-engines/mergetree-family/replication) tables, it is recommended not to specify the engine parameters for the path in ZooKeeper and the replica name. In this case, the configuration parameters [`default_replica_path`](../../operations/server-configuration-parameters/settings.md#default_replica_path) and [`default_replica_name`](../../operations/server-configuration-parameters/settings.md#default_replica_name) will be used. If you want to specify engine parameters explicitly, it is recommended to use the `{uuid}` macros. This ensures that unique paths are automatically generated for each table in ZooKeeper.
7474

75+
### Metadata disk {#metadata-disk}
76+
When `disk` is specified in `SETTINGS`, the disk is used to store table metadata files.
77+
For example:
78+
79+
```sql
80+
CREATE TABLE db (n UInt64) ENGINE = Atomic SETTINGS disk=disk(type='local', path='/var/lib/clickhouse-disks/db_disk');
81+
```
82+
If unspecified, the disk defined in `database_disk.disk` is used by default.
83+
84+
7585
## See Also {#see-also}
7686

7787
- [system.databases](../../operations/system-tables/databases.md) system table

‎docs/en/engines/table-engines/integrations/s3queue.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ Example:
282282

283283
- `_path` — Path to the file.
284284
- `_file` — Name of the file.
285+
- `_size` — Size of the file.
286+
- `_time` — Time of the file creation.
285287

286288
For more information about virtual columns see [here](../../../engines/table-engines/index.md#table_engines-virtual_columns).
287289

‎docs/en/interfaces/formats/Parquet/Parquet.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ The table below shows supported data types and how they match ClickHouse [data t
4545
| `UINT32` | [IPv4](/sql-reference/data-types/ipv4.md) | `UINT32` |
4646
| `FIXED_LENGTH_BYTE_ARRAY`, `BINARY` | [IPv6](/sql-reference/data-types/ipv6.md) | `FIXED_LENGTH_BYTE_ARRAY` |
4747
| `FIXED_LENGTH_BYTE_ARRAY`, `BINARY` | [Int128/UInt128/Int256/UInt256](/sql-reference/data-types/int-uint.md) | `FIXED_LENGTH_BYTE_ARRAY` |
48+
| `JSON` | [JSON](/sql-reference/data-types/newjson.md) | `JSON` |
4849

4950
Arrays can be nested and can have a value of `Nullable` type as an argument. `Tuple` and `Map` types can also be nested.
5051

5152
Unsupported Parquet data types are:
5253
- `FIXED_SIZE_BINARY`
53-
- `JSON`
5454
- `UUID`
5555
- `ENUM`.
5656

@@ -89,6 +89,7 @@ To exchange data with Hadoop, you can use the [`HDFS table engine`](/engines/tab
8989
| `input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference` | Skip columns with unsupported types while schema inference for format Parquet | `0` |
9090
| `input_format_parquet_max_block_size` | Max block size for parquet reader. | `65409` |
9191
| `input_format_parquet_prefer_block_bytes` | Average block bytes output by parquet reader | `16744704` |
92+
| `input_format_parquet_enable_json_parsing` | When reading Parquet files, parse JSON columns as ClickHouse JSON Column. | `1` |
9293
| `output_format_parquet_row_group_size` | Target row group size in rows. | `1000000` |
9394
| `output_format_parquet_row_group_size_bytes` | Target row group size in bytes, before compression. | `536870912` |
9495
| `output_format_parquet_string_as_string` | Use Parquet String type instead of Binary for String columns. | `1` |

‎docs/en/operations/system-tables/iceberg_history.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Columns:
1313

1414
- `database` ([String](../../sql-reference/data-types/string.md)) — The name of the database the table is in.
1515

16-
- `name` ([String](../../sql-reference/data-types/string.md)) — Table name.
16+
- `table` ([String](../../sql-reference/data-types/string.md)) — Table name.
1717

1818
- `made_current_at` ([DateTime](../../sql-reference/data-types/uuid.md)) — Time when the snapshot was made current snapshot.
1919

0 commit comments

Comments
 (0)