-
+
-
@@ -157,10 +236,12 @@
-
+
+
+
-
+
@@ -172,11 +253,16 @@
+
+
+
+
+
diff --git a/src/_site/mapping_parser.js b/src/_site/mapping_parser.js
new file mode 100644
index 00000000..bc5587a3
--- /dev/null
+++ b/src/_site/mapping_parser.js
@@ -0,0 +1,52 @@
+
+var MappingParser = function(data) {
+
+ var parsedMapping = parseMapping(data);
+ this.mapping = parsedMapping;
+}
+
+
+function parseMapping(mapping){
+ var indexToTypeToFields = {};
+ for(index in mapping){
+ var types = mapping[index]["mappings"];
+ var typeToFields = {};
+ for(type in types){
+ var fields = types[type]["properties"];
+ fieldsFlatten = {};
+ getFieldsRecursive(fields,fieldsFlatten,"");
+ typeToFields[type] = fieldsFlatten;
+ }
+
+ indexToTypeToFields[index] = typeToFields;
+ }
+ return indexToTypeToFields;
+}
+
+function getFieldsRecursive(fields,fieldsFlatten,prefix){
+ for(field in fields){
+ var fieldMapping = fields[field];
+ if("type" in fieldMapping){
+ fieldsFlatten[prefix+field] = fieldMapping;
+ }
+ if(!("type" in fieldMapping) || fieldMapping.type == "nested") {
+ getFieldsRecursive(fieldMapping["properties"],fieldsFlatten,prefix+field+".");
+ }
+ }
+}
+
+MappingParser.prototype.getIndices = function() {
+ return Object.keys(this.mapping);
+};
+
+MappingParser.prototype.getTypes = function(index) {
+ return Object.keys(this.mapping[index]);
+};
+
+MappingParser.prototype.getFieldsForType = function(index,type) {
+ return Object.keys(this.mapping[index][type]);
+};
+MappingParser.prototype.getFieldsForTypeWithMapping = function(index,type) {
+ return this.mapping[index][type];
+};
+
diff --git a/src/_site/query.js b/src/_site/query.js
index 94505500..e4c754b6 100644
--- a/src/_site/query.js
+++ b/src/_site/query.js
@@ -1,151 +1,457 @@
/* ResultHandlerFactory
-Returns the right Result Handler depend
-on the results */
+ Returns the right Result Handler depend
+ on the results */
var ResultHandlerFactory = {
- "create": function(data) {
+ "create": function(data,isFlat,showScore,showType,showId) {
+ function isSearch(){
+ return "hits" in data
+ }
+ // Is query is of aggregation type? (SQL group by)
+ function isAggregation() {
+ return "aggregations" in data
+ }
+ function isDelete(){
+ return "_indices" in data
+ }
- // Is query is of aggregation type? (SQL group by)
- function isAggregation() {
- return "aggregations" in data
- }
+ if(isSearch()){
+ return isAggregation() ? new AggregationQueryResultHandler(data) :
+ new DefaultQueryResultHandler(data,isFlat,showScore,showType,showId)
+ }
- return isAggregation() ? new AggregationQueryResultHandler(data) : new DefaultQueryResultHandler(data)
- }
+ if(isDelete()){
+ return new DeleteQueryResultHandler(data);
+ }
+ return new ShowQueryResultHandler(data);
+
+ }
}
/* DefaultQueryResultHandler object
-Handle the query result,
-in case of regular query
-(Not aggregation)
-*/
-var DefaultQueryResultHandler = function(data) {
-
- // createScheme by traverse hits field
- function createScheme() {
- var hits = data.hits.hits
- scheme = []
- for(index=0; index
1)
+ row[field] = fieldValue;
+ else row[field] = fieldValue[0];
+ }
+ else {
+ row[field] = fieldValue;
+ }
+ }
+}
-
+function removeNestedAndFilters (aggs) {
+ for(field in aggs)
+ {
+ if (field.endsWith("@NESTED") || field.endsWith("@FILTER") || field.endsWith("@NESTED_REVERSED") || field.endsWith("@CHILDREN")){
+ delete aggs[field]["doc_count"];
+ delete aggs[field]["key"];
+ leftField = Object.keys(aggs[field])[0];
+ aggs[leftField] = aggs[field][leftField];
+ delete aggs[field];
+ removeNestedAndFilters(aggs);
+ }
+ if(typeof(aggs[field])=="object"){
+ removeNestedAndFilters(aggs[field]);
+ }
+ }
+}
/* AggregationQueryResultHandler object
-Handle the query result,
-in case of Aggregation query
-(SQL group by)
-*/
+ Handle the query result,
+ in case of Aggregation query
+ (SQL group by)
+ */
var AggregationQueryResultHandler = function(data) {
+ removeNestedAndFilters(data.aggregations);
+ function getRows(bucketName, bucket, additionalColumns) {
+ var rows = []
+
+ var subBuckets = getSubBuckets(bucket)
+ if(subBuckets.length > 0) {
+ for(var i = 0; i < subBuckets.length; i++) {
+ var subBucketName = subBuckets[i]["bucketName"];
+ var subBucket = subBuckets[i]["bucket"];
+
+ var newAdditionalColumns = {};
+ // bucket without parents.
+ if(bucketName != undefined) {
+ var newColumn = {};
+ newColumn[bucketName] = bucket.key;
+ newAdditionalColumns = $.extend(newColumn, additionalColumns);
+ }
+
+ var newRows = getRows(subBucketName, subBucket, newAdditionalColumns)
+ $.merge(rows, newRows);
+ }
+ }
- function getRows(bucketName, bucket, additionalColumns) {
- var rows = []
+ else { //zhongshu-comment 没有子bucket了，就是最里面的那一层了
+ var obj = $.extend({}, additionalColumns)
+ if(bucketName != undefined) {
+ if(bucketName != undefined) {
+ if("key_as_string" in bucket){
+ obj[bucketName] = bucket["key_as_string"] //zhongshu-comment 给字段取别名
+ }
+ else {
+ obj[bucketName] = bucket.key
+ }
+ }
+ }
+
+ for(var field in bucket) {
+
+ var bucketValue = bucket[field]
+ if(bucketValue.buckets != undefined ){ //zhongshu-comment 如果还有子bucket的话，那就继续递归
+ var newRows = getRows(subBucketName, bucketValue, newAdditionalColumns);
+ $.merge(rows, newRows);
+ continue;
+ }
+ if(bucketValue.value != undefined) {
+ if("value_as_string" in bucket[field]){
+ obj[field] = bucketValue["value_as_string"]
+ }
+ else {
+ obj[field] = bucketValue.value
+ }
+ }
+ else {
+ if(typeof(bucketValue)=="object"){
+ /*subBuckets = getSubBuckets(bucketValue);
+ if(subBuckets.length >0){
+ var newRows = getRows(subBucketName, {"buckets":subBuckets}, newAdditionalColumns);
+ $.merge(rows, newRows);
+ continue;
+ }*/
+
+
+ fillFieldsForSpecificAggregation(obj,bucketValue,field);
+
+ }
+ }
+ }
+ rows.push(obj)
+ }
+
+ return rows
+ }
- var subBuckets = getSubBuckets(bucket)
- if(subBuckets.length > 0) {
- for(var i = 0; i < subBuckets.length; i++) {
- var subBucketName = subBuckets[i]["bucketName"];
- var subBucket = subBuckets[i]["bucket"];
+ //zhongshu-comment 递归
+ function fillFieldsForSpecificAggregation(obj,value,field)
+ {
+
+ for(key in value){
+ if(key == "values"){
+ fillFieldsForSpecificAggregation(obj,value[key],field);
+ }
+ else {
+ obj[field+"." +key] = value[key];
+ }
+ }
+ return;
+ }
- var newAdditionalColumns = {};
- // bucket without parents.
- if(bucketName != undefined) {
- var newColumn = {};
- newColumn[bucketName] = bucket.key;
- newAdditionalColumns = $.extend(newColumn, additionalColumns);
+ //zhongshu-comment 递归
+ function getSubBuckets(bucket) {
+ var subBuckets = [];
+ for(var field in bucket) {
+ var buckets = bucket[field].buckets
+ if(buckets != undefined) {
+ for(var i = 0; i < buckets.length; i++) {
+ subBuckets.push({"bucketName": field, "bucket": buckets[i]})
+ }
+ }
+ else {
+ innerAgg = bucket[field]; //zhongshu-comment innerAgg这个变量是哪来的，貌似没声明，到时问问松哥
+ for(var innerField in innerAgg){
+ if(typeof(innerAgg[innerField])=="object"){
+ innerBuckets = getSubBuckets(innerAgg[innerField]);
+ $.merge(subBuckets,innerBuckets);
+ }
+ }
+ }
}
- var newRows = getRows(subBucketName, subBucket, newAdditionalColumns)
- $.merge(rows, newRows);
- }
+ return subBuckets
}
- else {
- var obj = $.extend({}, additionalColumns)
- if(bucketName != undefined) {
- obj[bucketName] = bucket.key
- }
- for(var field in bucket) {
- if(bucket[field].value != undefined) {
- obj[field] = bucket[field].value
- }
- else {
- continue;
+ this.data = data
+ this.flattenBuckets = getRows(undefined, data.aggregations, {}) //zhongshu-comment 入口
+};
+
+AggregationQueryResultHandler.prototype.getHead = function() {
+ head = []
+ for(var i = 0; i < this.flattenBuckets.length; i++) {
+ var keys = Object.keys(this.flattenBuckets[i])
+ for(var j = 0; j < keys.length; j++) {
+ if($.inArray(keys[j], head) == -1) {
+ head.push(keys[j])
+ }
}
- }
- rows.push(obj)
}
+ return head
+};
+
+AggregationQueryResultHandler.prototype.getBody = function() {
+ return this.flattenBuckets
+};
+
+
+AggregationQueryResultHandler.prototype.getTotal = function() {
+ return undefined;
+};
+
+AggregationQueryResultHandler.prototype.getCurrentHitsSize = function() {
+ return this.flattenBuckets.length;
+};
- return rows
- }
- function getSubBuckets(bucket) {
- var subBuckets = [];
- for(var field in bucket) {
- var buckets = bucket[field].buckets
- if(buckets != undefined) {
- for(var i = 0; i < buckets.length; i++) {
- subBuckets.push({"bucketName": field, "bucket": buckets[i]})
+
+/* ShowQueryResultHandler object
+ for showing mapping in some levels (cluster, index and types)
+ */
+var ShowQueryResultHandler = function(data) {
+
+ var mappingParser = new MappingParser(data);
+ var indices = mappingParser.getIndices();
+ body = [];
+ if(indices.length > 1){
+ this.head = ["index","types"];
+ for(indexOfIndex in indices){
+ var indexToTypes = {};
+ var index = indices[indexOfIndex]
+ indexToTypes["index"] = index;
+ indexToTypes["types"] = mappingParser.getTypes(index);
+ body.push(indexToTypes);
+ }
+ }
+ else {
+ var index = indices[0];
+ var types = mappingParser.getTypes(index);
+ if(types.length > 1) {
+ this.head = ["type","fields"];
+ for(typeIndex in types){
+ var typeToFields = {};
+ var type = types[typeIndex];
+ typeToFields["type"] = type;
+ typeToFields["fields"] = mappingParser.getFieldsForType(index,type);
+ body.push(typeToFields)
+ }
+ }
+ else {
+ this.head = ["field","type"];
+ anyFieldContainsMore = false;
+ fieldsWithMapping = mappingParser.getFieldsForTypeWithMapping(index,types[0]);
+ for(field in fieldsWithMapping){
+ fieldRow = {};
+ fieldMapping = fieldsWithMapping[field];
+ fieldRow["field"] = field;
+ fieldRow["type"] = fieldMapping["type"];
+ delete fieldMapping["type"];
+ if(!$.isEmptyObject(fieldMapping)){
+ anyFieldContainsMore = true;
+ fieldRow["more"] = fieldMapping;
+ }
+ body.push(fieldRow);
+ }
+ if(anyFieldContainsMore) this.head.push("more");
+
}
- }
}
- return subBuckets
- }
-
+ this.body = body;
- this.data = data
- this.flattenBuckets = getRows(undefined, data.aggregations, {})
};
-AggregationQueryResultHandler.prototype.getHead = function() {
- head = []
- for(var i = 0; i < this.flattenBuckets.length; i++) {
- var keys = Object.keys(this.flattenBuckets[i])
- for(var j = 0; j < keys.length; j++) {
- if($.inArray(keys[j], head) == -1) {
- head.push(keys[j])
- }
+
+ShowQueryResultHandler.prototype.getHead = function() {
+ return this.head
+};
+
+ShowQueryResultHandler.prototype.getBody = function() {
+ return this.body;
+};
+
+ShowQueryResultHandler.prototype.getTotal = function() {
+ return this.body.length;
+};
+
+ShowQueryResultHandler.prototype.getCurrentHitsSize = function() {
+ return this.body.length;
+};
+
+
+/* DeleteQueryResultHandler object
+ to show delete result status
+ */
+var DeleteQueryResultHandler = function(data) {
+ this.head = ["index_deleted_from","shards_successful","shards_failed"];
+ body = []
+ deleteData = data["_indices"];
+ for(index in deleteData){
+ deleteStat = {};
+ deleteStat["index_deleted_from"] = index;
+ shardsData = deleteData[index]["_shards"];
+ deleteStat["shards_successful"] = shardsData["successful"];
+ deleteStat["shards_failed"] = shardsData["failed"];
+ body.push(deleteStat);
}
- }
- return head
+ this.body = body;
+
};
-AggregationQueryResultHandler.prototype.getBody = function() {
- return this.flattenBuckets
+
+DeleteQueryResultHandler.prototype.getHead = function() {
+ return this.head;
};
+DeleteQueryResultHandler.prototype.getBody = function() {
+ return this.body;
+};
+
+DeleteQueryResultHandler.prototype.getTotal = function() {
+ return 1;
+};
+
+DeleteQueryResultHandler.prototype.getCurrentHitsSize = function() {
+ return 1;
+};
diff --git a/src/_site/style.css b/src/_site/style.css
index 83d333af..3c7130f2 100644
--- a/src/_site/style.css
+++ b/src/_site/style.css
@@ -116,6 +116,13 @@ body {
margin-top: 10px;
}
+#exportCSV {
+ float:left;
+ margin-top: 10px;
+ height: 100%;
+}
+
+
.explain-button {
float:right;
margin-right: 25px;
@@ -123,6 +130,13 @@ body {
}
+.next-button {
+ float:left;
+ margin-left:5px;
+ margin-top: 10px;
+}
+
+
.keyboardSection {
margin-top:35px;
}
@@ -153,10 +167,17 @@ body {
/* Initial state when showing */
.fadein.ng-hide {
- opacity: 0;
+ -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0s;
+ -moz-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0s;
+ -o-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0s;
+ transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0s;
+ opacity: 0;
}
+
+
+
/* Loading button animation */
.glyphicon-refresh-animate {
-animation: spin .7s infinite linear;
@@ -171,4 +192,53 @@ body {
@keyframes spin {
from { transform: scale(1) rotate(0deg);}
to { transform: scale(1) rotate(360deg);}
+}
+
+/* result options */
+
+.result_options {
+ padding-top: 2%;
+}
+.delimiter {
+ display: inline;
+ width: 20%;
+ margin-left: 10%;
+}
+
+.delimiterLable {
+ font-weight: 100;
+}
+
+.scrollSize {
+ display: inline;
+ width: 30%;
+ margin-left: 10%;
+}
+
+.scrollSizeLable {
+ font-weight: 100;
+}
+
+#searchResultZone{
+ width: 80%;
+}
+
+/* accordion */
+.panel-heading .accordion-toggle:after {
+ /* symbol for "opening" panels */
+ font-family: 'Glyphicons Halflings'; /* essential for enabling glyphicon */
+ content: "\e114"; /* adjust as needed, taken from bootstrap.css */
+ float: right; /* adjust as needed */
+ color: grey; /* adjust as needed */
+}
+.panel-heading .accordion-toggle.collapsed:after {
+ /* symbol for "collapsed" panels */
+ content: "\e080"; /* adjust as needed, taken from bootstrap.css */
+}
+
+.rotate-glyph {
+ -webkit-transform:rotate(90deg) scaleX(1.5) ;
+ -moz-transform:rotate(90deg) scaleX(1.5) ;
+ -o-transform:rotate(90deg) scaleX(1.5) ;
+ -ms-transform:rotate(90deg) scaleX(1.5);
}
\ No newline at end of file
diff --git a/src/_site/table_presenter.js b/src/_site/table_presenter.js
new file mode 100644
index 00000000..91143b49
--- /dev/null
+++ b/src/_site/table_presenter.js
@@ -0,0 +1,101 @@
+
+var TablePresenter = function(tableId,tableZoneSelector) {
+ this.tableId = tableId;
+ this.tableSelector = "#"+tableId;
+ this.tableZoneSelector = tableZoneSelector;
+ this.oldTable = false;
+ this.table = undefined;
+}
+
+TablePresenter.prototype.addRows = function(rows) {
+ if(this.oldTable) return;
+ this.table.rows.add(createRows(rows)).draw();
+};
+
+
+
+TablePresenter.prototype.createOrReplace = function(columns,rows) {
+ if(this.oldTable) return;
+
+ clearTableIfNeeded(this.table,this.tableZoneSelector,this.tableId);
+
+ dataTablesColumns = createColumns(columns);
+
+ dataTableRows = createRows(rows);
+
+ this.table = $(this.tableSelector).DataTable(
+ {
+ "aaData": dataTableRows,
+ "aoColumns": dataTablesColumns,
+ "destroy": true,
+ "scrollX": true,
+ "order": [],
+ "lengthMenu": [[10, 25, 50,100, -1], [10, 25, 50,100, "All"]]
+ });
+};
+
+TablePresenter.prototype.destroy = function() {
+ clearTableIfNeeded(this.table,this.tableZoneSelector,this.tableId);
+};
+
+TablePresenter.prototype.changeTableType = function(old,$compile,$scope){
+ if(old) {
+ createOldTable(this.tableZoneSelector,this.tableId ,$compile,$scope);
+ this.oldTable = true;
+ }
+ else {
+ this.oldTable = false;
+ }
+}
+
+
+function clearTableIfNeeded(table,tableZoneSelector,tableId){
+ if(table != undefined){
+ table.clear();
+ $(tableZoneSelector).empty();
+ $(tableZoneSelector).html('');
+ }
+}
+
+function createColumns(columns){
+ dataTablesColumns = [];
+
+ for(i = 0 ; i < columns.length ; i++){
+ var column = columns[i];
+ dataTableColumn = {}
+ dataTableColumn["data"] = column.replace(/\./g,"&");
+ dataTableColumn["sTitle"] = column;
+ dataTableColumn["defaultContent"]="";
+
+ dataTableColumn["render"] = function(data,type,row){
+ if(typeof(data)=="object")
+ return JSON.stringify(data);
+ else
+ return data;
+ }
+
+ dataTablesColumns.push(dataTableColumn);
+ }
+ return dataTablesColumns;
+}
+function createRows(rows){
+ dataTableRows = [];
+ for(i =0;i';
+ html = html + '| {{column}} |
|---|
';
+ html += ' | {{row[column]}} |
'
+ $(tableZoneSelector).html($compile(html)($scope));
+
+}
diff --git a/src/_site/tests/SpecRunner.html b/src/_site/tests/SpecRunner.html
index ed1fe938..ef9fa09b 100644
--- a/src/_site/tests/SpecRunner.html
+++ b/src/_site/tests/SpecRunner.html
@@ -12,6 +12,7 @@
+
@@ -20,12 +21,18 @@
+
+
+