From aeb646f2772c03d6204313d65641e5afc02d8d0f Mon Sep 17 00:00:00 2001 From: tanmay-9 Date: Sat, 25 Jan 2025 22:23:57 +0100 Subject: [PATCH] Removed some code and fixed some bugs --- src/qlever/evaluation/www/compare-exec-trees.js | 10 +++++----- src/qlever/evaluation/www/index.html | 2 +- src/qlever/evaluation/www/main.js | 6 ++++++ src/qlever/evaluation/www/query-details.js | 14 +++++++++----- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/qlever/evaluation/www/compare-exec-trees.js b/src/qlever/evaluation/www/compare-exec-trees.js index 0b9a8201..bb0d64ff 100644 --- a/src/qlever/evaluation/www/compare-exec-trees.js +++ b/src/qlever/evaluation/www/compare-exec-trees.js @@ -167,12 +167,12 @@ function showCompareExecTrees(purpose, select1, select2, kb, queryIndex, idOfTre document.querySelector(divIds[i]).innerHTML = qlevers[i]; } } - document.querySelector("#runtimeQuery").textContent = - "Query: " + performanceDataPerKb[kb][qlevers[0].toLowerCase()]["queries"][queryIndex]["query"]; - document.querySelector("#runtimeQuery").title = - performanceDataPerKb[kb][qlevers[0].toLowerCase()]["queries"][queryIndex]["sparql"]; + const queries = performanceDataPerKb[kb][qlevers[0].toLowerCase()]["queries"]; + document.querySelector("#runtimeQuery").textContent = "Query: " + queries[queryIndex]["query"]; + document.querySelector("#runtimeQuery").title = queries[queryIndex]["sparql"].replace(/"/g, '\\"'); qlevers.forEach((engine, index) => { - let runtime = performanceDataPerKb[kb][engine.toLowerCase()]["queries"][queryIndex].runtime_info.query_execution_tree; + let runtime = + performanceDataPerKb[kb][engine.toLowerCase()]["queries"][queryIndex].runtime_info.query_execution_tree; let treeid = "#tree" + (index + 1).toString(); if (purpose === "modalShow" || idOfTreeToZoom === treeid) { document.querySelector(treeid).replaceChildren(); diff --git a/src/qlever/evaluation/www/index.html b/src/qlever/evaluation/www/index.html index 3f15521d..6def8a56 100644 --- a/src/qlever/evaluation/www/index.html +++ b/src/qlever/evaluation/www/index.html @@ -114,7 +114,7 @@
Engine

-
+

diff --git a/src/qlever/evaluation/www/main.js b/src/qlever/evaluation/www/main.js index 27898b3e..3852e046 100644 --- a/src/qlever/evaluation/www/main.js +++ b/src/qlever/evaluation/www/main.js @@ -111,6 +111,12 @@ function processResults(results, fileList) { if (results[i].status == "fulfilled" && results[i].value.status == "fulfilled") { const queryData = results[i].value.value; addQueryStatistics(queryData); + for (const query of queryData.queries) { + if (query.headers.length !== 0 && query.runtime_info.hasOwnProperty("query_execution_tree")) { + execTreeEngines.push(engine); + break; + } + } performanceDataPerKb[kb][engine] = queryData; } } diff --git a/src/qlever/evaluation/www/query-details.js b/src/qlever/evaluation/www/query-details.js index 8a6326a8..1321a9f2 100644 --- a/src/qlever/evaluation/www/query-details.js +++ b/src/qlever/evaluation/www/query-details.js @@ -99,8 +99,8 @@ function updateUrlAndState(kb, engine, selectedQuery, tab) { url.searchParams.set("kb", kb); url.searchParams.set("engine", engine); const state = { page: "queriesDetails", kb: kb, engine: engine }; - selectedQuery !== null && (state.q = selectedQuery) && url.searchParams.set("q", selectedQuery); - tab !== null && (state.t = tab) && url.searchParams.set("t", tab); + selectedQuery !== null && (state.q = selectedQuery.toString()) && url.searchParams.set("q", selectedQuery.toString()); + tab !== null && (state.t = tab.toString()) && url.searchParams.set("t", tab.toString()); // If this page is directly opened from url, replace the null state in history stack if (window.history.state === null) { window.history.replaceState(state, "", url); @@ -204,7 +204,7 @@ async function openQueryDetailsModal(kb, engine, selectedQuery, tabToOpen) { } document.getElementById("result-tree").replaceChildren(); - createQueryTable(queryResult, kb, engine, tabBody); + createQueryTable(queryResult, tabBody); $("#runtimes-tab-pane table").tablesorter({ theme: "bootstrap", sortStable: true, @@ -234,7 +234,7 @@ async function openQueryDetailsModal(kb, engine, selectedQuery, tabToOpen) { * @param {string} engine - The SPARQL engine used. * @param {HTMLElement} tabBody - The #queryList element. */ -function createQueryTable(queryResult, kb, engine, tabBody) { +function createQueryTable(queryResult, tabBody) { queryResult.forEach((query, i) => { const tabRow = document.createElement("tr"); tabRow.style.cursor = "pointer"; @@ -410,9 +410,13 @@ function generateHTMLTable(queryRow) { document.getElementById("tab4Content").replaceChildren(); document.getElementById("resultsTable").replaceChildren(); const h5Text = document.createElement("h5"); + const totalResults = queryRow.result_size; + const resultsShown = totalResults <= 1000 ? totalResults : 1000; h5Text.textContent = `${ queryRow.result_size - } results found for this query in ${queryRow.runtime_info.client_time.toPrecision(2)}s`; + } result(s) found for this query in ${queryRow.runtime_info.client_time.toPrecision( + 2 + )}s. Showing ${resultsShown} result(s)`; document.getElementById("tab4Content").replaceChildren(h5Text); generateQueryResultsTable(tableData, headers); if (1000 < tableData.length) {