Revert "[ASTERIXDB-2514] Fix BigInt display in formatted JSON"
This reverts commit 845615ae954b01aede9fa0e90a09093f44ccaaec.
Reason for revert:
This change breaks rendering of results that contain timestamps, e.g.
select value "Mon Nov 18 14:26:00 PST 2019";
Change-Id: I98e2b9ae07459b99408f2d4bf59182556b42265b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5063
Reviewed-by: Murtadha Hubail <mhubail@apache.org>
Reviewed-by: Ian Maxon <imaxon@uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
diff --git a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
index 31448ee..1157c27 100644
--- a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
@@ -181,14 +181,7 @@
if (results[iter1].length < 1) {
continue;
}
- var str_obj = results[iter1].replace(/:\s*(\d+)([\s,])/g, ': "#bigint#$1#bigint#"$2');
- resultJSON = JSON.parse(str_obj, (key, value) => {
- if (/^#bigint#\d+#bigint#/g.test(value)) {
- value = value.substring(8, value.length - 8);
- return BigInt(value);
- }
- return value;
- });
+ var resultJSON = $.parseJSON(results[iter1]);
$(this).append($('<div/>').attr("id", "json-record"+idx+"-"+iter1));
$('#json-record'+idx+"-"+iter1).jsonViewer(resultJSON, {collapsed: true, level: 10});
}
diff --git a/asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js b/asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js
index f31b555..5e8a79e 100644
--- a/asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js
+++ b/asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js
@@ -56,7 +56,10 @@
else
html += '<span class="json-string">"' + json + '"</span>';
}
- else if (typeof json === 'number' || typeof json === 'boolean' || typeof json === 'bigint') {
+ else if (typeof json === 'number') {
+ html += '<span class="json-literal">' + json + '</span>';
+ }
+ else if (typeof json === 'boolean') {
html += '<span class="json-literal">' + json + '</span>';
}
else if (json === null) {
@@ -108,8 +111,6 @@
else {
html += '{}';
}
- } else {
- html += '<span class="json-literal">' + json + '</span>';
}
return html;
}