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

509 Commits

Author SHA1 Message Date
fjy 930b089f7f [maven-release-plugin] prepare for next development iteration 2013-08-06 16:20:37 -07:00
fjy dd5f5ae49b [maven-release-plugin] prepare release druid-0.5.29 2013-08-06 16:20:29 -07:00
cheddar eee1efdcb5 Merge branch 'master' into guice 
Conflicts:
	client/src/main/java/com/metamx/druid/client/DruidServerConfig.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/index/ChatHandlerProvider.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
 2013-08-06 13:33:31 -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
Gian Merlino ba847bff32 [maven-release-plugin] prepare for next development iteration 2013-08-05 19:58:40 -07:00
Gian Merlino 7101d9ad2e [maven-release-plugin] prepare release druid-0.5.28 2013-08-05 19:58:34 -07:00
fjy db695f49c2 [maven-release-plugin] prepare for next development iteration 2013-08-05 18:26:20 -07:00
fjy c22e5b7ee0 [maven-release-plugin] prepare release druid-0.5.27 2013-08-05 18:26:10 -07:00
fjy 8ff0b53df4 [maven-release-plugin] prepare for next development iteration 2013-08-05 18:00:46 -07:00
fjy 1d3729906d [maven-release-plugin] prepare release druid-0.5.26 2013-08-05 18:00:36 -07:00
fjy 90e082463b [maven-release-plugin] prepare for next development iteration 2013-08-05 16:10:19 -07:00
fjy eb276d34d7 [maven-release-plugin] prepare release druid-0.5.25 2013-08-05 16:10:11 -07:00
fjy a95d9c46e2 [maven-release-plugin] prepare for next development iteration 2013-08-05 14:47:35 -07:00
fjy 8e1f4d3256 [maven-release-plugin] prepare release druid-0.5.24 2013-08-05 14:47:26 -07:00
cheddar d64bc2f762 1) Eliminate Old mains() that aren't needed anymore. 2013-08-05 13:33:43 -07:00
fjy fbb1211cbc [maven-release-plugin] prepare for next development iteration 2013-08-05 11:44:36 -07:00
fjy 22a90d36b7 [maven-release-plugin] prepare release druid-0.5.23 2013-08-05 11:44:28 -07:00
cheddar 2361e0112a Make it all compile again... 2013-08-02 10:14:46 -07:00
cheddar 9e78bb38f5 Merge branch 'master' into guice 
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
	client/src/main/java/com/metamx/druid/client/ServerInventoryView.java
	client/src/main/java/com/metamx/druid/coordination/SingleDataSegmentAnnouncer.java
	client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java
	client/src/main/java/com/metamx/druid/query/MetricsEmittingExecutorService.java
	indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorNode.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/http/WorkerNode.java
	pom.xml
	server/src/main/java/com/metamx/druid/coordination/ServerManager.java
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
	server/src/main/java/com/metamx/druid/db/DatabaseRuleManager.java
	server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
	server/src/main/java/com/metamx/druid/http/MasterMain.java
	server/src/main/java/com/metamx/druid/loading/SegmentLoaderConfig.java
	server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
 2013-08-01 16:42:47 -07:00
fjy b0090a1de6 [maven-release-plugin] prepare for next development iteration 2013-07-25 17:26:44 -07:00
fjy 6868153905 [maven-release-plugin] prepare release druid-0.5.22 2013-07-25 17:26:36 -07:00
fjy cf0cb3b703 [maven-release-plugin] prepare for next development iteration 2013-07-25 16:55:28 -07:00
fjy 8297f068c3 [maven-release-plugin] prepare release druid-0.5.21 2013-07-25 16:55:20 -07:00
Dhruv Parthasarathy 05219689e8 added close methods on inputSupplier tests 2013-07-25 16:52:29 -07:00
fjy f68a68112f [maven-release-plugin] prepare for next development iteration 2013-07-25 16:21:59 -07:00
fjy b6e8d11aec [maven-release-plugin] prepare release druid-0.5.20 2013-07-25 16:21:49 -07:00
Stefán Freyr Stefánsson 2842a40894 Fixed test that was failing on JDK 1.7 2013-07-24 23:41:47 +00:00
fjy cfc635de53 [maven-release-plugin] prepare for next development iteration 2013-07-24 09:41:30 -07:00
fjy 09576ccd09 [maven-release-plugin] prepare release druid-0.5.19 2013-07-24 09:41:20 -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
fjy 1b56fa5416 [maven-release-plugin] prepare for next development iteration 2013-07-18 15:37:54 -07:00
fjy 0c11602623 [maven-release-plugin] prepare release druid-0.5.18 2013-07-18 15:37:16 -07:00
fjy 816f673a47 [maven-release-plugin] prepare for next development iteration 2013-07-18 15:14:47 -07:00
fjy bcb1b99410 [maven-release-plugin] prepare release druid-0.5.17 2013-07-18 15:14:32 -07:00
fjy 357d77aca2 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:53:56 -07:00
fjy b5b6cd6594 [maven-release-plugin] prepare release druid-0.5.16 2013-07-18 14:53:46 -07:00
fjy 08f56feee3 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:48:53 -07:00
fjy 74b4c577f0 [maven-release-plugin] prepare release druid-0.5.15 2013-07-18 14:48:42 -07:00
fjy 5b55db6a42 [maven-release-plugin] prepare for next development iteration 2013-07-18 14:28:54 -07:00
fjy 3792a54869 [maven-release-plugin] prepare release druid-0.5.14 2013-07-18 14:28:46 -07:00
fjy 2f63140f2f [maven-release-plugin] prepare for next development iteration 2013-07-18 14:17:16 -07:00
fjy 4481b10efc [maven-release-plugin] prepare release druid-0.5.13 2013-07-18 14:16:55 -07:00
fjy df88274d9e fix poms 2013-07-18 14:14:16 -07:00
fjy 6b773e7791 Merge branch 'master' of github.com:metamx/druid 2013-07-18 14:12:41 -07:00
fjy 325a5fb4c0 [maven-release-plugin] prepare release druid-0.5.12 2013-07-18 14:09:56 -07:00
Dhruv Parthasarathy f114e2f425 query file fixed 2013-07-18 13:37:33 -07:00
Stefán Freyr Stefánsson ae4132adba Adding a test producer application. 2013-07-18 19:42:07 +00:00
fjy cef0e50881 [maven-release-plugin] prepare for next development iteration 2013-07-17 09:14:37 -07:00
fjy 22526a6c68 [maven-release-plugin] prepare release druid-0.5.11 2013-07-17 09:14:28 -07:00
fjy 43bdb99593 [maven-release-plugin] prepare for next development iteration 2013-07-16 17:55:42 -07:00
fjy d5fee45bf4 [maven-release-plugin] prepare release druid-0.5.10 2013-07-16 17:55:29 -07:00
fjy f3187b67a5 [maven-release-plugin] prepare for next development iteration 2013-07-16 17:32:05 -07:00
fjy eb89857bdc [maven-release-plugin] prepare release druid-0.5.9 2013-07-16 17:31:55 -07:00
fjy 0f492e17c3 [maven-release-plugin] prepare for next development iteration 2013-07-16 16:53:51 -07:00
fjy a3879d1151 [maven-release-plugin] prepare release druid-0.5.8 2013-07-16 16:53:41 -07:00
fjy f422bfae8c [maven-release-plugin] prepare for next development iteration 2013-07-16 13:35:38 -07:00
fjy cd174dbd80 [maven-release-plugin] prepare release druid-0.5.7 2013-07-16 13:35:29 -07:00
fjy afac15d631 fix version problem 2013-07-16 13:32:50 -07:00
fjy 36756aa557 [maven-release-plugin] prepare release druid-0.5.6 2013-07-16 13:30:16 -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
cheddar 33ac931b80 Merge pull request #185 from rjurney/test-harness 
Fixed hanging ssh bug FINALLY
 2013-07-11 13:06:02 -07:00
Russell Jurney a33aa57ca9 Made webstream example work. 2013-07-10 17:04:51 -07:00
cheddar c519be5b9f 1) Fix stray imports from libraries that aren't depended on and fix annotations/methods accordingly. 2013-07-10 14:19:04 -07:00
cheddar 3778425250 1) Fix new WebStreamFirehose stuff to have tests in the tests directory 
2) Change the webStream package to the web package, because capital letters in packages suck
 2013-07-10 14:12:13 -07:00
Russell Jurney a39148a0af Fixed hanging ssh bug FINALLY 2013-07-09 18:41:06 -07:00
cheddar b83bc14784 Merge pull request #173 from metamx/dhruv 
Add new demo firehose that is lower friction than twitter
 2013-07-09 17:39:51 -07:00
Dhruv Parthasarathy bd6dcd3973 interruption! 2013-07-09 17:39:19 -07:00
cheddar 093953c041 Merge pull request #170 from metamx/batch-zk 
Enable batched ZK announcements
 2013-07-09 17:23:47 -07:00
Dhruv Parthasarathy ba484fca5c catch error 2013-07-09 17:17:21 -07:00
Dhruv Parthasarathy 9f7284c801 fixed thread stuff 2013-07-09 16:59:49 -07:00
Dhruv Parthasarathy b3157c2752 made thread final 2013-07-09 16:42:35 -07:00
Dhruv Parthasarathy 3250c698bb fixed thread stuff and made tests cleaner 2013-07-09 16:34:55 -07:00
Dhruv Parthasarathy 6d000fc4c2 interfaces added and tests simplified 2013-07-09 15:31:03 -07:00
cheddar 2403056a0e Merge pull request #183 from rjurney/test-harness 
Scripts for firing up stuff and getting a stand-alone AWS node working
 2013-07-09 14:47:43 -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
Dhruv Parthasarathy 41cb115d60 few more changes to RenamingKeysUpdateStreamFactory and test 2013-07-09 10:46:43 -07:00
Dhruv Parthasarathy 72fbc516bc added a RenameKeysUpdateStream wrapper 2013-07-08 18:53:08 -07:00
Russell Jurney 570fb1cf19 Working stuff, doing pull request. CTRL-C problem remains. 2013-07-08 17:30:37 -07:00
Dhruv Parthasarathy 142271aad2 better encapsulation 2013-07-08 16:46:47 -07:00
Dhruv Parthasarathy 01b4728c40 removed shared queue structure. Queue now encapsulated within updateStream 2013-07-08 14:27:35 -07:00
Russell Jurney 2403f1eceb Seperated env/run files. 2013-07-08 13:42:50 -07:00
Dhruv Parthasarathy e7da31e42d seems to be working 2013-07-08 13:41:19 -07:00
Dhruv Parthasarathy 439e8ca4ad now take a map for renaming 2013-07-08 13:35:22 -07:00
Dhruv Parthasarathy c8c686c738 added druid license comments 2013-07-08 12:19:38 -07:00
Dhruv Parthasarathy adc00e6576 fixed with Erics suggestions 2013-07-08 12:13:25 -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 c41de0392d Added realtime.spec to realtime config path. 2013-07-02 17:25:37 -07:00
Russell Jurney 86ecdc4c26 Removed credentials from ec2 script, ready for publishing. 2013-07-02 17:17:36 -07:00
fjy 5ac2d1db0b Merge branch 'master' of github.com:metamx/druid into batch-zk 
Conflicts:
	server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java
	server/src/main/java/com/metamx/druid/loading/SingleSegmentLoader.java
 2013-07-02 15:57:31 -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 800cff010f New config for each node type. 2013-07-01 16:15:05 -07:00
cheddar fd1d73e83a [maven-release-plugin] prepare for next development iteration 2013-07-01 16:04:31 -07:00
cheddar 090921b43e [maven-release-plugin] prepare release druid-0.5.5 2013-07-01 16:04:25 -07:00
Dhruv Parthasarathy 6f6bf1996c log.info changed to log.debug 2013-06-27 19:09:35 -07:00
Dhruv Parthasarathy c15f18c343 removed NoopRunnable 2013-06-27 19:03:25 -07:00
Dhruv Parthasarathy 80f4ae25b5 updated with further cleanliness 2013-06-27 19:00:34 -07:00
Dhruv Parthasarathy 8bc4d7c436 added druid header 2013-06-26 15:16:21 -07:00
Dhruv Parthasarathy 235ecce522 fixed constants and made them static finals 2013-06-26 15:12:55 -07:00
Dhruv Parthasarathy e3f0b8770b updated with Fangjin comments 2013-06-26 15:05:52 -07:00
Dhruv Parthasarathy 039b06d646 made sure only edited files were pushed 2013-06-25 15:01:19 -07:00
Dhruv Parthasarathy 4e4a0a7953 removed DS_Store files 2013-06-25 14:58:12 -07:00
Dhruv Parthasarathy 0e1857f046 Applied codestyle and optimized imports 2013-06-25 14:48:02 -07:00
Dhruv Parthasarathy 8750ee88f2 Webstream example with tests 2013-06-25 14:37:58 -07:00
fjy e242baacf4 Merge branch 'master' into batch-zk 2013-06-20 16:21:33 -07:00
Dhruv Parthasarathy 748695bf97 trying to recover my files on intellij 2013-06-20 14:59:52 -07:00
fjy caa68e101a first commit; things working right now 2013-06-19 15:56:45 -07:00
cheddar 11ea15fc1a 1) Introduce Jetty 8 
2) Fix up modules based on exceptions at startup for MasterMain
 2013-06-17 10:53:50 -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
Russell Jurney 58780094a9 Upgraded to twitter4j 3.0.3, twitter example now works with twitter4j.properties in place that lists key pairs. 2013-06-13 17:59:17 -07:00
fjy b96d6b3546 [maven-release-plugin] prepare for next development iteration 2013-06-10 14:11:19 -07:00
fjy c465d4ef8c [maven-release-plugin] prepare release druid-0.5.4 2013-06-10 14:11:09 -07:00
cheddar c4a3a9b2fc 1) Fix scripts to run the examples from a fresh build 2013-06-10 11:53:57 -07:00
fjy 12e78955db [maven-release-plugin] prepare for next development iteration 2013-06-07 14:17:39 -07:00
fjy 962db29e70 [maven-release-plugin] prepare release druid-0.5.3 2013-06-07 14:17:32 -07:00
Gian Merlino 67be515db6 [maven-release-plugin] prepare for next development iteration 2013-06-06 18:25:07 -07:00
Gian Merlino 8dbb69c8a8 [maven-release-plugin] prepare release druid-0.5.2 2013-06-06 18:24:59 -07:00
fjy ee38ca5463 [maven-release-plugin] prepare for next development iteration 2013-06-06 18:00:31 -07:00
fjy a36d0007ac [maven-release-plugin] prepare release druid-0.5.1 2013-06-06 18:00:24 -07:00
fjy d5b7e644b6 [maven-release-plugin] prepare for next development iteration 2013-06-06 16:10:45 -07:00
fjy 2113715f5d [maven-release-plugin] prepare release druid-0.5.0 2013-06-06 16:10:39 -07:00
fjy 8202bc70eb optimize spatial and update poms everywhere 2013-06-05 15:26:40 -07:00
fjy 93e7ea3787 [maven-release-plugin] prepare for next development iteration 2013-05-31 15:53:23 -07:00
fjy 3d28fcd5e0 [maven-release-plugin] prepare release druid-0.4.32 2013-05-31 15:53:17 -07:00
fjy c02113879d [maven-release-plugin] prepare for next development iteration 2013-05-31 14:00:45 -07:00
fjy 5a3f69ae78 [maven-release-plugin] prepare release druid-0.4.31 2013-05-31 14:00:39 -07:00
fjy 9cb9f4753d [maven-release-plugin] prepare for next development iteration 2013-05-29 09:50:10 -07:00
fjy dd9ac03809 [maven-release-plugin] prepare release druid-0.4.30 2013-05-29 09:50:02 -07:00
fjy 73a392d94a [maven-release-plugin] prepare for next development iteration 2013-05-28 14:28:49 -07:00
fjy c6eec7eb27 [maven-release-plugin] prepare release druid-0.4.29 2013-05-28 14:28:42 -07:00
fjy 54932e3187 [maven-release-plugin] prepare for next development iteration 2013-05-26 13:43:28 -06:00
fjy 9d105ef4ad [maven-release-plugin] prepare release druid-0.4.28 2013-05-26 13:43:21 -06:00
fjy 69a9e04563 [maven-release-plugin] prepare for next development iteration 2013-05-26 13:33:05 -06:00
fjy 39ae7485fd [maven-release-plugin] prepare release druid-0.4.27 2013-05-26 13:32:57 -06:00
fjy e08770695f [maven-release-plugin] prepare for next development iteration 2013-05-23 11:53:29 -06:00
fjy 4c8d9e9f16 [maven-release-plugin] prepare release druid-0.4.26 2013-05-23 11:53:21 -06:00
fjy b5e30cf701 [maven-release-plugin] prepare for next development iteration 2013-05-23 11:05:24 -06:00