Skip to content

Commit 0bd5db3

Browse files
rschu1zerschu1ze
committed
Merge remote-tracking branch 'ClickHouse/master' into minor-fixups
2 parents 6a374cb + 0c6bd36 commit 0bd5db3

File tree

105 files changed

+3044
-1244
lines changed

Some content is hidden

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

105 files changed

+3044
-1244
lines changed

‎contrib/orc‎

Submodule orc updated 1500 files

‎docs/en/development/build-osx.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ git clone --recursive [email protected]:ClickHouse/ClickHouse.git
4747
# ...alternatively, you can use https://github.com/ClickHouse/ClickHouse.git as the repo URL.
4848
```
4949

50+
Apple uses a case-insensitive file system by default. While this usually does not affect compilation (especially scratch makes will work), it can confuse file operations like `git mv`.
51+
For serious development on macOS, make sure that the source code is stored on a case-sensitive disk volume, e.g. see [these instructions](https://brianboyko.medium.com/a-case-sensitive-src-folder-for-mac-programmers-176cc82a3830).
52+
5053
## Build ClickHouse {#build-clickhouse}
5154

5255
To build using Homebrew's vanilla Clang compiler (the only **recommended** way):

‎docs/en/engines/table-engines/mergetree-family/annindexes.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Parameters:
5656
distance](https://en.wikipedia.org/wiki/Cosine_similarity#Cosine_distance)- the angle between two non-zero vectors).
5757
- `quantization`: either `f64`, `f32`, `f16`, `bf16`, or `i8` for storing the vector with reduced precision (optional, default: `bf16`)
5858
- `hnsw_max_connections_per_layer`: the number of neighbors per HNSW graph node, also known as `M` in the [HNSW
59-
paper](https://doi.org/10.1109/TPAMI.2018.2889473) (optional, default: 16)
59+
paper](https://doi.org/10.1109/TPAMI.2018.2889473) (optional, default: 32)
6060
- `hnsw_candidate_list_size_for_construction`: the size of the dynamic candidate list when constructing the HNSW graph, also known as
6161
`ef_construction` in the original [HNSW paper](https://doi.org/10.1109/TPAMI.2018.2889473) (optional, default: 128)
6262

@@ -143,7 +143,7 @@ clickhouse-client --param_vec='hello' --query="SELECT * FROM table WHERE L2Dista
143143
```
144144
:::
145145

146-
To search using a different value of HNSW parameter `hnsw_candidate_list_size_for_search` (default: 64), also known as `ef_search` in the
146+
To search using a different value of HNSW parameter `hnsw_candidate_list_size_for_search` (default: 256), also known as `ef_search` in the
147147
original [HNSW paper](https://doi.org/10.1109/TPAMI.2018.2889473), run the `SELECT` query with `SETTINGS hnsw_candidate_list_size_for_search
148148
= <value>`.
149149

0 commit comments

Comments
 (0)