Commit Graph

3759 Commits

Author SHA1 Message Date
Gian Merlino 96be9faec7 [maven-release-plugin] prepare release druid-0.6.124 2014-06-16 16:37:59 -07:00
Gian Merlino 2a88f8c4ce Downgrade guice to 4.0-beta. 2014-06-16 16:36:05 -07:00
fjy ce61e60ee8 all manners of new tests 2014-06-16 16:19:26 -07:00
fjy c2149f8a00 add more tests for time boundary and caching 2014-06-16 15:32:28 -07:00
fjy d01be2f85b revert submodule code 2014-06-16 15:04:42 -07:00
fjy a71f7152a5 fix broken UT 2014-06-16 14:53:26 -07:00
xvrl 1b99553394 Merge pull request #603 from metamx/max-min-time
enable tb to return just max or min time
2014-06-16 14:31:35 -07:00
fjy 5aa46d08a8 address cr 2014-06-16 14:24:36 -07:00
fjy 9ca4f564ee address cr 2014-06-16 14:20:16 -07:00
fjy 08c88e8fb7 address cr 2014-06-16 14:07:10 -07:00
fjy d2cf7d3f0a address cr 2014-06-16 14:00:01 -07:00
fjy d4a47fe6e8 enable tb to return just max or min time 2014-06-16 13:45:32 -07:00
Xavier Léauté a5c533dcab [maven-release-plugin] prepare for next development iteration 2014-06-13 15:17:00 -07:00
Xavier Léauté 903f1a695f [maven-release-plugin] prepare release druid-0.6.123 2014-06-13 15:16:36 -07:00
fjy 0fd57dbc75 [maven-release-plugin] prepare for next development iteration 2014-06-13 15:05:18 -07:00
fjy bcc6e77919 [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 15:05:14 -07:00
Xavier Léauté b7b28ad2f9 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 15:03:03 -07:00
Xavier Léauté 695a2946a9 [maven-release-plugin] prepare for next development iteration 2014-06-13 15:01:13 -07:00
Xavier Léauté 83b2434cad [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 15:01:09 -07:00
Xavier Léauté bd18fef474 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 14:57:31 -07:00
Xavier Léauté 1159e2e415 [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 14:56:12 -07:00
Xavier Léauté 6505f82053 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 14:54:23 -07:00
Xavier Léauté f6d319dac2 [maven-release-plugin] prepare for next development iteration 2014-06-13 14:46:08 -07:00
Xavier Léauté 394d0cfbca [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 14:45:43 -07:00
fjy d5d2873d3c Merge pull request #593 from metamx/fix-groupyb
Support all standard Druid functions in GroupBy and nested groupBy
2014-06-13 15:37:55 -06:00
fjy c378dccffe Merge pull request #598 from metamx/fix-bysegment
fix BySegmentQueryRunner
2014-06-13 14:48:39 -06:00
Xavier Léauté 93f97a5d86 fix bysegment-query-runner 2014-06-13 13:20:14 -07:00
fjy 8246d42715 Merge branch 'master' into new-guava 2014-06-13 11:44:05 -07:00
Xavier Léauté 294a9ba78f fix same race condition in other test 2014-06-13 11:42:19 -07:00
fjy 332ba3ef20 fix bad merge 2014-06-13 11:36:36 -07:00
fjy 4cc0353be2 Merge branch 'master' of github.com:metamx/druid into new-guava 2014-06-13 11:30:07 -07:00
fjy 5bd4ad3f0f address code review 2014-06-13 11:29:49 -07:00
Xavier Léauté 4c4047165f fix query cancellation test race condition 2014-06-13 11:28:48 -07:00
fjy a63cda3281 Merge branch 'master' into new-guava
Conflicts:
	server/src/main/java/io/druid/server/QueryResource.java
2014-06-13 10:08:10 -07:00
Xavier Léauté b2419b1530 fix missing return statement 2014-06-12 17:09:21 -07:00
fjy f06a85ec26 Merge pull request #597 from metamx/fix-yielder-close
avoid closing yielder prematurely
2014-06-12 17:05:53 -06:00
Xavier Léauté 8f7c82d351 avoid closing yielder prematurely 2014-06-12 16:00:06 -07:00
Xavier Léauté bfa3caa589 js/cardinality/hyperUnique happy groupBy family 2014-06-12 15:19:01 -07:00
Xavier Léauté fd47efd59e fix cardinality combining factory 2014-06-12 15:19:01 -07:00
Xavier Léauté 150480bdf9 complexmetricserde workaround for groupby 2014-06-12 15:19:01 -07:00
fjy e84bcca40f rename method 2014-06-12 13:36:40 -07:00
fjy 4a4cccf10e Merge branch 'master' into fix-groupyb
Conflicts:
	processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java
2014-06-12 13:24:16 -07:00
fjy 4d9d041fbd Merge branch 'master' into fix-groupyb 2014-06-12 13:22:34 -07:00
fjy 403962fe0b add some failing tests for groupBy 2014-06-12 11:36:53 -07:00
Xavier Léauté 22e368e79b add dimension/column selector to incremental index 2014-06-12 11:25:22 -07:00
xvrl ada2d92c16 Merge pull request #576 from metamx/query-cancellation
Query cancellation & timeout
2014-06-11 12:18:43 -07:00
xvrl 50945a144a Merge pull request #569 from tucksaun/fix-build-as-submodule
Fixed maven build when druid is integrated as a submodule
2014-06-11 12:17:45 -07:00
fjy cde86d81e2 make having and limitspec work for nested queries 2014-06-10 15:50:13 -07:00
Xavier Léauté ababbcadfd fix package groupId 2014-06-10 15:01:44 -07:00
xvrl 1b5095ac57 Merge pull request #588 from metamx/resolve-validator
add dependencies for validator error
2014-06-10 14:05:29 -07:00