You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by bo...@apache.org on 2018/05/25 00:02:10 UTC
[drill] branch master updated: DRILL-6443: Enable Search for both
running AND completed queries
This is an automated email from the ASF dual-hosted git repository.
boaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 686480f DRILL-6443: Enable Search for both running AND completed queries
686480f is described below
commit 686480f6cfa56b17a8502a11d58d04506bb01924
Author: Kunal Khatua <ku...@apache.org>
AuthorDate: Wed May 23 15:55:24 2018 -0700
DRILL-6443: Enable Search for both running AND completed queries
When running a query in Drill, the `/profiles` page will show the search (and pagination) capabilities only for the top most visible table (i.e. Running Queries ).
The Completed Queries table will show the search feature only when there are no running queries. This is because the backend uses a generalized freemarker macro to define the seach capabilities for the tables being rendered. With running queries, both, running and completed queries tables have the same element ID, resulting in the search capability only being applied to the first table.
This modifies the Freemarker macro to take an additional argument for distinguishing between Running and Completed Queries table.
---
.../src/main/resources/rest/profile/list.ftl | 50 +++++++++++-----------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/exec/java-exec/src/main/resources/rest/profile/list.ftl b/exec/java-exec/src/main/resources/rest/profile/list.ftl
index 6a8b51d..f9334b8 100644
--- a/exec/java-exec/src/main/resources/rest/profile/list.ftl
+++ b/exec/java-exec/src/main/resources/rest/profile/list.ftl
@@ -23,26 +23,28 @@
<script src="/static/js/jquery.dataTables-1.10.16.min.js"></script>
<script>
$(document).ready(function() {
- $("#profileList").DataTable( {
- //Preserve order
- "ordering": false,
- "searching": true,
- "paging": true,
- "pagingType": "first_last_numbers",
- "lengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]],
- "lengthChange": true,
- "info": true,
- //Ref: https://legacy.datatables.net/ref#sDom
- "sDom": '<"top"lftip><"bottom"><"clear">',
- //Customized info labels
- "language": {
- "lengthMenu": "Display _MENU_ profiles per page",
- "zeroRecords": "No matching profiles found!",
- "info": "Showing page _PAGE_ of _PAGES_ ",
- "infoEmpty": "No profiles available",
- "infoFiltered": "(filtered _TOTAL_ from _MAX_)",
- "search": "Search Profiles "
- }
+ $.each(["running","completed"], function(i, key) {
+ $("#profileList_"+key).DataTable( {
+ //Preserve order
+ "ordering": false,
+ "searching": true,
+ "paging": true,
+ "pagingType": "full_numbers",
+ "lengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]],
+ "lengthChange": true,
+ "info": true,
+ //Ref: https://legacy.datatables.net/ref#sDom
+ "sDom": '<"top"lftip><"bottom"><"clear">',
+ //Customized info labels
+ "language": {
+ "lengthMenu": "Display _MENU_ profiles per page",
+ "zeroRecords": "No matching profiles found!",
+ "info": "Showing page _PAGE_ of _PAGES_ ",
+ "infoEmpty": "No profiles available",
+ "infoFiltered": "(filtered _TOTAL_ from _MAX_)",
+ "search": "Search Profiles "
+ }
+ } );
} );
} );
</script>
@@ -94,7 +96,7 @@
</#if>
<#if (model.getRunningQueries()?size > 0) >
<h3>Running Queries</h3>
- <@list_queries queries=model.getRunningQueries()/>
+ <@list_queries queries=model.getRunningQueries() stateList="running" />
<div class="page-header">
</div>
<#else>
@@ -139,12 +141,12 @@
$("#fetchMax").val(maxFetched);
});
</script>
- <@list_queries queries=model.getFinishedQueries()/>
+ <@list_queries queries=model.getFinishedQueries() stateList="completed" />
</#macro>
-<#macro list_queries queries>
+<#macro list_queries queries stateList>
<div class="table-responsive">
- <table id="profileList" class="table table-hover dataTable" role="grid">
+ <table id="profileList_${stateList}" class="table table-hover dataTable" role="grid">
<thead>
<tr role="row">
<th>Time</th>
--
To stop receiving notification emails like this one, please contact
boaz@apache.org.