From e41996425021b89ebd93856016e83b8b1d730f77 Mon Sep 17 00:00:00 2001 From: Surya Hebbar Date: Tue, 17 Dec 2024 22:34:37 +0530 Subject: [PATCH] IMPALA-13615: Support row grouping of instances based on fragment names In the "Fragment Instances" page of a query, even though it is possible to sort the rows based on the fragment's name, it is difficult to distinguish between fragments and their instances. With row grouping based on fragment's name, it becomes easier to distinguish one fragment's instance from the other. The lexographical sorting of instances can still be done based on different columns, which splits the fragment's group and orders the rows lexicographically only based on the column's values. Row grouping has been implemented using the "RowGroup" extension for datatables - https://datatables.net/extensions/rowgroup/. Datatable libraries and its extensions have been added under the directory - "www/datatables". The datatable library's license has been updated according to version 1.13.2, which was previously not updated. The related row grouping extension's license has also been included. Change-Id: If2b7ed6e2a6d605553242a7db4dbeaa7fcae4606 Reviewed-on: http://gerrit.cloudera.org:8080/22226 Reviewed-by: Impala Public Jenkins Tested-by: Impala Public Jenkins --- .gitattributes | 11 +--- LICENSE.txt | 60 +++++++++++++----- bin/rat_exclude_files.txt | 3 +- www/common-header.tmpl | 4 +- .../css/dataTables.bootstrap.css | 0 .../css/dataTables.bootstrap.min.css | 0 .../css/dataTables.bootstrap4.css | 0 .../css/dataTables.bootstrap4.min.css | 0 .../css/dataTables.bootstrap5.css | 0 .../css/dataTables.bootstrap5.min.css | 0 .../css/dataTables.bulma.css | 0 .../css/dataTables.bulma.min.css | 0 .../css/dataTables.dataTables.css | 0 .../css/dataTables.dataTables.min.css | 0 .../css/dataTables.foundation.css | 0 .../css/dataTables.foundation.min.css | 0 .../css/dataTables.jqueryui.css | 0 .../css/dataTables.jqueryui.min.css | 0 .../css/dataTables.semanticui.css | 0 .../css/dataTables.semanticui.min.css | 0 .../css/jquery.dataTables.css | 0 .../css/jquery.dataTables.min.css | 0 .../DataTables-1.13.2}/datatables-1.13.2.css | 0 .../DataTables-1.13.2}/datatables-1.13.2.js | 0 .../DataTables-1.13.2/datatables.min.css} | 0 .../DataTables-1.13.2/datatables.min.js} | 0 .../DataTables-1.13.2/images/sort_asc.png | Bin .../images/sort_asc_disabled.png | Bin .../DataTables-1.13.2/images/sort_both.png | Bin .../DataTables-1.13.2/images/sort_desc.png | Bin .../images/sort_desc_disabled.png | Bin .../js/dataTables.bootstrap.js | 0 .../js/dataTables.bootstrap.min.js | 0 .../js/dataTables.bootstrap4.js | 0 .../js/dataTables.bootstrap4.min.js | 0 .../js/dataTables.bootstrap5.js | 0 .../js/dataTables.bootstrap5.min.js | 0 .../DataTables-1.13.2/js/dataTables.bulma.js | 0 .../js/dataTables.bulma.min.js | 0 .../js/dataTables.dataTables.js | 0 .../js/dataTables.dataTables.min.js | 0 .../js/dataTables.foundation.js | 0 .../js/dataTables.foundation.min.js | 0 .../js/dataTables.jqueryui.js | 0 .../js/dataTables.jqueryui.min.js | 0 .../js/dataTables.semanticui.js | 0 .../js/dataTables.semanticui.min.js | 0 .../DataTables-1.13.2/js/jquery.dataTables.js | 0 .../js/jquery.dataTables.min.js | 0 .../dataTables.rowGroup-1.5.1.min.css | 1 + .../dataTables.rowGroup-1.5.1.min.js | 4 ++ www/query_finstances.tmpl | 7 ++ 52 files changed, 61 insertions(+), 29 deletions(-) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.bootstrap.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.bootstrap.min.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.bootstrap4.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.bootstrap4.min.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.bootstrap5.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.bootstrap5.min.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.bulma.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.bulma.min.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.dataTables.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.dataTables.min.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.foundation.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.foundation.min.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.jqueryui.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.jqueryui.min.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.semanticui.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/dataTables.semanticui.min.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/jquery.dataTables.css (100%) rename www/{ => datatables}/DataTables-1.13.2/css/jquery.dataTables.min.css (100%) rename www/{ => datatables/DataTables-1.13.2}/datatables-1.13.2.css (100%) rename www/{ => datatables/DataTables-1.13.2}/datatables-1.13.2.js (100%) rename www/{datatables-1.13.2.min.css => datatables/DataTables-1.13.2/datatables.min.css} (100%) rename www/{datatables-1.13.2.min.js => datatables/DataTables-1.13.2/datatables.min.js} (100%) rename www/{ => datatables}/DataTables-1.13.2/images/sort_asc.png (100%) rename www/{ => datatables}/DataTables-1.13.2/images/sort_asc_disabled.png (100%) rename www/{ => datatables}/DataTables-1.13.2/images/sort_both.png (100%) rename www/{ => datatables}/DataTables-1.13.2/images/sort_desc.png (100%) rename www/{ => datatables}/DataTables-1.13.2/images/sort_desc_disabled.png (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.bootstrap.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.bootstrap.min.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.bootstrap4.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.bootstrap4.min.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.bootstrap5.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.bootstrap5.min.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.bulma.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.bulma.min.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.dataTables.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.dataTables.min.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.foundation.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.foundation.min.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.jqueryui.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.jqueryui.min.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.semanticui.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/dataTables.semanticui.min.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/jquery.dataTables.js (100%) rename www/{ => datatables}/DataTables-1.13.2/js/jquery.dataTables.min.js (100%) create mode 100644 www/datatables/extensions/dataTables.rowGroup-1.5.1.min.css create mode 100644 www/datatables/extensions/dataTables.rowGroup-1.5.1.min.js diff --git a/.gitattributes b/.gitattributes index f70c8577f..59138a0db 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,15 +20,8 @@ www/c3/c3.v7.min.css binary www/d3.v3.min.js binary www/d3.v5.min.js binary www/dagre-d3.min.js binary -www/DataTables-1.10.18/js/dataTables.bootstrap.min.js binary -www/DataTables-1.10.18/js/dataTables.bootstrap4.min.js biinary -www/DataTables-1.10.18/js/dataTables.foundation.min.js binary -www/DataTables-1.10.18/js/dataTables.jqueryui.min.js binary -www/DataTables-1.10.18/js/dataTables.semanticui.min.js binary -www/DataTables-1.10.18/js/jquery.dataTables.min.js binary -www/datatables.min.js binary -www/datatables-1.13.2.min.js binary -www/datatables-1.13.2.min.css binary +www/datatables/**/*.min.js binary +www/datatables/**/*.min.css binary www/highlight/highlight.pack.js binary www/jquery/jquery-3.5.1.min.js binary www/pako.min.js binary \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index c635ed9d7..0d18ee89e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -373,26 +373,27 @@ www/jquery/: MIT license -------------------------------------------------------------------------------- -www/DataTables* and www/datatables*: MIT license +www/datatables/DataTables-1.13.2*: MIT license - Copyright (C) 2008-2016, SpryMedia Ltd. +The MIT License (MIT) - Permission is hereby granted, free of charge, to any person obtaining a copy of this - software and associated documentation files (the "Software"), to deal in the Software - without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to the following - conditions: +Copyright (C) 2008-present, SpryMedia Ltd. - The above copyright notice and this permission notice shall be included in all copies or - substantial portions of the Software. +Permission is hereby granted, free of charge, to any person obtaining a copy of this +software and associated documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the following conditions: - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. +The above copyright notice and this permission notice shall be included in all copies or +substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- @@ -1161,3 +1162,30 @@ The CRoaring project is under a dual license (Apache/MIT). Users of the library may choose one or the other license. -------------------------------------------------------------------------------- + +www/datatables/extensions/dataTables.rowGroup*: MIT license + +MIT license + +Copyright (c) 2017 SpryMedia Limited +http://datatables.net + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +-------------------------------------------------------------------------------- \ No newline at end of file diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt index 439ff684e..c72de9099 100644 --- a/bin/rat_exclude_files.txt +++ b/bin/rat_exclude_files.txt @@ -44,8 +44,7 @@ www/c3/* www/Chart* www/d3.v3.min.js www/d3.v5.min.js -www/DataTables*/* -www/datatables-*.* +www/datatables/* www/favicon.ico www/highlight/* www/icons/* diff --git a/www/common-header.tmpl b/www/common-header.tmpl index 59a8db5b5..5d0783f01 100644 --- a/www/common-header.tmpl +++ b/www/common-header.tmpl @@ -24,8 +24,8 @@ common-footer.tmpl) }} - - + +