Skip to content

Fix multi-indexing runs for checkVec #130408

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
Jul 1, 2025
Merged

Fix multi-indexing runs for checkVec #130408

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
77 changes: 42 additions & 35 deletions qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,11 @@ public static void main(String[] args) throws Exception {
int[] nProbes = cmdLineArgs.indexType().equals(IndexType.IVF) && cmdLineArgs.numQueries() > 0
? cmdLineArgs.nProbes()
: new int[] { 0 };
String indexType = cmdLineArgs.indexType().name().toLowerCase(Locale.ROOT);
Results indexResults = new Results(cmdLineArgs.docVectors().getFileName().toString(), indexType, cmdLineArgs.numDocs());
Results[] results = new Results[nProbes.length];
for (int i = 0; i < nProbes.length; i++) {
results[i] = new Results(cmdLineArgs.indexType().name().toLowerCase(Locale.ROOT), cmdLineArgs.numDocs());
results[i] = new Results(cmdLineArgs.docVectors().getFileName().toString(), indexType, cmdLineArgs.numDocs());
}
logger.info("Running KNN index tester with arguments: " + cmdLineArgs);
Codec codec = createCodec(cmdLineArgs);
Expand All @@ -199,12 +201,12 @@ public static void main(String[] args) throws Exception {
throw new IllegalArgumentException("Index path does not exist: " + indexPath);
}
if (cmdLineArgs.reindex()) {
knnIndexer.createIndex(results[0]);
knnIndexer.createIndex(indexResults);
}
if (cmdLineArgs.forceMerge()) {
knnIndexer.forceMerge(results[0]);
knnIndexer.forceMerge(indexResults);
} else {
knnIndexer.numSegments(results[0]);
knnIndexer.numSegments(indexResults);
}
}
if (cmdLineArgs.queryVectors() != null && cmdLineArgs.numQueries() > 0) {
Expand All @@ -214,24 +216,27 @@ public static void main(String[] args) throws Exception {
knnSearcher.runSearch(results[i], cmdLineArgs.earlyTermination());
}
}
formattedResults.results.addAll(List.of(results));
formattedResults.queryResults.addAll(List.of(results));
formattedResults.indexResults.add(indexResults);
}
logger.info("Results: \n" + formattedResults);
}

static class FormattedResults {
List<Results> results = new ArrayList<>();
List<Results> indexResults = new ArrayList<>();
List<Results> queryResults = new ArrayList<>();

@Override
public String toString() {
if (results.isEmpty()) {
if (indexResults.isEmpty() && queryResults.isEmpty()) {
return "No results available.";
}

String[] indexingHeaders = { "index_type", "num_docs", "index_time(ms)", "force_merge_time(ms)", "num_segments" };
String[] indexingHeaders = { "index_name", "index_type", "num_docs", "index_time(ms)", "force_merge_time(ms)", "num_segments" };

// Define column headers
String[] searchHeaders = {
"index_name",
"index_type",
"n_probe",
"latency(ms)",
Expand All @@ -245,33 +250,34 @@ public String toString() {

StringBuilder sb = new StringBuilder();

Results indexResult = results.get(0); // Assuming all results have the same index type and numDocs
String[] indexData = {
indexResult.indexType,
Integer.toString(indexResult.numDocs),
Long.toString(indexResult.indexTimeMS),
Long.toString(indexResult.forceMergeTimeMS),
Integer.toString(indexResult.numSegments) };

printBlock(sb, indexingHeaders, new String[][] { indexData });

String[][] searchData = new String[results.size()][];
// Format and append each row of data
for (int i = 0; i < results.size(); i++) {
Results result = results.get(i);
searchData[i] = new String[] {
result.indexType,
Integer.toString(result.nProbe),
String.format(Locale.ROOT, "%.2f", result.avgLatency),
String.format(Locale.ROOT, "%.2f", result.netCpuTimeMS),
String.format(Locale.ROOT, "%.2f", result.avgCpuCount),
String.format(Locale.ROOT, "%.2f", result.qps),
String.format(Locale.ROOT, "%.2f", result.avgRecall),
String.format(Locale.ROOT, "%.2f", result.averageVisited) };

String[][] indexResultsArray = new String[indexResults.size()][];
for (int i = 0; i < indexResults.size(); i++) {
Results indexResult = indexResults.get(i);
indexResultsArray[i] = new String[] {
indexResult.indexName,
indexResult.indexType,
Integer.toString(indexResult.numDocs),
Long.toString(indexResult.indexTimeMS),
Long.toString(indexResult.forceMergeTimeMS),
Integer.toString(indexResult.numSegments) };
}
printBlock(sb, indexingHeaders, indexResultsArray);
String[][] queryResultsArray = new String[queryResults.size()][];
for (int i = 0; i < queryResults.size(); i++) {
Results queryResult = queryResults.get(i);
queryResultsArray[i] = new String[] {
queryResult.indexName,
queryResult.indexType,
Integer.toString(queryResult.nProbe),
String.format(Locale.ROOT, "%.2f", queryResult.avgLatency),
String.format(Locale.ROOT, "%.2f", queryResult.netCpuTimeMS),
String.format(Locale.ROOT, "%.2f", queryResult.avgCpuCount),
String.format(Locale.ROOT, "%.2f", queryResult.qps),
String.format(Locale.ROOT, "%.2f", queryResult.avgRecall),
String.format(Locale.ROOT, "%.2f", queryResult.averageVisited) };
}

printBlock(sb, searchHeaders, searchData);
printBlock(sb, searchHeaders, queryResultsArray);

return sb.toString();
}
Expand Down Expand Up @@ -331,7 +337,7 @@ private int[] calculateColumnWidths(String[] headers, String[]... data) {
}

static class Results {
final String indexType;
final String indexType, indexName;
final int numDocs;
long indexTimeMS;
long forceMergeTimeMS;
Expand All @@ -344,7 +350,8 @@ static class Results {
double netCpuTimeMS;
double avgCpuCount;

Results(String indexType, int numDocs) {
Results(String indexName, String indexType, int numDocs) {
this.indexName = indexName;
this.indexType = indexType;
this.numDocs = numDocs;
}
Expand Down