Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix_compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
small-turtle-1 committed Dec 12, 2024
2 parents 2981812 + 3f07ecf commit 1233404
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Supports a wide range of data types including strings, numerics, vectors, and mo
Infinity supports two working modes, embedded mode and client-server mode. Infinity's embedded mode enables you to quickly embed Infinity into your Python applications, without the need to connect to a separate backend server. The following shows how to operate in embedded mode:

```bash
pip install infinity-embedded-sdk==0.5.0.dev5
pip install infinity-embedded-sdk==0.5.0.dev6
```
Use Infinity to conduct a dense vector search:
```python
Expand Down
2 changes: 1 addition & 1 deletion benchmark/remote_infinity/remote_query_benchmark.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct InfinityClient {
transport->open();
CommonResponse response;
ConnectRequest request;
request.__set_client_version(26); // 0.5.0.dev5
request.__set_client_version(27); // 0.5.0.dev6
client->Connect(response, request);
session_id = response.session_id;
}
Expand Down
2 changes: 1 addition & 1 deletion client/cpp/infinity_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Client Client::Connect(const std::string &ip_address, uint16_t port) {
transport->open();
CommonResponse response;
ConnectRequest request;
request.__set_client_version(26); // 0.5.0.dev5
request.__set_client_version(27); // 0.5.0.dev6
client->Connect(response, request);
return {socket, transport, protocol, std::move(client), response.session_id};
}
Expand Down
6 changes: 3 additions & 3 deletions docs/getstarted/build_from_source.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ cmake --build . -t test_main

2. Install Python sdk of infinity:
```bash
pip install infinity-sdk==0.5.0.dev5
pip install infinity-sdk==0.5.0.dev6
```

3. Run the functional tests:
Expand All @@ -286,7 +286,7 @@ cmake --build . -t test_main

2. Install Python sdk of infinity:
```bash
pip install infinity-sdk==0.5.0.dev5
pip install infinity-sdk==0.5.0.dev6
```

3. Run the functional tests:
Expand All @@ -309,7 +309,7 @@ cmake --build . -t test_main

2. Install Python sdk of infinity:
```bash
pip install infinity-sdk==0.5.0.dev5
pip install infinity-sdk==0.5.0.dev6
```

3. Run the functional tests:
Expand Down
10 changes: 5 additions & 5 deletions docs/getstarted/deploy_infinity_server.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This approach allows you to call Infinity as a Python module. To deploy Infinity
### Install Infinity as a module

```
pip install infinity-embedded-sdk==0.5.0.dev5
pip install infinity-embedded-sdk==0.5.0.dev6
```

### Create an Infinity object
Expand Down Expand Up @@ -101,7 +101,7 @@ If you are on Windows 10+, you must enable WSL or WSL2 to deploy Infinity using
### Install Infinity client

```
pip install infinity-sdk==0.5.0.dev5
pip install infinity-sdk==0.5.0.dev6
```

### Run a vector search
Expand Down Expand Up @@ -151,7 +151,7 @@ This section provides instructions on deploying Infinity using binary package on

Fedora/RHEL/CentOS/OpenSUSE
```bash
sudo rpm -i infinity-0.5.0.dev5-x86_64.rpm
sudo rpm -i infinity-0.5.0.dev6-x86_64.rpm
```

```bash
Expand All @@ -162,7 +162,7 @@ sudo systemctl start infinity
<TabItem value="ubuntu">

```bash
sudo dpkg -i infinity-0.5.0.dev5-x86_64.deb
sudo dpkg -i infinity-0.5.0.dev6-x86_64.deb
```

```bash
Expand All @@ -175,7 +175,7 @@ sudo systemctl start infinity
### Install Infinity client

```
pip install infinity-sdk==0.5.0.dev5
pip install infinity-sdk==0.5.0.dev6
```

### Run a vector search
Expand Down
2 changes: 1 addition & 1 deletion docs/getstarted/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ If you wish to embed Infinity into your Python application without the need for

1. Install the Infinity-embedded SDK:
```bash
pip install infinity-embedded-sdk==0.5.0.dev5
pip install infinity-embedded-sdk==0.5.0.dev6
```
2. Use Infinity to conduct a dense vector search:
```python
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build-backend = "scikit_build_core.build"

[project]
name = "infinity_embedded_sdk"
version = "0.5.0.dev5"
version = "0.5.0.dev6"
requires-python = ">=3.10"
dependencies = [
"sqlglot~=11.7.0",
Expand Down
3 changes: 2 additions & 1 deletion python/infinity_sdk/infinity/remote_thrift/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ def _reconnect(self):
# version: 0.5.0.dev2, client_version: 24
# version: 0.5.0.dev3, client_version: 25
# version: 0.5.0.dev4 and 0.5.0.dev5, client_version: 26
res = self.client.Connect(ConnectRequest(client_version=26)) # 0.5.0.dev5
# version: 0.5.0.dev6, client_version: 27
res = self.client.Connect(ConnectRequest(client_version=27)) # 0.5.0.dev6
if res.error_code != 0:
raise InfinityException(res.error_code, res.error_msg)
self.session_id = res.session_id
Expand Down
2 changes: 1 addition & 1 deletion python/infinity_sdk/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "infinity-sdk"
version = "0.5.0.dev5"
version = "0.5.0.dev6"
requires-python = ">=3.10"
dependencies = [
"sqlglot~=11.7.0",
Expand Down
1 change: 1 addition & 0 deletions src/network/infinity_thrift_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ ClientVersions::ClientVersions() {
client_version_map_[24] = String("0.5.0.dev2");
client_version_map_[25] = String("0.5.0.dev3");
client_version_map_[26] = String("0.5.0.dev5");
client_version_map_[27] = String("0.5.0.dev6");
}

Pair<const char *, Status> ClientVersions::GetVersionByIndex(i64 version_index) {
Expand Down
2 changes: 1 addition & 1 deletion src/network/infinity_thrift_service.cppm
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct ClientVersions {
export class InfinityThriftService final : public infinity_thrift_rpc::InfinityServiceIf {
private:
static constexpr std::string_view ErrorMsgHeader = "[THRIFT ERROR]";
static constexpr i64 current_version_index_{26}; // 0.5.0.dev5
static constexpr i64 current_version_index_{27}; // 0.5.0.dev6

static std::mutex infinity_session_map_mutex_;
static HashMap<u64, SharedPtr<Infinity>> infinity_session_map_;
Expand Down
2 changes: 1 addition & 1 deletion src/storage/invertedindex/memory_indexer.cppm
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,6 @@ private:
UniquePtr<BufWriter> buf_writer_;

SegmentIndexEntry *segment_index_entry_{nullptr};
SizeT mem_used_{0};
Atomic<SizeT> mem_used_{0};
};
} // namespace infinity

0 comments on commit 1233404

Please sign in to comment.