Commit Graph

2500 Commits

Author SHA1 Message Date
Yuval Oren 1c0b818cb2 Merge branch 'master' into subquery 2014-01-27 14:57:14 -08:00
fjy 74dd855a45 fix spelling 2014-01-28 05:50:23 +08:00
fjy 7a116bf784 backwards compatibility fix for rules serde 2014-01-27 20:47:11 +08:00
Gian Merlino f293794710 WebJsonSupplierTest: Use fqdn to avoid search domain wonkiness (fixes #275) 2014-01-27 19:49:12 +08:00
fjy 8edf0cf136 more backwards compatability fix 2014-01-26 21:27:34 +08:00
nishantmonu51 7800dac7f7 backwards compatibility fix 2014-01-26 20:34:43 +08:00
fjy 158a725985 fix backwards compat issues 2014-01-26 20:07:09 +08:00
fjy 8ab0636f5c fix coord resource 2014-01-26 20:04:04 +08:00
Yuval Oren c99e468ccd Merge branch 'master' into subquery 2014-01-24 16:48:35 -08:00
Yuval Oren 8f39981fab Documentation for query data sources 2014-01-24 16:12:10 -08:00
Yuval Oren c88cb2af16 Fix NPE when subquery returns empty result 2014-01-24 15:58:47 -08:00
fjy 6581436c0c update kafka 7 dep to be able to actually run it locally 2014-01-25 07:26:17 +08:00
fjy 0c789412bb add a workaround for jackson bug where jacksoninject fails when a null value is passed through json creator annotated constructor 2014-01-25 07:07:27 +08:00
Yuval Oren f2c1f798b9 Fix subquery merge issues 2014-01-24 15:03:48 -08:00
Yuval Oren cd719eab3c Merge branch 'master' into subquery 2014-01-24 14:42:41 -08:00
fjy facc9c51d3 fix max pending persists 2014-01-25 05:34:41 +08:00
fjy 6b39591030 Merge pull request #351 from metamx/az
Bridge Multiple Druid Clusters
2014-01-21 17:33:15 -08:00
fjy f3e1cbc423 fix according to code review 2014-01-21 16:26:28 -08:00
fjy 16f5f1d9cb Merge branch 'master' into az 2014-01-21 13:59:41 -08:00
fjy 6c32b0fc76 Merge pull request #367 from metamx/port-hll
Port Community contributed hyperloglog implementation from 0.5.x to 0.6.x
2014-01-21 13:31:14 -08:00
fjy 33cfa41efb revert change 2014-01-21 13:30:40 -08:00
fjy 4efa93a190 move tests 2014-01-21 13:28:58 -08:00
fjy b85a28ab96 port hll from 0.5.x to 0.6.x 2014-01-21 13:21:31 -08:00
fjy d3bc077ecd Merge branch 'master' into az 2014-01-21 10:47:57 -08:00
fjy 2ff86984da fix broken ut 2014-01-21 10:47:45 -08:00
fjy 908e9e377c Merge branch 'master' into az
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
2014-01-21 10:41:40 -08:00
Gian Merlino 0161d036b9 Merge pull request #366 from metamx/fix-terminate
Indexing service: fix the edge case where autoscaling tries to terminate node without an assigned IP
2014-01-20 17:01:06 -08:00
fjy ebc66df27d use terminateWithIds in terminate 2014-01-20 16:58:53 -08:00
fjy 1d81ad2946 remove unused class 2014-01-20 16:45:54 -08:00
fjy 1ecc9d0f98 fix the edge case where autoscaling tries to terminate node without ip 2014-01-20 16:44:19 -08:00
fjy 1057e2e165 Merge pull request #319 from metamx/select
A Select Query for Druid
2014-01-20 15:31:25 -08:00
fjy 3ff4cc2371 remove some accidentally committed code 2014-01-20 15:16:17 -08:00
fjy e2ea2ec7fd Merge branch 'master' into az
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
	server/src/main/java/io/druid/server/http/CoordinatorResource.java
	server/src/test/java/io/druid/client/DirectDruidClientTest.java
2014-01-20 15:10:13 -08:00
fjy c93f896092 Merge branch 'master' into select
Conflicts:
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
2014-01-20 13:26:51 -08:00
fjy 08966c424a Merge pull request #363 from metamx/moar-endpoints
More Coordinator endpoints for getting info out of druid
2014-01-20 13:07:37 -08:00
fjy 215584891e Merge branch 'master' into moar-endpoints 2014-01-20 13:06:45 -08:00
fjy 6404967994 fixes 2014-01-20 13:05:05 -08:00
fjy c1f0027a36 Merge pull request #361 from metamx/worker-oome-fix
Worker oome fix
2014-01-20 11:34:45 -08:00
nishantmonu51 5c043803c6 review comments 2014-01-20 13:40:36 +05:30
fjy 8d01a46d02 actually register resources 2014-01-17 18:01:09 -08:00
fjy 3cba0c8ff2 more endpoints for getting info out of druid 2014-01-17 17:52:27 -08:00
fjy 57e022f446 [maven-release-plugin] prepare for next development iteration 2014-01-17 15:53:54 -08:00
fjy 6540b2a58e [maven-release-plugin] prepare release druid-0.6.52 2014-01-17 15:53:50 -08:00
fjy f898c29e20 fix batch indexing and prepare for next release 2014-01-17 15:52:04 -08:00
nishantmonu51 3fb72aff93 rename maxPendingPersistBatches to maxPendingPersists 2014-01-17 12:59:21 +05:30
nishantmonu51 874cdb1b5b review comments 2014-01-17 12:51:28 +05:30
nishantmonu51 3db33c3268 review comments 2014-01-17 12:51:10 +05:30
nishantmonu51 fb819abd6f make maxPendingPersistPeriod configurable 2014-01-17 11:01:55 +05:30
nishantmonu51 6f5e1afbff add blocking mechanism after 2 pending persist batches 2014-01-17 03:01:04 +05:30
Yuval Oren 4c8495662f Subquery support for GroupBy queries 2014-01-15 15:38:57 -08:00