Commit a9b1cf29 authored by Giannis Tsapelas's avatar Giannis Tsapelas
Browse files

updates for join and aggregation

parent faed33ff
...@@ -2,10 +2,10 @@ AGGREGATES = ( ...@@ -2,10 +2,10 @@ AGGREGATES = (
('', '(No aggregate)', ['FLOAT', 'INT', 'STRING', 'TIMESTAMP', 'DOUBLE', 'BYTE', 'BOOL']), ('', '(No aggregate)', ['FLOAT', 'INT', 'STRING', 'TIMESTAMP', 'DOUBLE', 'BYTE', 'BOOL']),
('AVG', 'Average', ['FLOAT', 'INT', 'DOUBLE', 'BYTE']), ('AVG', 'Average', ['FLOAT', 'INT', 'DOUBLE', 'BYTE']),
('SUM', 'Sum', ['FLOAT', 'INT', 'DOUBLE', 'BYTE']), ('SUM', 'Sum', ['FLOAT', 'INT', 'DOUBLE', 'BYTE']),
('COUNT', 'Count', ['FLOAT', 'INT', 'STRING', 'TIMESTAMP', 'DOUBLE', 'BYTE']),
('MIN', 'Minimum', ['FLOAT', 'INT', 'STRING', 'DOUBLE', 'BYTE']), ('MIN', 'Minimum', ['FLOAT', 'INT', 'STRING', 'DOUBLE', 'BYTE']),
('MAX', 'Maximum', ['FLOAT', 'INT', 'STRING', 'DOUBLE', 'BYTE']), ('MAX', 'Maximum', ['FLOAT', 'INT', 'STRING', 'DOUBLE', 'BYTE']),
('ANY_VALUE', 'Any Value', ['FLOAT', 'INT', 'STRING', 'TIMESTAMP', 'DOUBLE', 'BYTE', 'BOOL']), ('ANY_VALUE', 'Any Value', ['FLOAT', 'INT', 'STRING', 'TIMESTAMP', 'DOUBLE', 'BYTE', 'BOOL']),
('COUNT', 'Count', ['FLOAT', 'INT', 'STRING', 'TIMESTAMP', 'DOUBLE', 'BYTE']),
('PERCENTILE_CONT_10', "Percentile 10%", ['FLOAT', 'INT', 'DOUBLE', 'BYTE']), ('PERCENTILE_CONT_10', "Percentile 10%", ['FLOAT', 'INT', 'DOUBLE', 'BYTE']),
('PERCENTILE_CONT_25', "Percentile 25%", ['FLOAT', 'INT', 'DOUBLE', 'BYTE']), ('PERCENTILE_CONT_25', "Percentile 25%", ['FLOAT', 'INT', 'DOUBLE', 'BYTE']),
('PERCENTILE_CONT_50', "Median", ['FLOAT', 'INT', 'DOUBLE', 'BYTE']), ('PERCENTILE_CONT_50', "Median", ['FLOAT', 'INT', 'DOUBLE', 'BYTE']),
......
...@@ -249,8 +249,8 @@ $(document).ready(function() { ...@@ -249,8 +249,8 @@ $(document).ready(function() {
// HERE WE SET RESOLUTIONS AUTOMATICALLY FOR JOINS!!! // HERE WE SET RESOLUTIONS AUTOMATICALLY FOR JOINS!!!
// $('#temporal_resolution').val('hour'); $('#temporal_resolution').val('hour');
// $('#temporal_resolution').trigger('change'); $('#temporal_resolution').trigger('change');
// $('#spatial_resolution').val('0.1'); // $('#spatial_resolution').val('0.1');
// $('#spatial_resolution').trigger('change'); // $('#spatial_resolution').trigger('change');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment