diff options
author | Kunal Khatua <kkhatua@maprtech.com> | 2019-03-13 10:52:53 -0700 |
---|---|---|
committer | Sorabh Hamirwasia <sorabh@apache.org> | 2019-03-14 15:36:10 -0700 |
commit | 17bbcd5d87ded96a1c425ecf0e3358bfa5d5c430 (patch) | |
tree | ad6f07ac8e1616857110ea6c56dc6900d0ed310a | |
parent | 5c935b762dc630d4016005bbe4d42f5bbf5a920d (diff) |
DRILL-7061: Disable LIMIT Rows Option
Freemarker by default introduces a comma in numeric values greater than 999. This corrects that by removing the ',' in the default limit size.
However, since a Server-side implementation is in progress (DRILL-6960 and DRILL-7048), it is best to disable this for now. The latest commit in this will hide those capabilities in the WebUI until the server-side feature goes in.
X
closes #1689
-rw-r--r-- | exec/java-exec/src/main/resources/rest/query/query.ftl | 3 | ||||
-rw-r--r-- | exec/java-exec/src/main/resources/rest/static/js/querySubmission.js | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/exec/java-exec/src/main/resources/rest/query/query.ftl b/exec/java-exec/src/main/resources/rest/query/query.ftl index c4d321c95..670f1df58 100644 --- a/exec/java-exec/src/main/resources/rest/query/query.ftl +++ b/exec/java-exec/src/main/resources/rest/query/query.ftl @@ -82,7 +82,8 @@ <button class="btn btn-default" type="button" onclick="<#if model.isOnlyImpersonationEnabled()>doSubmitQueryWithUserName()<#else>doSubmitQueryWithAutoLimit()</#if>"> Submit </button> - <input type="checkbox" name="forceLimit" value="limit" <#if model.isAutoLimitEnabled()>checked</#if>> Limit results to <input type="text" id="queryLimit" min="0" value="${model.getDefaultRowsAutoLimited()}" size="6" pattern="[0-9]*"> rows <span class="glyphicon glyphicon-info-sign" onclick="alert('Limits the number of records retrieved in the query')" style="cursor:pointer"></span> + <!-- DISABLED: See DRILL-7061 (PR #1689) --> + <!--input type="checkbox" name="forceLimit" value="limit" <#if model.isAutoLimitEnabled()>checked</#if>> Limit results to <input type="text" id="queryLimit" min="0" value="${model.getDefaultRowsAutoLimited()?c}" size="6" pattern="[0-9]*"> rows <span class="glyphicon glyphicon-info-sign" onclick="alert('Limits the number of records retrieved in the query')" style="cursor:pointer"></span --> </form> <script> diff --git a/exec/java-exec/src/main/resources/rest/static/js/querySubmission.js b/exec/java-exec/src/main/resources/rest/static/js/querySubmission.js index a3cc8bce1..51fa63c3f 100644 --- a/exec/java-exec/src/main/resources/rest/static/js/querySubmission.js +++ b/exec/java-exec/src/main/resources/rest/static/js/querySubmission.js @@ -59,6 +59,7 @@ function doSubmitQueryWithAutoLimit() { $("#query").focus(); return; } + /** DISABLED : See DRILL-7061 (PR #1689) //Wrap if required let mustWrapWithLimit = $('input[name="forceLimit"]:checked').length > 0; //Clear field when submitting if not mustWrapWithLimit @@ -76,6 +77,7 @@ function doSubmitQueryWithAutoLimit() { return; } } + */ //Submit query submitQuery(); } |