iter

Author: benwtrent

qa/vector/build.gradle

@@ -30,6 +30,10 @@ tasks.register("checkVec", JavaExec) {
   description = "Runs KnnIndexTester with the provided parameters to validate recall and performance."
   classpath = sourceSets.main.runtimeClasspath
   mainClass.set("org.elasticsearch.test.knn.KnnIndexTester")
+  // Configure logging to console
+  systemProperty "es.logger.out", "console"
+  systemProperty "es.logger.level", "INFO"  // Change to DEBUG if needed
+
   if (buildParams.getRuntimeJavaVersion().map { it.majorVersion.toInteger() }.get() >= 21) {
     jvmArgs '-Xms4g', '-Xmx4g', '--add-modules=jdk.incubator.vector', '--enable-native-access=ALL-UNNAMED', '-Djava.util.concurrent.ForkJoinPool.common.parallelism=8', '-XX:+UnlockDiagnosticVMOptions', '-XX:+DebugNonSafepoints', '-XX:+HeapDumpOnOutOfMemoryError'
   }

qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexTester.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.index.codec.vectors.IVFVectorsFormat;
 import org.elasticsearch.index.codec.vectors.es818.ES818BinaryQuantizedVectorsFormat;
 import org.elasticsearch.index.codec.vectors.es818.ES818HnswBinaryQuantizedVectorsFormat;
+import org.elasticsearch.logging.Level;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
@@ -36,6 +37,10 @@
  * It supports various index types (HNSW, FLAT, IVF) and configurations.
  */
 public class KnnIndexTester {
+    static final Level LOG_LEVEL = Level.DEBUG;
+
+    static final SysOutLogger logger = new SysOutLogger();
+
     static {
         LogConfigurator.loadLog4jPlugins();
         LogConfigurator.configureESLogging(); // native access requires logging to be initialized
@@ -305,4 +310,55 @@ static class Results {
             this.numDocs = numDocs;
         }
     }
+
+    static final class SysOutLogger {
+
+        void warn(String message) {
+            if (LOG_LEVEL.ordinal() >= Level.WARN.ordinal()) {
+                System.out.println(message);
+            }
+        }
+
+        void warn(String message, Object... params) {
+            if (LOG_LEVEL.ordinal() >= Level.WARN.ordinal()) {
+                System.out.println(String.format(Locale.ROOT, message, params));
+            }
+        }
+
+        void info(String message) {
+            if (LOG_LEVEL.ordinal() >= Level.INFO.ordinal()) {
+                System.out.println(message);
+            }
+        }
+
+        void info(String message, Object... params) {
+            if (LOG_LEVEL.ordinal() >= Level.INFO.ordinal()) {
+                System.out.println(String.format(Locale.ROOT, message, params));
+            }
+        }
+
+        void debug(String message) {
+            if (LOG_LEVEL.ordinal() >= Level.DEBUG.ordinal()) {
+                System.out.println(message);
+            }
+        }
+
+        void debug(String message, Object... params) {
+            if (LOG_LEVEL.ordinal() >= Level.DEBUG.ordinal()) {
+                System.out.println(String.format(Locale.ROOT, message, params));
+            }
+        }
+
+        void trace(String message) {
+            if (LOG_LEVEL == Level.TRACE) {
+                System.out.println(message);
+            }
+        }
+
+        void trace(String message, Object... params) {
+            if (LOG_LEVEL == Level.TRACE) {
+                System.out.println(String.format(Locale.ROOT, message, params));
+            }
+        }
+    }
 }

qa/vector/src/main/java/org/elasticsearch/test/knn/KnnIndexer.java

@@ -35,8 +35,6 @@
 import org.apache.lucene.index.VectorSimilarityFunction;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.PrintStreamInfoStream;
-import org.elasticsearch.logging.LogManager;
-import org.elasticsearch.logging.Logger;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -54,8 +52,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.elasticsearch.test.knn.KnnIndexTester.logger;
+
 class KnnIndexer {
-    private static final Logger logger = LogManager.getLogger(KnnIndexer.class);
     private static final double WRITER_BUFFER_MB = 128;
     static final String ID_FIELD = "id";
     static final String VECTOR_FIELD = "vector";

qa/vector/src/main/java/org/elasticsearch/test/knn/KnnSearcher.java

@@ -41,8 +41,6 @@
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.MMapDirectory;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
-import org.elasticsearch.logging.LogManager;
-import org.elasticsearch.logging.Logger;
 import org.elasticsearch.search.profile.query.QueryProfiler;
 import org.elasticsearch.search.vectors.ESKnnByteVectorQuery;
 import org.elasticsearch.search.vectors.ESKnnFloatVectorQuery;
@@ -74,13 +72,12 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS;
+import static org.elasticsearch.test.knn.KnnIndexTester.logger;
 import static org.elasticsearch.test.knn.KnnIndexer.ID_FIELD;
 import static org.elasticsearch.test.knn.KnnIndexer.VECTOR_FIELD;
 
 class KnnSearcher {
 
-    private static final Logger logger = LogManager.getLogger(KnnIndexTester.class);
-
     private final Path docPath;
     private final Path indexPath;
     private final Path queryPath;
@@ -172,7 +169,7 @@ void runSearch(KnnIndexTester.Results finalResults) throws IOException {
                         resultIds[i] = getResultIds(results[i], storedFields);
                     }
                     logger.info(
-                        "completed {} searches in {} ms: {} QPS CPU time={}ms",
+                        "completed %d searches in %d ms: %d QPS CPU time=%dms",
                         numQueryVectors,
                         elapsed,
                         (1000L * numQueryVectors) / elapsed,