Skip to content

Enable indexing while uploading #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

Enable indexing while uploading #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions engine/clients/qdrant/configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,16 @@ def recreate(self, dataset: Dataset, collection_params):
if not set(payload_index_params.keys()).issubset(dataset.config.schema.keys()):
raise ValueError("payload_index_params are not found in dataset schema")

optimizers_config = self.collection_params.setdefault("optimizers_config", {})
# By default, disable index building while uploading
optimizers_config.setdefault("max_optimization_threads", 0)

self.client.recreate_collection(
collection_name=QDRANT_COLLECTION_NAME,
**vectors_config,
**self.collection_params
)
self.client.update_collection(
collection_name=QDRANT_COLLECTION_NAME,
optimizer_config=rest.OptimizersConfigDiff(
# indexing_threshold=10000000,
max_optimization_threads=0,
),
)

for field_name, field_type in dataset.config.schema.items():
if field_type in ["keyword", "uuid"]:
is_tenant = payload_index_params.get(field_name, {}).get(
Expand Down
19 changes: 11 additions & 8 deletions engine/clients/qdrant/upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,17 @@ def upload_batch(cls, batch: List[Record]):

@classmethod
def post_upload(cls, _distance):
cls.client.update_collection(
collection_name=QDRANT_COLLECTION_NAME,
optimizer_config=OptimizersConfigDiff(
# indexing_threshold=10_000,
# Set to a high number to not apply limits, already limited by CPU budget
max_optimization_threads=100_000,
),
)
# If index building is disabled through the collection settings, enable it
collection = cls.client.get_collection(collection_name=QDRANT_COLLECTION_NAME)
if collection.config.optimizer_config.max_optimization_threads == 0:
cls.client.update_collection(
collection_name=QDRANT_COLLECTION_NAME,
optimizer_config=OptimizersConfigDiff(
# indexing_threshold=10_000,
# Set to a high number to not apply limits, already limited by CPU budget
max_optimization_threads=100_000,
),
)

cls.wait_collection_green()
return {}
Expand Down
10 changes: 8 additions & 2 deletions experiments/configurations/qdrant-on-disk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
"engine": "qdrant",
"connection_params": {},
"collection_params": {
"optimizers_config": { "default_segment_number": 17 },
"optimizers_config": {
"default_segment_number": 17,
"max_optimization_threads": null
},
"quantization_config": { "scalar": {"type": "int8", "quantile": 0.99, "always_ram": false} },
"vectors_config": { "on_disk": true },
"hnsw_config": { "on_disk": true, "m": 0, "payload_m": 16 },
Expand All @@ -36,7 +39,10 @@
"engine": "qdrant",
"connection_params": {},
"collection_params": {
"optimizers_config": { "default_segment_number": 17 },
"optimizers_config": {
"default_segment_number": 17,
"max_optimization_threads": null
},
"quantization_config": { "scalar": {"type": "int8", "quantile": 0.99, "always_ram": false} },
"vectors_config": { "on_disk": true },
"hnsw_config": { "on_disk": true, "m": 0, "payload_m": 16 },
Expand Down
12 changes: 8 additions & 4 deletions experiments/configurations/qdrant-single-node.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"optimizers_config": {
"max_segment_size": 1000000,
"default_segment_number": 3,
"memmap_threshold": 10000000
"memmap_threshold": 10000000,
"max_optimization_threads": null
}
},
"search_params": [
Expand Down Expand Up @@ -63,7 +64,8 @@
"optimizers_config": {
"max_segment_size": 1000000,
"default_segment_number": 3,
"memmap_threshold": 10000000
"memmap_threshold": 10000000,
"max_optimization_threads": null
}
},
"search_params": [
Expand Down Expand Up @@ -93,7 +95,8 @@
"optimizers_config": {
"max_segment_size": 1000000,
"default_segment_number": 3,
"memmap_threshold": 10000000
"memmap_threshold": 10000000,
"max_optimization_threads": null
}
},
"search_params": [
Expand All @@ -120,7 +123,8 @@
"optimizers_config": {
"max_segment_size": 1000000,
"default_segment_number": 3,
"memmap_threshold": 10000000
"memmap_threshold": 10000000,
"max_optimization_threads": null
}
},
"search_params": [
Expand Down