Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,534 Commits 113 Branches 506 Tags 732 MiB
Commit Graph

87 Commits

Author SHA1 Message Date
cheddar 5fa944dd26 Merge branch 'master' into guice 
Conflicts:
	client/src/main/java/com/metamx/druid/coordination/BatchDataSegmentAnnouncer.java
	client/src/main/java/com/metamx/druid/curator/announcement/Announcer.java
	client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java
	client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/S3TaskLogs.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ForkingTaskRunner.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerCuratorCoordinator.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
	pom.xml
	server/src/main/java/com/metamx/druid/http/MasterMain.java
	server/src/main/java/com/metamx/druid/http/MasterServletModule.java
	server/src/main/java/com/metamx/druid/master/DruidMasterConfig.java
	server/src/test/java/com/metamx/druid/master/DruidMasterTest.java
	server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
 2013-08-27 14:27:32 -05:00
Russell Jurney 1669e46338 Fixing bug where twitter example does not run. 2013-08-22 19:48:21 -07:00
Xavier Léauté ef12439df9 add wikipedia realtime example 2013-08-21 17:56:31 -07:00
fjy 85ee8bb267 port realtime to guice 2013-08-13 17:08:45 -07:00
cheddar 9f71d42314 1) Broker works with Guice 
2) Extract ServerViewModule to handle various ServerView thingies
3) Extract QueryToolChestModule and QueryRunnerFactoryModule to reuse code for configuration of Query stuff
4) Extract QueryJettyServerInitializer to reuse between Historical and Broker nodes
5) Remove ClientMain, BrokerMain and BrokerNode
 2013-08-06 12:01:52 -07:00
cheddar d64bc2f762 1) Eliminate Old mains() that aren't needed anymore. 2013-08-05 13:33:43 -07:00
cheddar 5f01c633bd Merge pull request #192 from activitystream/rabbitmq 
Adding a RabbitMQFirehoseFactory implementation
 2013-07-19 16:44:44 -07:00
Stefán Freyr Stefánsson af97b44a6f merging pull request from cheddar - jacksonifying the RabbitMQ connection and config. 2013-07-19 11:16:50 +00:00
Dhruv Parthasarathy f114e2f425 query file fixed 2013-07-18 13:37:33 -07:00
Stefán Freyr Stefánsson 217d539e46 Adding a newline at the end of the file. 2013-07-16 15:18:03 +00:00
Stefán Freyr Stefánsson 22ec7c53fc Code cleanup and formatting, documentation and moving all configuration into the consumerProps. 2013-07-16 15:08:39 +00:00
Stefán Freyr Stefánsson d2f8e52752 Merge remote-tracking branch 'upstream/master' into rabbitmq 2013-07-16 13:08:10 +00:00
Stefán Freyr Stefánsson a43ccf587f Fixed some errors in the realtime.spec and query.body files and cleaned up the format to make it more readable as an example. 2013-07-15 18:38:21 +00:00
Stefán Freyr Stefánsson 13328a6b36 Implemented a better query.body for the test I'm using. Added a shutdown listener to the connection and channel to get a notification when they are closed. Question remains whether the connection should be re-established when that happens. 2013-07-15 09:50:58 +00:00
Stefán Freyr Stefánsson 4d998e4c27 Making more things configurable through the realtime.spec file. 2013-07-13 16:49:39 +00:00
Stefán Freyr Stefánsson fc74333a28 adding an example dir to test the rabbitmq implementation 2013-07-13 16:14:10 +00:00
cheddar 09b1130810 Merge pull request #186 from rjurney/master 
Made upload.sh executable
 2013-07-11 13:06:58 -07:00
Russell Jurney a33aa57ca9 Made webstream example work. 2013-07-10 17:04:51 -07:00
Russell Jurney a39148a0af Fixed hanging ssh bug FINALLY 2013-07-09 18:41:06 -07:00
Russell Jurney 2df7463311 Removed dupe numThreads value from configs, fiddling with run_ec2.sh/env.sh 2013-07-09 14:44:03 -07:00
Russell Jurney 570fb1cf19 Working stuff, doing pull request. CTRL-C problem remains. 2013-07-08 17:30:37 -07:00
Russell Jurney 2403f1eceb Seperated env/run files. 2013-07-08 13:42:50 -07:00
Russell Jurney 056bd9cfe6 Created log directory, and echo ssh instructions. 2013-07-05 18:03:37 -07:00
Russell Jurney 1e46c6f4a2 Removed debug on ssh 2013-07-05 16:51:01 -07:00
Russell Jurney 9e615bad7f Works, as long as you hit ctrl-C when it says so. 2013-07-05 13:40:45 -07:00
Russell Jurney 5f0f9b29ec Working on fixing hang problem with mysql install. 2013-07-04 14:11:48 -07:00
Russell Jurney ca81b81f1b Moved mysql setup to bottom 2013-07-03 19:53:06 -07:00
Russell Jurney 86ecdc4c26 Removed credentials from ec2 script, ready for publishing. 2013-07-02 17:17:36 -07:00
Russell Jurney 8a5f4960a9 Working ec2 bootstrap script for ec2 environment 2013-07-02 12:46:14 -07:00
Russell Jurney c1f6c0ab4a In progress ec2 script. 2013-07-01 19:34:43 -07:00
Russell Jurney 8a1512ae4b Initial script to boot and configure an ubuntu 12.04 server for running the four druid node types. 2013-07-01 17:55:01 -07:00
Russell Jurney 0bd4e8b016 Fixed interactive twitter example to ask for consumer/access keys and secrets upon run. 2013-06-13 18:20:28 -07:00
cheddar c4a3a9b2fc 1) Fix scripts to run the examples from a fresh build 2013-06-10 11:53:57 -07:00
Steve Harris cfe9b7f177 Added a few comments and made sure it still works for non-kits 2013-05-04 21:02:31 -07:00
Steve Harris c0e38981ff Forgot to edit the source file so config was messed up 2013-05-04 20:50:53 -07:00
Steve Harris 5a9bf98b6c Some changes to automatically build a kit with samples. 2013-05-04 20:04:16 -07:00
cheddar e1a2c43baf 1) Adjust the example code to all be in one repository. 
2) Adjust the run scripts to be able to switch between different examples.
 2013-05-01 12:51:26 -05:00