src/java/m/timeseries/query/V1_0.java
| @@ -186,19 +186,18 @@ |
| Aggregates.match(new Document("location_id", locationDoc.getString("_id"))), |
| Aggregates.unwind("$data"), |
| //Aggregates.project(project) |
| - Aggregates.match(datesQuery), |
| + Aggregates.match(datesQuery) |
| // Wind array back |
| - new Document("$group", group) |
| + // new Document("$group", group) |
| ); |
| |
| AggregateIterable<Document> iter = c.aggregate(aggList).allowDiskUse(true); |
| for (Document d : iter) { |
| - filtered = (List<List<Object>>) d.get("data"); |
| + List<Object> row = (List<Object>) d.get("data"); |
| // Fix date formatting |
| - for (List<Object> objList : filtered) { |
| - Date dt = (Date) objList.get(0); |
| - objList.set(0, ft.format(dt)); |
| - } |
| + Date dt = (Date) row.get(0); |
| + row.set(0, ft.format(dt)); |
| + filtered.add(row); |
| } |
| |
| if (compute_stats || compute_stats_local) { |
test/service_tests/m/query/big_data/query-big-req.json
| @@ -5,10 +5,10 @@ |
| "value": "mongodb://eds0.engr.colostate.edu:27017/csip_timeseries" |
| }, { |
| "name": "mongo_collection", |
| - "value": "test_coll" |
| + "value": "bigdata test series" |
| }, { |
| "name": "search_id", |
| - "value": "big_data" |
| + "value": "big_yearlychunks" |
| }, { |
| "name": "metadata_only", |
| "value": false |