Query endpoint now measures and logs time needed to execute a query.

vitrivr · Jan 13, 2024 · 8e80c17 · 8e80c17
1 parent 9d0e892
commit 8e80c17
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -86,8 +86,8 @@ subprojects {
         implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: version_caffeine
 
         /* Logging */
-        implementation group: 'io.github.oshai', name: 'kotlin-logging-jvm', version: version_kotlinlogging
         implementation group: 'org.slf4j', name: 'slf4j-api', version: version_slf4j
+        implementation group: 'io.github.oshai', name: 'kotlin-logging-jvm', version: version_kotlinlogging
         implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: version_log4j2
         implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: version_log4j2
         implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: version_log4j2

diff --git a/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/server/api/rest/Routes.kt b/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/server/api/rest/Routes.kt
@@ -49,7 +49,6 @@ fun configureApiRoutes(config: ApiConfig, manager: SchemaManager, retrievalRunti
                         path("{exporter}") {
                             path("{retrievable}") {
                                 post { ctx ->
-
                                     fetchExportData(ctx, schema)
                                 }
                             }

diff --git a/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/server/api/rest/handlers/Query.kt b/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/server/api/rest/handlers/Query.kt
@@ -1,5 +1,7 @@
 package org.vitrivr.engine.server.api.rest.handlers
 
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Context
 import io.javalin.http.bodyAsClass
 import io.javalin.openapi.*
@@ -9,12 +11,10 @@ import org.vitrivr.engine.query.model.api.InformationNeedDescription
 import org.vitrivr.engine.query.model.api.result.QueryResult
 import org.vitrivr.engine.server.api.rest.model.ErrorStatus
 import org.vitrivr.engine.server.api.rest.model.ErrorStatusException
+import kotlin.time.measureTime
+
+private val logger: KLogger = KotlinLogging.logger {}
 
-/**
- *
- * @author Ralph Gasser
- * @version 1.0
- */
 @OpenApi(
     path = "/api/{schema}/query",
     methods = [HttpMethod.POST],
@@ -31,11 +31,14 @@ import org.vitrivr.engine.server.api.rest.model.ErrorStatusException
     ]
 )
 fun executeQuery(ctx: Context, schema: Schema, runtime: RetrievalRuntime) {
-    val informationNeed = try {
-        ctx.bodyAsClass<InformationNeedDescription>()
-    } catch (e: Exception) {
-        throw ErrorStatusException(400, "Invalid request: ${e.message}")
+    val duration = measureTime {
+        val informationNeed = try {
+            ctx.bodyAsClass<InformationNeedDescription>()
+        } catch (e: Exception) {
+            throw ErrorStatusException(400, "Invalid request: ${e.message}")
+        }
+        val results = runtime.query(schema, informationNeed)
+        ctx.json(QueryResult(results))
     }
-    val results = runtime.query(schema, informationNeed)
-    ctx.json(QueryResult(results))
+    logger.info { "Executing ${ctx.req().pathInfo} took $duration." }
 }