Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,489 Commits 113 Branches 504 Tags 724 MiB
Commit Graph

1153 Commits

Author SHA1 Message Date
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
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
fjy facc9c51d3 fix max pending persists 2014-01-25 05:34:41 +08:00
fjy f3e1cbc423 fix according to code review 2014-01-21 16:26:28 -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
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 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
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
nishantmonu51 3fb72aff93 rename maxPendingPersistBatches to maxPendingPersists 2014-01-17 12:59:21 +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
fjy 26a0f862fb [maven-release-plugin] prepare for next development iteration 2014-01-14 17:35:45 -08:00
fjy 3737ac4966 [maven-release-plugin] prepare release druid-0.6.51 2014-01-14 17:35:40 -08:00
fjy 528efedf52 [maven-release-plugin] prepare for next development iteration 2014-01-14 16:08:47 -08:00
fjy b4e4a5df96 [maven-release-plugin] prepare release druid-0.6.50 2014-01-14 16:08:43 -08:00
fjy 4a9c255cde [maven-release-plugin] prepare for next development iteration 2014-01-14 09:56:34 -08:00
fjy d8ac5575bc [maven-release-plugin] prepare release druid-0.6.49 2014-01-14 09:56:30 -08:00
Hagen Rother bfae07338c make ServerTimeRejectionPolicy also reject timestamps AHEAD of server time 2014-01-14 11:11:04 +01:00
fjy 396311a547 [maven-release-plugin] prepare for next development iteration 2014-01-13 18:04:29 -08:00
fjy 9c9d6287a2 [maven-release-plugin] prepare release druid-0.6.48 2014-01-13 18:04:24 -08:00
fjy 3b17c4c03c a whole bunch of docs and fixes 2014-01-13 18:01:56 -08:00
fjy 6816de7518 Merge pull request #354 from metamx/request-peer-metric 
QueryResource: Store remote address in user7
 2014-01-10 13:39:01 -08:00
Gian Merlino 643f999605 QueryResource: Store remote address in user7 2014-01-10 13:37:13 -08:00
Xavier Léauté bd9a4a0b60 add connection count test in case of failure 2014-01-10 12:43:17 -08:00
fjy f123a14373 Merge branch 'master' into az 
Conflicts:
	docs/content/Realtime.md
	server/src/main/java/io/druid/client/selector/ServerSelector.java
 2014-01-09 19:09:38 -08:00
fjy f3d6bdc76d fix GUI 2014-01-09 16:42:23 -08:00
Xavier Léauté ca90530085 simplify things a bit 2014-01-09 14:45:13 -08:00
Xavier Léauté 632d6b0a78 make server selection configurable, add back random server selection 2014-01-09 14:37:33 -08:00
Xavier Léauté 3d734944ef fix connection counting 2014-01-09 11:55:43 -08:00
fjy 2aabc6c4e6 Merge branch 'master' into select 
Conflicts:
	processing/src/main/java/io/druid/query/Query.java
	server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java
	server/src/main/java/io/druid/guice/QueryToolChestModule.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
 2014-01-08 16:31:19 -08:00
fjy 96caf2d518 Merge branch 'master' into az 2014-01-08 16:23:05 -08:00
fjy f8478d49d8 Merge pull request #350 from metamx/topN 
Approximate TopN Query
 2014-01-08 15:58:52 -08:00
fjy 50a6839693 inital commit of topNs 2014-01-08 15:51:03 -08:00
Gian Merlino 1476d7f51e LinearShardSpec, NumberedShardSpec toString methods 2014-01-08 15:22:12 -08:00
fjy 306f4b8fa2 more tests 2014-01-08 14:08:41 -08:00
fjy f44509b530 queries working at this point, tests pass, still need more tests and fix rules interface 2014-01-07 16:24:53 -08:00
fjy e11952f3b6 bridge is kinda working for mastery stuff right now, tests pass 2014-01-06 17:01:50 -08:00
fjy 98d01b1a9c Merge branch 'master' into az 2014-01-06 09:31:33 -08:00