Skip to content

Commit eb8d056

Browse files
chinauxclaude
chinaux
and
claude
committed
style: fix clang-format violations in DiskANN additions
Co-Authored-By: Claude <noreply@anthropic.com>
1 parent cdb6af9 commit eb8d056

3 files changed

Lines changed: 37 additions & 50 deletions

File tree

‎examples/c/diskann_example.c‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,16 @@ int main(void) {
101101
goto cleanup_schema;
102102
}
103103
zvec_index_params_set_metric_type(diskann_params, ZVEC_METRIC_TYPE_L2);
104-
zvec_index_params_set_diskann_params(diskann_params,
105-
64, /* max_degree: graph connectivity */
106-
100, /* list_size: build-time candidates */
107-
8); /* pq_chunk_num: PQ chunks (0=auto) */
104+
zvec_index_params_set_diskann_params(
105+
diskann_params, 64, /* max_degree: graph connectivity */
106+
100, /* list_size: build-time candidates */
107+
8); /* pq_chunk_num: PQ chunks (0=auto) */
108108

109-
printf(" DiskANN index params: max_degree=%d, list_size=%d, pq_chunk_num=%d\n",
110-
zvec_index_params_get_diskann_max_degree(diskann_params),
111-
zvec_index_params_get_diskann_list_size(diskann_params),
112-
zvec_index_params_get_diskann_pq_chunk_num(diskann_params));
109+
printf(
110+
" DiskANN index params: max_degree=%d, list_size=%d, pq_chunk_num=%d\n",
111+
zvec_index_params_get_diskann_max_degree(diskann_params),
112+
zvec_index_params_get_diskann_list_size(diskann_params),
113+
zvec_index_params_get_diskann_pq_chunk_num(diskann_params));
113114

114115
zvec_field_schema_t *embedding_field = zvec_field_schema_create(
115116
"embedding", ZVEC_DATA_TYPE_VECTOR_FP32, false, VECTOR_DIM);
@@ -144,12 +145,12 @@ int main(void) {
144145
/* ------------------------------------------------------------------
145146
* Step 3: Generate and insert documents
146147
* ------------------------------------------------------------------ */
147-
printf("\n[Step 3] Inserting %d documents with %dD vectors...\n",
148-
NUM_DOCS, VECTOR_DIM);
148+
printf("\n[Step 3] Inserting %d documents with %dD vectors...\n", NUM_DOCS,
149+
VECTOR_DIM);
149150

150151
/* Allocate vector storage */
151-
float (*vectors)[VECTOR_DIM] =
152-
(float (*)[VECTOR_DIM])malloc(NUM_DOCS * VECTOR_DIM * sizeof(float));
152+
float(*vectors)[VECTOR_DIM] =
153+
(float(*)[VECTOR_DIM])malloc(NUM_DOCS * VECTOR_DIM * sizeof(float));
153154
if (!vectors) {
154155
fprintf(stderr, "Failed to allocate vector storage\n");
155156
goto cleanup_collection;
@@ -166,11 +167,9 @@ int main(void) {
166167
int batch_size = 20;
167168
size_t total_success = 0, total_error = 0;
168169

169-
for (int batch_start = 0; batch_start < NUM_DOCS;
170-
batch_start += batch_size) {
171-
int count = batch_start + batch_size > NUM_DOCS
172-
? NUM_DOCS - batch_start
173-
: batch_size;
170+
for (int batch_start = 0; batch_start < NUM_DOCS; batch_start += batch_size) {
171+
int count = batch_start + batch_size > NUM_DOCS ? NUM_DOCS - batch_start
172+
: batch_size;
174173

175174
zvec_doc_t **docs =
176175
(zvec_doc_t **)malloc((size_t)count * sizeof(zvec_doc_t *));
@@ -203,8 +202,7 @@ int main(void) {
203202
}
204203
free(docs);
205204
}
206-
printf(" Inserted: %zu succeeded, %zu failed\n", total_success,
207-
total_error);
205+
printf(" Inserted: %zu succeeded, %zu failed\n", total_success, total_error);
208206

209207
/* ------------------------------------------------------------------
210208
* Step 4: Flush to trigger index build (PQ training + graph construction)
@@ -231,8 +229,7 @@ int main(void) {
231229

232230
/* Create DiskANN query params — list_size controls the search frontier
233231
* (beam width). Larger values improve recall at the cost of latency. */
234-
zvec_diskann_query_params_t *da_qp =
235-
zvec_query_params_diskann_create(200);
232+
zvec_diskann_query_params_t *da_qp = zvec_query_params_diskann_create(200);
236233
if (!da_qp) {
237234
fprintf(stderr, "Failed to create DiskANN query params\n");
238235
goto cleanup_vectors;
@@ -260,13 +257,13 @@ int main(void) {
260257
/* Execute the query */
261258
zvec_doc_t **results = NULL;
262259
size_t result_count = 0;
263-
error = zvec_collection_query(collection,
264-
(const zvec_vector_query_t *)query,
260+
error = zvec_collection_query(collection, (const zvec_vector_query_t *)query,
265261
&results, &result_count);
266262
if (error != ZVEC_OK) {
267263
handle_error(error, "executing DiskANN query");
268-
printf(" (This is expected on non-Linux platforms — DiskANN requires "
269-
"libaio)\n");
264+
printf(
265+
" (This is expected on non-Linux platforms — DiskANN requires "
266+
"libaio)\n");
270267
} else {
271268
printf(" Query returned %zu results:\n", result_count);
272269
for (size_t r = 0; r < result_count && r < 5; r++) {
@@ -306,12 +303,12 @@ int main(void) {
306303

307304
zvec_doc_t **tune_results = NULL;
308305
size_t tune_count = 0;
309-
error = zvec_collection_query(
310-
collection, (const zvec_vector_query_t *)tune_query,
311-
&tune_results, &tune_count);
306+
error = zvec_collection_query(collection,
307+
(const zvec_vector_query_t *)tune_query,
308+
&tune_results, &tune_count);
312309
if (error == ZVEC_OK) {
313-
printf(" list_size=%3d -> %zu results returned\n",
314-
list_sizes[li], tune_count);
310+
printf(" list_size=%3d -> %zu results returned\n", list_sizes[li],
311+
tune_count);
315312
zvec_docs_free(tune_results, tune_count);
316313
} else {
317314
printf(" list_size=%3d -> query failed (expected on non-Linux)\n",

‎src/include/zvec/c_api.h‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,17 +1698,15 @@ zvec_query_params_diskann_destroy(zvec_diskann_query_params_t *params);
16981698
* @param list_size Search frontier size
16991699
* @return zvec_error_code_t Error code
17001700
*/
1701-
ZVEC_EXPORT zvec_error_code_t ZVEC_CALL
1702-
zvec_query_params_diskann_set_list_size(zvec_diskann_query_params_t *params,
1703-
int list_size);
1701+
ZVEC_EXPORT zvec_error_code_t ZVEC_CALL zvec_query_params_diskann_set_list_size(
1702+
zvec_diskann_query_params_t *params, int list_size);
17041703

17051704
/**
17061705
* @brief Get search frontier size
17071706
* @param params DiskANN query parameters pointer
17081707
* @return int Search frontier size
17091708
*/
1710-
ZVEC_EXPORT int ZVEC_CALL
1711-
zvec_query_params_diskann_get_list_size(
1709+
ZVEC_EXPORT int ZVEC_CALL zvec_query_params_diskann_get_list_size(
17121710
const zvec_diskann_query_params_t *params);
17131711

17141712
/**
@@ -1726,26 +1724,23 @@ ZVEC_EXPORT zvec_error_code_t ZVEC_CALL zvec_query_params_diskann_set_radius(
17261724
* @return float Search radius
17271725
*/
17281726
ZVEC_EXPORT float ZVEC_CALL
1729-
zvec_query_params_diskann_get_radius(
1730-
const zvec_diskann_query_params_t *params);
1727+
zvec_query_params_diskann_get_radius(const zvec_diskann_query_params_t *params);
17311728

17321729
/**
17331730
* @brief Set linear search mode (common parameter from QueryParams base)
17341731
* @param params DiskANN query parameters pointer
17351732
* @param is_linear Whether linear search
17361733
* @return zvec_error_code_t Error code
17371734
*/
1738-
ZVEC_EXPORT zvec_error_code_t ZVEC_CALL
1739-
zvec_query_params_diskann_set_is_linear(
1735+
ZVEC_EXPORT zvec_error_code_t ZVEC_CALL zvec_query_params_diskann_set_is_linear(
17401736
zvec_diskann_query_params_t *params, bool is_linear);
17411737

17421738
/**
17431739
* @brief Get linear search mode (common parameter from QueryParams base)
17441740
* @param params DiskANN query parameters pointer
17451741
* @return bool Whether linear search
17461742
*/
1747-
ZVEC_EXPORT bool ZVEC_CALL
1748-
zvec_query_params_diskann_get_is_linear(
1743+
ZVEC_EXPORT bool ZVEC_CALL zvec_query_params_diskann_get_is_linear(
17491744
const zvec_diskann_query_params_t *params);
17501745

17511746
/**

‎tests/c/c_api_test.c‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3787,7 +3787,6 @@ void test_query_params_functions(void) {
37873787
zvec_query_params_diskann_destroy(diskann_params);
37883788

37893789

3790-
37913790
// Test boundary cases - null pointer handling
37923791
zvec_query_params_hnsw_destroy(NULL);
37933792
zvec_query_params_ivf_destroy(NULL);
@@ -5980,8 +5979,7 @@ void test_diskann_index_params_functions(void) {
59805979
TEST_ASSERT(zvec_index_params_get_diskann_pq_chunk_num(params) == 0);
59815980

59825981
// Default metric type is L2
5983-
TEST_ASSERT(zvec_index_params_get_metric_type(params) ==
5984-
ZVEC_METRIC_TYPE_L2);
5982+
TEST_ASSERT(zvec_index_params_get_metric_type(params) == ZVEC_METRIC_TYPE_L2);
59855983

59865984
// Set and verify custom values
59875985
zvec_index_params_set_metric_type(params, ZVEC_METRIC_TYPE_COSINE);
@@ -5996,8 +5994,7 @@ void test_diskann_index_params_functions(void) {
59965994
TEST_ASSERT(zvec_index_params_get_diskann_pq_chunk_num(params) == 8);
59975995

59985996
// Type-mismatch error path: HNSW params must not accept DiskANN setter
5999-
zvec_index_params_t *hnsw =
6000-
zvec_index_params_create(ZVEC_INDEX_TYPE_HNSW);
5997+
zvec_index_params_t *hnsw = zvec_index_params_create(ZVEC_INDEX_TYPE_HNSW);
60015998
TEST_ASSERT(hnsw != NULL);
60025999
err = zvec_index_params_set_diskann_params(hnsw, 100, 50, 0);
60036000
TEST_ASSERT(err == ZVEC_ERROR_INVALID_ARGUMENT);
@@ -6092,8 +6089,7 @@ void test_diskann_wiring_on_vector_query(void) {
60926089
TEST_ASSERT(err == ZVEC_OK);
60936090

60946091
// NULL handling
6095-
zvec_diskann_query_params_t *dp_null =
6096-
zvec_query_params_diskann_create(100);
6092+
zvec_diskann_query_params_t *dp_null = zvec_query_params_diskann_create(100);
60976093
err = zvec_vector_query_set_diskann_params(NULL, dp_null);
60986094
TEST_ASSERT(err == ZVEC_ERROR_INVALID_ARGUMENT);
60996095
zvec_query_params_diskann_destroy(dp_null);
@@ -6104,8 +6100,7 @@ void test_diskann_wiring_on_vector_query(void) {
61046100
zvec_vector_query_destroy(vq);
61056101

61066102
// Test wiring on zvec_group_by_vector_query_t
6107-
zvec_group_by_vector_query_t *gbq =
6108-
zvec_group_by_vector_query_create();
6103+
zvec_group_by_vector_query_t *gbq = zvec_group_by_vector_query_create();
61096104
TEST_ASSERT(gbq != NULL);
61106105

61116106
zvec_diskann_query_params_t *dp2 = zvec_query_params_diskann_create(200);

0 commit comments

Comments
 (0)