Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,777 Commits 111 Branches 503 Tags 726 MiB
Commit Graph

1722 Commits

Author SHA1 Message Date
fjy d16ff98ef3 [maven-release-plugin] prepare release druid-0.6.85 2014-04-08 11:44:40 -07:00
nishantmonu51 2c8682a1b6 avoid using Math.abs 
review comment on - c6f5311
To avoid overflow issues and unnecessary calls to Math.abs.
 2014-04-08 21:58:54 +05:30
nishantmonu51 f726e52e3b fix test 2014-04-08 20:09:44 +05:30
nishantmonu51 12991a959a actually fix it 2014-04-08 20:08:21 +05:30
nishantmonu51 c6f531168f fix hash based partition - boundary case Integer.MIN 2014-04-08 20:07:22 +05:30
nishantmonu51 22c3296aa3 Merge branch 'master' into optimize-postAgg-calculation 
Conflicts:
	server/src/test/java/io/druid/client/CachingClusteredClientTest.java
 2014-04-08 03:35:56 +05:30
nishantmonu51 c322f44863 time series post Aggregation improved 
move post aggregation to finalise results
 2014-04-08 03:17:15 +05:30
fjy 8e3bcc8fc3 [maven-release-plugin] prepare for next development iteration 2014-04-07 14:38:55 -07:00
fjy e1e81cfeac [maven-release-plugin] prepare release druid-0.6.84 2014-04-07 14:38:51 -07:00
nishantmonu51 4bb36dd453 fix tests 2014-04-08 02:37:57 +05:30
fjy bfb66691b9 [maven-release-plugin] prepare for next development iteration 2014-04-07 12:45:28 -07:00
fjy f612b7cc64 [maven-release-plugin] prepare release druid-0.6.83 2014-04-07 12:45:20 -07:00
fjy f5dc75ef82 Merge pull request #464 from metamx/fix-context 
Fix context to be backwards compatible with String values
 2014-04-07 11:54:17 -06:00
fjy dda09633be make query id a bit more readable 2014-04-07 10:53:43 -07:00
fjy 40c14c9a3c fix case with no request params 2014-04-06 12:43:40 -07:00
fjy f0e9d6fd83 fix query forwarding 2014-04-06 12:41:39 -07:00
fjy 4d6174ebf2 be able to set maxPendingPersists in plumber 2014-04-06 09:47:37 -07:00
fjy 1267fbb7f5 fix context to be backwards compat 2014-04-06 09:20:58 -07:00
fjy 1843316db6 commonalize event receiver firehose 2014-04-03 20:46:36 -07:00
fjy 8138d96f9d [maven-release-plugin] prepare for next development iteration 2014-04-03 17:21:14 -07:00
fjy 4619e498c3 [maven-release-plugin] prepare release druid-0.6.82 2014-04-03 17:21:10 -07:00
fjy d9062d91fa fix endpoint bugs and more docs 2014-04-03 17:01:33 -07:00
fjy edba3ba40e [maven-release-plugin] prepare for next development iteration 2014-04-02 22:24:36 -07:00
fjy 0f0e525a75 [maven-release-plugin] prepare release druid-0.6.81 2014-04-02 22:24:32 -07:00
fjy b0bf08554a fix broken build 2014-04-02 22:22:42 -07:00
nishantmonu51 d6eebce998 Revert "Merge pull request #457 from metamx/stream-cache" 
This reverts commit 5fae4d9abc, reversing
changes made to 43a0554179.
 2014-04-03 10:38:43 +05:30
fjy 133c624f69 [maven-release-plugin] prepare for next development iteration 2014-04-02 21:33:10 -07:00
fjy 4e2ac3234c [maven-release-plugin] prepare release druid-0.6.79 2014-04-02 21:33:05 -07:00
fjy ea9f31bbe0 learn to math and prepare for next release 2014-04-02 21:31:17 -07:00
fjy 6bab22ef71 [maven-release-plugin] prepare for next development iteration 2014-04-02 21:08:18 -07:00
fjy 93e19b62e6 [maven-release-plugin] prepare release druid-0.6.78 2014-04-02 21:08:14 -07:00
fjy f185d215e1 fix jetty default thread pool size for jetty 9 and prepare for next release 2014-04-02 21:01:07 -07:00
fjy 6cd5a76983 [maven-release-plugin] prepare for next development iteration 2014-04-02 17:33:26 -07:00
fjy d1e7b98177 [maven-release-plugin] prepare release druid-0.6.77 2014-04-02 17:33:19 -07:00
fjy 7547e989f0 Merge pull request #456 from metamx/processing-threads-default 
more sensible defaults
 2014-04-02 18:25:43 -06:00
fjy 5fae4d9abc Merge pull request #457 from metamx/stream-cache 
Populate cache without materializing results first
 2014-04-02 18:07:36 -06:00
fjy 43a0554179 Merge pull request #455 from metamx/async 
Asynchronous servlet for query forwarding
 2014-04-02 18:05:49 -06:00
Xavier Léauté 458a873505 make test reflect the fact that resulting sequence is not consumed yet 2014-04-02 15:37:54 -07:00
Xavier Léauté ee34415470 populate cache without materializing results 2014-04-02 15:32:14 -07:00
Xavier Léauté f3cc316e66 create utiliy class for getMaxDirectMemory 2014-04-02 15:27:34 -07:00
fjy 85ffce25a6 fix code review comments 2014-04-02 14:56:00 -07:00
Xavier Léauté ee97fb98bc more sensible defaults for single core machines 2014-04-02 14:24:08 -07:00
fjy eaec0e3ab2 cleanup 2014-04-01 17:56:25 -07:00
fjy 6952eb7878 asynch servlet for query forwarding 2014-04-01 17:51:28 -07:00
Xavier Léauté 74c5d9889b [maven-release-plugin] prepare for next development iteration 2014-03-31 16:07:31 -07:00
Xavier Léauté 0845cc4078 [maven-release-plugin] prepare release druid-0.6.76 2014-03-31 16:07:25 -07:00
fjy 50b6888210 Merge pull request #450 from metamx/fix-cache-population 
Fix cache population
 2014-03-31 12:26:37 -06:00
nishantmonu51 05f3f7d49e review comments - remove instance of check 2014-03-29 03:06:53 +05:30
fjy c5fbb67d94 more endpoint cleanup 2014-03-28 14:31:30 -07:00
fjy 676671e575 new endpoints 2014-03-28 13:55:44 -07:00
nishantmonu51 af470223f1 add test 2014-03-28 22:39:29 +05:30
nishantmonu51 ccf72bfdf8 Fix cache population simple way 2014-03-28 14:14:46 +05:30
fjy 652506d1bd [maven-release-plugin] prepare for next development iteration 2014-03-27 18:03:55 -07:00
fjy 7fa62cd9c7 [maven-release-plugin] prepare release druid-0.6.75 2014-03-27 18:03:51 -07:00
fjy 21e54d8060 rename var to be less confusing 2014-03-27 15:48:37 -07:00
fjy bc4bc277f2 Merge pull request #447 from metamx/fix-configmanager 
Move db specific things from ConfigManager into DbConnector
 2014-03-27 16:47:03 -06:00
fjy 366872ffe9 Merge pull request #446 from liquidm/add_druiddirectclient_logging 
add url logging to DirectDruidClient for debugging purposes
 2014-03-27 16:41:03 -06:00
Xavier Léauté 6e18ff7ed4 use prepared statement instead of string interpolation 2014-03-27 12:41:30 -07:00
Hagen Rother d6f4cf3733 add changes as suggested by cheddar 2014-03-27 19:46:53 +01:00
Hagen Rother 6fb3e61a98 add url logging to DirectDruidClient for debugging purposes 2014-03-27 19:38:53 +01:00
fjy 7e54c6a359 [maven-release-plugin] prepare for next development iteration 2014-03-25 13:43:25 -07:00
fjy 0baf95098d [maven-release-plugin] prepare release druid-0.6.74 2014-03-25 13:43:21 -07:00
nishantmonu51 3ba67946a3 review comments - remove unused import and extract out constants 2014-03-25 23:03:13 +05:30
nishantmonu51 fe7a184096 review comments 2014-03-25 17:02:36 +05:30
nishantmonu51 0ba72ffb2b merge from master 2014-03-25 15:43:05 +05:30
nishantmonu51 1c5d2b6dc5 review comments 2014-03-25 13:27:30 +05:30
nishantmonu51 6a34c09e05 Merge branch 'master' into compute-populate-cache 2014-03-25 13:23:00 +05:30
fjy 60c204afeb Merge pull request #433 from metamx/router-node 
Client-side tier-aware query runner
 2014-03-24 16:17:59 -06:00
fjy 75ec8bed9a address code review comments 2014-03-24 14:53:30 -07:00
fjy fcd7522596 Merge branch 'master' into router-node 2014-03-24 13:43:52 -07:00
fjy b0790783b7 Merge pull request #436 from metamx/better-context 
Extend context to able to take more sophisticated objects than just strings
 2014-03-24 14:40:45 -06:00
fjy de83677165 more logging at initialization 2014-03-24 13:40:04 -07:00
fjy e523bfc237 [maven-release-plugin] prepare for next development iteration 2014-03-21 11:07:40 -07:00
fjy 6fbc3b15a7 [maven-release-plugin] prepare release druid-0.6.73 2014-03-21 11:07:34 -07:00
fjy 7f8211ecc7 extend context to use map string object instead of map string string 2014-03-20 13:41:45 -07:00
nishantmonu51 69e9b7a6c5 merge changes from master 2014-03-20 20:23:58 +05:30
nishantmonu51 9079a17df0 Add headers 2014-03-20 19:44:36 +05:30
fjy a96dfc7742 clean up failure scenarios 2014-03-19 10:30:52 -07:00
fjy 76ef9d192c add tests 2014-03-18 13:47:53 -07:00
fjy ab2524ba0a add router node 2014-03-18 13:44:29 -07:00
fjy 03851101f0 [maven-release-plugin] prepare for next development iteration 2014-03-18 08:12:51 -07:00
fjy 508d892ba1 [maven-release-plugin] prepare release druid-0.6.72 2014-03-18 08:12:44 -07:00
nishantmonu51 32ad26210d Fix backwards compatibilty constant post aggregator 2014-03-18 20:34:49 +05:30
fjy 294f15d624 [maven-release-plugin] prepare for next development iteration 2014-03-17 21:44:17 -07:00
fjy 199efa049a [maven-release-plugin] prepare release druid-0.6.71 2014-03-17 21:44:11 -07:00
fjy 1d1ec1d855 clean up some defaults and prepare for next release 2014-03-17 21:41:34 -07:00
Xavier Léauté b9fe12977e [maven-release-plugin] prepare for next development iteration 2014-03-17 13:57:10 -07:00
Xavier Léauté 0276223db1 [maven-release-plugin] prepare release druid-0.6.70 2014-03-17 13:57:06 -07:00
fjy 2adcf07f5f Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
	indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java
	processing/src/test/java/io/druid/segment/TestIndex.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
 2014-03-17 10:59:31 -07:00
nishantmonu51 468e8e0b31 Memcache changes 2014-03-17 18:54:30 +05:30
fjy 8e5cbca2ee [maven-release-plugin] prepare for next development iteration 2014-03-14 15:16:55 -07:00
fjy 852d167eaf [maven-release-plugin] prepare release druid-0.6.69 2014-03-14 15:16:50 -07:00
fjy f1da044cfa fix another breaking endpoint in druid coordinator 2014-03-14 15:15:08 -07:00
fjy 7a2d0850e3 [maven-release-plugin] prepare for next development iteration 2014-03-14 15:06:54 -07:00
fjy 2646b5421b [maven-release-plugin] prepare release druid-0.6.68 2014-03-14 15:06:50 -07:00
fjy f525361c3d fix broken tests and prepare for next release 2014-03-14 15:05:07 -07:00
fjy 454a240525 [maven-release-plugin] prepare for next development iteration 2014-03-14 10:59:27 -07:00
fjy 6e9bc9acab [maven-release-plugin] prepare release druid-0.6.66 2014-03-14 10:59:23 -07:00
fjy b4f1591260 clean up examples, finish paper 2014-03-13 18:52:08 -07:00
fjy a6fc82e267 Merge pull request #428 from metamx/fix-bytesboundedLinkedQueue 
fix concurrency issues in bytesboundedlinkedqueue
 2014-03-12 13:30:53 -06:00
nishantmonu51 f10ac73eef fix concurrency issues 2014-03-12 20:54:05 +05:30
Xavier Léauté b15b544429 make defaults more explicit 2014-03-11 12:39:08 -07:00
Xavier Léauté 44f9b9cec9 add readBufferSize option to memcached client config 2014-03-11 10:37:23 -07:00
Xavier Léauté 8baac724c3 add comments 2014-03-11 09:59:05 -07:00
Xavier Léauté b5d9876b77 allow disabling of memcached op-queue limit, default to disabled 2014-03-11 09:56:45 -07:00
fjy 34957ee471 [maven-release-plugin] prepare for next development iteration 2014-03-10 15:05:48 -07:00
fjy 35297572ed [maven-release-plugin] prepare release druid-0.6.65 2014-03-10 15:05:43 -07:00
fjy 369156fe80 [maven-release-plugin] prepare for next development iteration 2014-03-10 13:26:38 -07:00
fjy ba3806fcc2 [maven-release-plugin] prepare release druid-0.6.64 2014-03-10 13:26:34 -07:00
fjy 3ef75031c3 Merge pull request #423 from tucksaun/fix-kill-task-local-storage 
Adds LocalDataSegmentKiller to allow KillTask for local storage
 2014-03-07 13:45:39 -07:00
fjy 228cfa95bd Merge pull request #371 from N3TWORK/subquery 
Subquery functionality for Group By queries
 2014-03-07 13:41:56 -07:00
Tugdual Saunier 7dbcc74510 Adds LocalDataSegmentKiller to allow KillTask for local storage 2014-03-07 12:30:00 +00:00
Yuval Oren 5601c51ae6 finalize variables and optimize imports 2014-03-06 15:03:43 -08:00
Yuval Oren 4b63645802 Merge branch 'master' into subquery 
Conflicts:
	processing/src/main/java/io/druid/query/BaseQuery.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
	processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java
	processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java
 2014-03-06 13:33:59 -08:00
fjy 00c5a708a2 [maven-release-plugin] prepare for next development iteration 2014-03-06 12:55:11 -08:00
fjy 9599832c58 [maven-release-plugin] prepare release druid-0.6.63 2014-03-06 12:55:06 -08:00
fjy 14a5149419 minor javascript problem 2014-03-06 12:43:28 -08:00
fjy e27b2fa7cb Merge branch 'master' of github.com:metamx/druid 2014-03-06 11:57:14 -08:00
fjy 1e9e61f786 fix some broken coordinator endpoints 2014-03-06 11:57:08 -08:00
fjy 1745aa744b Merge pull request #417 from metamx/fix-caching-bug 
Fix caching bug and add CachingClusteredClient tests
 2014-03-06 11:41:51 -07:00
Himadri Singh 625c78aae5 comments 2014-03-06 11:06:38 +05:30
Himadri Singh dc8ae1d20e revert 2014-03-06 10:46:48 +05:30
Himadri Singh d773a6ca24 One CostBalancerStrategy 2014-03-06 10:35:12 +05:30
Xavier Léauté 9fc5cca663 add disable populate / use cache tests 2014-03-05 14:07:15 -08:00
Xavier Léauté fffb58f6e8 add CachingClusteredClient tests 2014-03-05 14:07:15 -08:00
Xavier Léauté 427014d0a0 cosmetics 2014-03-05 14:07:15 -08:00
Xavier Léauté 5b4c04510f fix populateCache flag not working 2014-03-05 14:07:15 -08:00
Gian Merlino 70db460f97 Blocking Executors and maxPendingPersists, oh my! 
- Execs.newBlockingSingleThreaded can now accept capacity = 0.
- Changed default maxPendingPersists from 2 to 0.
- Fixed serde of maxPendingPersists in RealtimeIndexTasks.
 2014-03-05 10:55:12 -08:00
fjy 5db00afb37 clean up and default values 2014-03-04 14:38:27 -08:00
fjy c4c4d80336 make local testing pass 2014-03-03 14:52:43 -08:00
fjy 46b9ac78e7 Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	pom.xml
	publications/whitepaper/druid.pdf
	publications/whitepaper/druid.tex
 2014-03-03 14:48:15 -08:00
nishantmonu51 40aa6ecaef fix npe queryID 2014-03-01 04:32:27 +05:30
nishantmonu51 e54949ca98 make queryIDProvider a singleton 2014-02-28 12:19:07 +05:30
fjy bf2ddda897 unit tests passing after more refactoring 2014-02-27 15:21:09 -08:00
fjy 37a79dd4cb [maven-release-plugin] prepare for next development iteration 2014-02-27 11:52:40 -08:00
fjy 8cdd0e3d53 [maven-release-plugin] prepare release druid-0.6.62 2014-02-27 11:52:35 -08:00
fjy bddf7b2908 fix naming problems 2014-02-27 11:50:51 -08:00
fjy 9502212b12 Merge pull request #403 from metamx/Query_id-for-metrics 
add queryID to query context and request_logs
 2014-02-27 12:44:05 -07:00
nishantmonu51 0701b1534d review comments queryID changes, add wait time for realtime node queries 2014-02-27 14:39:25 +05:30
fjy d57974d58b Merge pull request #407 from metamx/restore-task 
Restore task
 2014-02-26 19:18:58 -07:00
fjy 3d850aa260 Merge pull request #400 from tucksaun/feat-postgresql-support 
Improving PostgreSQL support
 2014-02-26 09:57:50 -07:00
Xavier Léauté 2f61035585 add restore task 2014-02-25 13:41:40 -08:00
nishantmonu51 b480d8f543 review comments 2014-02-25 03:09:44 +05:30
fjy 246ada63c5 fix interval load rule 2014-02-24 12:55:20 -08:00
nishantmonu51 373501a06d add queryID to query context and request_logs 2014-02-24 16:11:33 +05:30
fjy 7b0b90a860 Merge branch 'master' of github.com:metamx/druid into new-schema 2014-02-20 16:12:31 -08:00
fjy 5d2367f0fd unit tests pass at this point 2014-02-20 15:52:12 -08:00
fjy ef6208d192 Merge pull request #390 from metamx/bard-oome-fix 
APP-2782 Bard oome fix
 2014-02-19 19:52:56 -07:00
fjy 20cac8c506 not compiling yet but close 2014-02-19 15:54:27 -08:00
Himadri Singh a049188d23 minor changes from review 2014-02-19 09:13:47 +05:30
fjy 4b7c76762d unit tests passingn at this point, finished rt port maybe 2014-02-18 15:14:38 -08:00
Tugdual Saunier 4b67dbff5f Optimize DbSegmentPublisher.publishSegment 2014-02-17 18:11:15 +00:00
Tugdual Saunier 4dce007577 Use DbConnector.isPostgreSQL everywhere we used getDatabaseProductName before 2014-02-17 18:11:15 +00:00
Himadri Singh 5d729570c1 millis converted. 2014-02-17 15:00:58 +05:30
Himadri Singh 9b6fe2d003 Removed CostBalancerStrategy, made default = 1 thread 2014-02-17 14:57:05 +05:30
Himadri Singh bec264bdf7 Dynamic Config 2014-02-17 14:25:40 +05:30
fjy c57cf6ab4d [maven-release-plugin] prepare for next development iteration 2014-02-14 15:24:15 -08:00
fjy 44755cc91c [maven-release-plugin] prepare release druid-0.6.61 2014-02-14 15:24:11 -08:00
fjy f5affb6b5a [maven-release-plugin] prepare for next development iteration 2014-02-14 15:09:30 -08:00
fjy 189376f495 [maven-release-plugin] prepare release druid-0.6.60 2014-02-14 15:09:26 -08:00
fjy ef648b85f5 fix broken priority queries 2014-02-14 15:05:30 -08:00
fjy 3979eb270c Revert "Revert "Merge branch 'determine-partitions-improvements'"" 
This reverts commit 189b3e2b9b.
 2014-02-14 12:58:56 -08:00
fjy a8c4362d72 rejiggering druid api 2014-02-14 12:57:52 -08:00
fjy 189b3e2b9b Revert "Merge branch 'determine-partitions-improvements'" 
This reverts commit 7ad228ceb5, reversing
changes made to 9c55e2b779.
 2014-02-14 12:47:34 -08:00
nishantmonu51 78eddc50ee add checks for elements larger than capacity and account for the size of element being added 2014-02-15 00:12:21 +05:30
Himadri Singh 5af414c93c configurable thread count 2014-02-14 13:09:24 +05:30
Xavier Léauté 4b902aed23 fix typo 2014-02-13 23:25:11 -08:00
Himadri Singh 7dae293b5f fixes to comments 2014-02-14 12:42:46 +05:30
Himadri Singh 6e0590f97b Test udpate 2014-02-13 19:10:08 +05:30
Himadri Singh c2604657ed Extracted common methods 2014-02-13 19:04:54 +05:30
Himadri Singh a8d8d1ea06 Costbalancer Multithread 2014-02-13 18:58:45 +05:30
fjy 82fd35726f [maven-release-plugin] prepare for next development iteration 2014-02-12 20:03:00 -08:00
fjy cc1b91636f [maven-release-plugin] prepare release druid-0.6.59 2014-02-12 20:02:55 -08:00
fjy a986166b9c prepare for next release 2014-02-12 20:01:05 -08:00
fjy 60e950fad8 fix backwards compat issue with master 2014-02-12 20:00:43 -08:00
nishantmonu51 7ad228ceb5 Merge branch 'determine-partitions-improvements' 
Conflicts:
	pom.xml
 2014-02-12 10:51:26 +05:30
Hagen Rother b4eea282b6 consider errors in reading from firehose as unparsable 2014-02-11 16:00:13 +01:00
nishantmonu51 f8d8290a1e add newline at the end of file 2014-02-10 15:44:28 +05:30
nishantmonu51 ec2a32acfc review comments 2014-02-10 12:53:36 +05:30
Jae Hyeon Bae dca965a35a curator 2.4.0 and Announcer logging lines are added regarding infos of reinstating 2014-02-09 22:26:18 -08:00
fjy b7a78680b2 [maven-release-plugin] prepare for next development iteration 2014-02-07 13:06:23 -08:00
fjy cc6886646e [maven-release-plugin] prepare release druid-0.6.58 2014-02-07 13:06:18 -08:00
fjy 555f434fa6 [maven-release-plugin] prepare for next development iteration 2014-02-07 11:56:41 -08:00
fjy 371f2bb941 [maven-release-plugin] prepare release druid-0.6.57 2014-02-07 11:56:34 -08:00
nishantmonu51 dc097081a6 remove writeOpQueueFactory 
for writeQueueFactory the buffer of the element is nulled by memcache
before remove is called, thus we are not able to determine the size of
element while removing, We can potentially work around this by adding a
wrapper to keep track of size but that will have its extra overhead,
Also verified from the heap dump that the growing queue was the queue
for opQueue.
 2014-02-07 20:00:25 +05:30
nishantmonu51 db93e45bef minor fix 2014-02-07 17:52:52 +05:30
nishantmonu51 61d99bb8f2 change byte size config to long 2014-02-07 16:56:15 +05:30
nishantmonu51 d27274463b add separate putLock and takeLocks + test 2014-02-07 16:52:07 +05:30
Yuval Oren bd11309593 Merge branch 'master' into subquery 2014-02-06 15:36:29 -08:00
Xavier Léauté df0d81baa8 fix local cache byte counting on object removal 2014-02-06 14:28:14 -08:00
fjy 0f6af72ea4 Merge branch 'master' into new-schema 2014-02-06 12:46:13 -08:00
fjy af48273369 fix bug with dynamic configs in coordinator not working 2014-02-06 11:19:05 -08:00
nishantmonu51 7bbb6ba063 support for bounding operation queue by the byte size 2014-02-06 23:33:32 +05:30
nishantmonu51 aee574c772 review comments 2014-02-05 17:05:06 +05:30
fjy 056e82a516 [maven-release-plugin] prepare for next development iteration 2014-02-04 15:23:34 -08:00
fjy 0ea45b590f [maven-release-plugin] prepare release druid-0.6.56 2014-02-04 15:23:30 -08:00
fjy badc7b2e3f fix bug with load throttling and more tests 2014-02-04 15:21:45 -08:00
nishantmonu51 bacc72415f correct locking and partitionsSpec 2014-02-05 03:17:47 +05:30
fjy fc4cd79125 [maven-release-plugin] prepare for next development iteration 2014-02-03 16:47:50 -08:00
fjy 4d52e20fe1 [maven-release-plugin] prepare release druid-0.6.55 2014-02-03 16:47:46 -08:00
fjy 8b398533cb fix more bugs with determining what is assignable and what is not 2014-02-03 16:45:59 -08:00
fjy 46571ddf69 [maven-release-plugin] prepare for next development iteration 2014-02-03 16:35:02 -08:00
fjy cebb46a259 [maven-release-plugin] prepare release druid-0.6.54 2014-02-03 16:34:57 -08:00
fjy f4b6165307 fix bugs with finding indexing workers to assign 2014-02-03 16:33:06 -08:00
fjy d4eba49722 remove debug printing 2014-02-03 16:16:46 -08:00
Yuval Oren 689191c5ad Merge branch 'master' into subquery 2014-02-03 14:52:50 -08:00
fjy 14d0e54327 first commit 2014-02-03 14:15:03 -08:00
fjy 21d518e15c [maven-release-plugin] prepare for next development iteration 2014-01-31 16:32:25 -08:00
fjy 84f434d9f4 [maven-release-plugin] prepare release druid-0.6.53 2014-01-31 16:32:21 -08:00
fjy 019be5c3b0 update jquery 2014-01-31 12:37:37 -08:00
nishantmonu51 82b748ad43 review comments 2014-01-31 20:19:33 +05:30
nishantmonu51 7ca87d59df Determine partitions using cardinality 2014-01-31 00:49:11 +05:30
Yuval Oren e9cf935518 Fixed realtime querying after subquery changes 2014-01-27 18:58:25 -08:00
Yuval Oren 1c0b818cb2 Merge branch 'master' into subquery 2014-01-27 14:57:14 -08:00
fjy 7a116bf784 backwards compatibility fix for rules serde 2014-01-27 20:47:11 +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
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 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
Yuval Oren 4c8495662f Subquery support for GroupBy queries 2014-01-15 15:38:57 -08:00
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
fjy 3544b7ec4a Fixes #346 2014-01-06 09:31:04 -08:00
fjy 2b46c1d292 [maven-release-plugin] prepare for next development iteration 2014-01-02 19:53:41 -08:00
fjy 7a0f634b02 [maven-release-plugin] prepare release druid-0.6.47 2014-01-02 19:53:35 -08:00
fjy 2d3c4812e5 passing tests from loading across tiers 2014-01-02 11:33:05 -08:00
fjy 488a118f3f Merge branch 'master' into az 2014-01-02 10:53:37 -08:00
fjy 2205ebf459 Merge pull request #343 from metamx/dependency-cleanup 
Dependency cleanup & Initialization tests
 2014-01-02 10:51:29 -08:00
Jae Hyeon Bae e4bcbcf3cc curator 2.3.0 2014-01-02 10:35:09 -08:00
Xavier Léauté c0e7837a58 add back guice-servlet 2014-01-02 10:18:31 -08:00
Xavier Léauté ef05312c97 cleanup dependencies 2013-12-30 16:31:12 -08:00
Xavier Léauté 95d92915bf more tests for Initialization + dependency cleanup 2013-12-30 16:31:10 -08:00
fjy 6c6c1c83f8 Merge pull request #335 from rays-qpi/postgres-support 
Remove unused payload column from sub-select that fails in postgres.  Use ...
 2013-12-23 08:25:02 -08:00
Gian Merlino 668cf009a0 [maven-release-plugin] prepare for next development iteration 2013-12-20 12:28:54 -08:00
Gian Merlino bd58def933 [maven-release-plugin] prepare release druid-0.6.46 2013-12-20 12:28:49 -08:00
Gian Merlino 837dee1934 RealtimePlumberSchool: Alert and continue on any exception when abandoning segments 2013-12-20 11:38:42 -08:00
Gian Merlino 9043c211b2 [maven-release-plugin] prepare for next development iteration 2013-12-20 11:25:36 -08:00
Gian Merlino 29c0fa1df9 [maven-release-plugin] prepare release druid-0.6.45 2013-12-20 11:25:31 -08:00
Gian Merlino 5711ac4aff [maven-release-plugin] prepare for next development iteration 2013-12-20 11:17:01 -08:00
Gian Merlino 3b15f6a834 [maven-release-plugin] prepare release druid-0.6.44 2013-12-20 11:17:01 -08:00
Gian Merlino c503f5e9c5 [maven-release-plugin] prepare for next development iteration 2013-12-20 11:17:01 -08:00
Gian Merlino 97095ee3db [maven-release-plugin] prepare release druid-0.6.43 2013-12-20 11:17:00 -08:00
fjy b6b9bb4cd8 Merge branch 'master' of github.com:metamx/druid into az 2013-12-19 10:52:22 -08:00
fjy fba6caf7fd Merge pull request #326 from metamx/versions 
StatusResource
 2013-12-18 22:44:50 -08:00
Himadri Singh 818aba458f Moved TestDruidModule 2013-12-19 12:14:06 +05:30
Himadri Singh cd1e7cc65d Updated test 2013-12-19 12:01:18 +05:30
Himadri Singh b1a9ecc1cf StatusResourceTest 
misses testing reloading of modules currently
 2013-12-19 11:42:22 +05:30
Himadri Singh c58fbfe40c minor fixes 2013-12-19 10:49:38 +05:30
fjy 6b9bccd796 Merge branch 'master' into az 2013-12-18 18:47:35 -08:00
Gian Merlino 25c3f28907 [maven-release-plugin] prepare for next development iteration 2013-12-18 18:38:27 -08:00
Gian Merlino 6a740768d6 [maven-release-plugin] prepare release druid-0.6.42 2013-12-18 18:38:22 -08:00
Gian Merlino 8d8ec51c9c [maven-release-plugin] prepare for next development iteration 2013-12-18 16:05:33 -08:00
Gian Merlino 00d651bf6f [maven-release-plugin] prepare release druid-0.6.41 2013-12-18 16:05:27 -08:00
fjy 9b8134c73e Merge branch 'master' into az 2013-12-18 15:44:43 -08:00
Gian Merlino d0fd58bbae [maven-release-plugin] prepare for next development iteration 2013-12-18 15:35:55 -08:00
Gian Merlino 231d7a6d1f [maven-release-plugin] prepare release druid-0.6.40 2013-12-18 15:35:50 -08:00
Ray Sayre c969b37bac Remove unused payload column frosub-select that fails in postgres. Use boolean true/false for 'used' column so that queries run in postres 2013-12-18 13:01:36 -08:00
fjy 494ec53050 [maven-release-plugin] prepare for next development iteration 2013-12-17 17:48:46 -08:00
fjy 2a98a4d3e0 [maven-release-plugin] prepare release druid-0.6.39 2013-12-17 17:48:42 -08:00
fjy 5932150d24 [maven-release-plugin] prepare for next development iteration 2013-12-17 16:29:53 -08:00
fjy ed9f4b4cf2 [maven-release-plugin] prepare release druid-0.6.38 2013-12-17 16:29:49 -08:00
fjy 48d677d135 [maven-release-plugin] prepare for next development iteration 2013-12-16 16:17:45 -08:00
fjy 7e0b4d4fd2 [maven-release-plugin] prepare release druid-0.6.37 2013-12-16 16:17:41 -08:00
fjy 27bba22e6f make rules assignable across tiers 2013-12-16 15:54:42 -08:00
fjy e309f48357 Merge branch 'master' into az 
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
 2013-12-16 14:57:54 -08:00
Xavier Léauté ac2ca0e46c separate move and archive tasks 2013-12-16 14:00:55 -08:00
Xavier Léauté a417cd5df2 add archive task 2013-12-16 13:59:15 -08:00
fjy 84233238b1 Merge branch 'master' of github.com:metamx/druid 2013-12-16 12:01:55 -08:00
fjy 0998d835b0 fix redirection issues with master and overlord 2013-12-16 12:01:52 -08:00
fjy b917ada54d Merge pull request #328 from metamx/coordinator-leader-discovery 
Coordinator: Link service announcement to leadership
 2013-12-16 12:01:24 -08:00
Gian Merlino 7759ed4517 Coordinator: Link service announcement to leadership 2013-12-16 11:28:28 -08:00
Gian Merlino d2451fa37b Coordinator: Stop databaseRuleManager in stopBeingLeader 2013-12-16 11:12:20 -08:00
Gian Merlino 079331493a ZkCoordinator: Make addSegment, addSegments idempotent 2013-12-16 10:56:14 -08:00
Himadri Singh 3752122a7b implementing comments from review 2013-12-16 15:16:28 +05:30
fjy 3812bf7215 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:57:07 -08:00
fjy a7ff58f877 [maven-release-plugin] prepare release druid-0.6.36 2013-12-13 16:57:02 -08:00
fjy 41d64f4aa6 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:47:21 -08:00
fjy 1c050a02f8 [maven-release-plugin] prepare release druid-0.6.35 2013-12-13 16:47:17 -08:00
fjy 7891e0a2e2 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:20:23 -08:00
fjy 1d75738f81 [maven-release-plugin] prepare release druid-0.6.34 2013-12-13 16:20:18 -08:00
fjy 52cdb20f10 add better messaging and error handling 2013-12-13 15:01:07 -08:00
fjy ca7335f45f things dont work 2013-12-13 13:35:22 -08:00
Himadri Singh 65facc935d Do not load extensions on each call 2013-12-13 13:05:57 +05:30
fjy aef7726c33 [maven-release-plugin] prepare for next development iteration 2013-12-12 18:53:18 -08:00
fjy 1d1baf5976 [maven-release-plugin] prepare release druid-0.6.33 2013-12-12 18:53:14 -08:00
fjy f920dd6fb2 [maven-release-plugin] prepare for next development iteration 2013-12-12 17:28:38 -08:00
fjy 857d24a4ca [maven-release-plugin] prepare release druid-0.6.32 2013-12-12 17:28:34 -08:00
Gian Merlino dbe93034d0 StatusResource: Remove extension versions 
They cause services to create a brand-new startup injector and reload all
modules whenever /status is requested. Not sure how bad this is, but I think
we're only supposed to have one startup injector so there may be a better
approach out there.
 2013-12-12 17:23:15 -08:00
fjy 7c744ffda0 [maven-release-plugin] prepare for next development iteration 2013-12-12 14:53:01 -08:00
fjy 365da245c2 [maven-release-plugin] prepare release druid-0.6.31 2013-12-12 14:52:57 -08:00
Gian Merlino b2ea216bdf HttpClientModule: Default http timeout to PT5M 2013-12-11 15:05:16 -08:00
Gian Merlino f3cfd1d781 Introduce FileTaskLogs, and move TaskLogs module from server to indexing-service 2013-12-10 17:39:43 -08:00
fjy a7cc559623 [maven-release-plugin] prepare for next development iteration 2013-12-09 20:07:38 -08:00
fjy 54755b8864 [maven-release-plugin] prepare release druid-0.6.30 2013-12-09 20:07:34 -08:00
fjy a262d8bf11 fix curator shutdown problem in curator inv manager test 2013-12-09 18:56:30 -08:00
fjy 7a134272b3 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:45:27 -08:00
fjy 829658f171 [maven-release-plugin] prepare release druid-0.6.29 2013-12-09 18:45:23 -08:00
fjy 98a0f40227 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:35:22 -08:00
fjy 939d2313c0 [maven-release-plugin] prepare release druid-0.6.28 2013-12-09 18:35:18 -08:00
fjy c03d573e84 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:30:15 -08:00
fjy 71fe8a43da [maven-release-plugin] prepare release druid-0.6.27 2013-12-09 18:30:11 -08:00
fjy 8aba4ad3d2 Merge pull request #311 from metamx/versions 
Add versions to static page
 2013-12-09 17:18:16 -08:00
Himadri Singh b5f6dbc32f Code refactoring, one place! 2013-12-10 02:09:41 +05:30
fjy f17e08324d Merge branch 'master' into select 2013-12-09 11:30:35 -08:00
Himadri Singh e6b915f1e7 druid-api version not required 2013-12-10 00:05:56 +05:30
fjy d9762ac9bd fix shutdown 2013-12-06 11:17:19 -08:00
fjy 5fe0a8f2fb fix casting 2013-12-06 11:16:27 -08:00
fjy 1fcbbc8262 fix logging 2013-12-06 11:14:39 -08:00
fjy 2c5562b6ff fix wrong shard spec 2013-12-06 10:29:22 -08:00
fjy f8ff9296bc fix logs 2013-12-06 10:26:35 -08:00
fjy 767663af92 fix how flushing plumber flushes 2013-12-06 10:25:50 -08:00
fjy 932d688022 remove unneccessary merge n persist start 2013-12-06 10:15:18 -08:00
fjy 90aa9eca47 more logs 2013-12-06 09:57:07 -08:00
fjy 986223a49d more logs 2013-12-06 09:56:47 -08:00
fjy c4b990bb27 more logging 2013-12-06 09:56:23 -08:00
fjy e7b6b5c2af fix persist with flushing plumber 2013-12-06 09:51:43 -08:00
fjy 5ba05a46f6 fix nulls in realtime persist 2013-12-05 17:59:02 -08:00
fjy 6f079bcc8f fix segment id for ii 2013-12-05 17:01:55 -08:00
fjy ae5a4ff54c add versions to incremental index segment 2013-12-05 16:47:28 -08:00
fjy 60d72a0fd3 add flushing plumber 2013-12-05 16:24:54 -08:00
fjy 241c80ef24 working pagination maybe 2013-12-05 13:37:44 -08:00
fjy 7c7cfdf819 [maven-release-plugin] prepare for next development iteration 2013-12-04 18:57:30 -08:00
fjy 6bfb3b8d41 [maven-release-plugin] prepare release druid-0.6.26 2013-12-04 18:57:25 -08:00
fjy 31c7ed639d first commit 2013-12-04 13:53:08 -08:00
Himadri Singh a2c8388742 No need of druid-server.version 2013-12-04 10:21:36 +05:30
Himadri Singh 47278ad109 Merge relevant changes from 'druid-version-info' 2013-12-04 10:21:19 +05:30
fjy 929b2336a9 fix non deterministic behaviour in test 2013-12-02 17:02:24 -08:00
fjy 1a3a1221c2 [maven-release-plugin] prepare for next development iteration 2013-12-02 14:22:54 -08:00
fjy b18b65108a [maven-release-plugin] prepare release druid-0.6.25 2013-12-02 14:22:50 -08:00
fjy 05f72601c4 fix request time metric and prepare for next release 2013-12-02 14:20:59 -08:00
Stefán Freyr Stefánsson 2b7fcfe738 Merge remote-tracking branch 'upstream/master' into rabbitmq-module 
Conflicts:
	examples/config/realtime/runtime.properties
 2013-11-27 20:58:22 +00:00
Himadri Singh 95fafe02a7 server versions with loaded extensions versions 2013-11-27 12:21:35 +05:30
Himadri Singh abf417a1c4 version of druid-server 2013-11-26 17:47:23 +05:30
fjy 730e3a2303 [maven-release-plugin] prepare for next development iteration 2013-11-25 17:55:01 -08:00
fjy c7171e3311 [maven-release-plugin] prepare release druid-0.6.24 2013-11-25 17:54:57 -08:00
Stefán Freyr Stefánsson 386c81f0d9 Merge remote-tracking branch 'upstream/master' into rabbitmq-module 2013-11-25 22:44:25 +00:00
Himadri Singh 659493c4d2 Add versions to static page 2013-11-24 20:27:34 +05:30
Stefán Freyr Stefánsson 9eb4a7d9df Added commons-cli dependency. 2013-11-22 10:44:16 +00:00
Stefán Freyr Stefánsson 71598ee60e Moving RabbitMQ stuff to a module. 2013-11-21 18:41:06 +00:00
Xavier Léauté 3134affac9 fix NPE in DirectDruidClient 2013-11-20 17:15:26 -08:00
Xavier Léauté d0fe70a21f replace deprecated calls to getJsonFactory and createJsonParser 2013-11-20 17:14:23 -08:00
fjy 5c6e647148 [maven-release-plugin] prepare for next development iteration 2013-11-20 12:00:15 -08:00
fjy 5b94895a36 [maven-release-plugin] prepare release druid-0.6.23 2013-11-20 12:00:11 -08:00
fjy ea95566cd9 [maven-release-plugin] prepare for next development iteration 2013-11-20 10:45:21 -08:00
fjy fe7122b717 [maven-release-plugin] prepare release druid-0.6.22 2013-11-20 10:45:17 -08:00
fjy 88378eb036 [maven-release-plugin] prepare for next development iteration 2013-11-20 10:28:57 -08:00
fjy 2e6056f537 [maven-release-plugin] prepare release druid-0.6.21 2013-11-20 10:28:52 -08:00
fjy c60e75a6b4 Merge branch 'master' of github.com:metamx/druid into query-resource 2013-11-20 10:02:51 -08:00
fjy e7167ae00a add new query resource 2013-11-20 10:02:43 -08:00
Stefán Freyr Stefánsson 6aafba4393 Merge remote-tracking branch 'upstream/master' into rabbitmq-lyra 2013-11-20 16:25:53 +00:00
fjy 6bc429f38d Merge pull request #302 from metamx/more-metrics 
add total segment size/count metric
 2013-11-19 10:08:57 -08:00
fjy 7fec5e6ff7 [maven-release-plugin] prepare for next development iteration 2013-11-19 09:59:48 -08:00
fjy 265ef23cd5 [maven-release-plugin] prepare release druid-0.6.20 2013-11-19 09:59:44 -08:00