509 Commits

Author SHA1 Message Date
cheddar
e885cb5a4d 1) Switch CuratorDiscoveryConfig to not be an abstract class 'cause Jackson cannot instantiate them 2013-07-18 11:15:39 -07:00
cheddar
d7f9b829ac This conflict merge thing is really weird...
Merge branch 'guice' of github.com:metamx/druid into guice

Conflicts:
	client/src/main/java/com/metamx/druid/curator/discovery/DiscoveryModule.java
	client/src/main/java/com/metamx/druid/initialization/CuratorDiscoveryConfig.java
	client/src/main/java/com/metamx/druid/initialization/DruidNodeConfig.java
	client/src/main/java/com/metamx/druid/initialization/EmitterModule.java
	client/src/main/java/com/metamx/druid/initialization/HttpEmitterConfig.java
	client/src/main/java/com/metamx/druid/initialization/HttpEmitterModule.java
	client/src/main/java/com/metamx/druid/initialization/LogEmitterModule.java
	client/src/main/java/com/metamx/druid/initialization/ServiceDiscoveryConfig.java
	common/pom.xml
	common/src/main/java/com/metamx/druid/db/DbConnector.java
	common/src/main/java/com/metamx/druid/db/DbTablesConfig.java
	common/src/main/java/com/metamx/druid/guice/ConfigProvider.java
	common/src/main/java/com/metamx/druid/guice/DruidSecondaryModule.java
	common/src/main/java/com/metamx/druid/guice/JsonConfigProvider.java
	common/src/main/java/com/metamx/druid/guice/LifecycleModule.java
	common/src/main/java/com/metamx/druid/guice/LifecycleScope.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskMasterLifecycle.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/db/DatabaseRuleManager.java
	server/src/main/java/com/metamx/druid/db/DatabaseRuleManagerConfig.java
	server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java
	server/src/main/java/com/metamx/druid/db/DatabaseSegmentManagerConfig.java
	server/src/main/java/com/metamx/druid/guice/MasterModule.java
	server/src/main/java/com/metamx/druid/http/MasterMain.java
	server/src/main/java/com/metamx/druid/loading/cassandra/CassandraDataSegmentConfig.java
	server/src/main/java/com/metamx/druid/metrics/MetricsModule.java
2013-07-17 09:50:14 -07:00
cheddar
e892d14f77 1) Configuration fixes, slowly gonna make the MasterMain actually start up! 2013-07-09 16:16:56 -07:00
cheddar
149c2e3560 1) A bunch more changes to make things actually run. Not quite done, but close! 2013-06-20 17:19:51 -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
cheddar
2f56c24259 1) Inject IndexingServiceClient
2) Switch all the DBI references to IDBI
2013-06-07 17:37:33 -07:00
cheddar
f68df7ab69 1) Make tests work and continue trying to make the DruidMaster start up with just Guice 2013-06-07 12:01:46 -07:00
cheddar
9df458a065 1) Initial commit of conversion to using Guice modules for bootstrapping. Things don't actually completely work yet. 2013-06-06 15:43:15 -07:00
fjy
451d3d358b some fixes according to code review comments 2013-06-06 11:02:08 -07:00
fjy
8202bc70eb optimize spatial and update poms everywhere 2013-06-05 15:26:40 -07:00
fjy
63b379ae90 Merge branch 'master' into refactor-indexing 2013-06-04 17:25:16 -07:00
fjy
06931ee0f5 introduce availability groups 2013-06-04 17:12:19 -07:00
cheddar
85ac8d43b6 Merge pull request #153 from metamx/gzip-compression
HTTP gzip compression support
2013-06-04 15:45:51 -07:00
fjy
42cc87a294 Merge branch 'master' into refactor-indexing
Conflicts:
	indexing-service/src/main/java/com/metamx/druid/indexing/common/task/IndexTask.java
	pom.xml
2013-05-31 17:28:59 -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
7dcbea464f fix bug with out of order events on broker 2013-05-31 15:50:53 -07:00
fjy
2138f9fdf2 prevent ISE at broker from completely failing to return results 2013-05-31 14:28:55 -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
bd9e6fecc1 fix day 1 issue with VIT 2013-05-28 14:26:49 -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
00cfb32541 also remove curator listeners on cleanup 2013-05-26 13:41:53 -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
113db061a8 discovered the cause of broker not being able to find segment issue 2013-05-26 13:31:18 -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
58335fd73f tony the tiger must love logs beacuse they are grrreeeat 2013-05-23 11:51:44 -06:00
fjy
b5e30cf701 [maven-release-plugin] prepare for next development iteration 2013-05-23 11:05:24 -06:00
fjy
8cc4202fd5 [maven-release-plugin] prepare release druid-0.4.25 2013-05-23 11:05:18 -06:00
fjy
9b6098f778 more logging for curator events 2013-05-23 11:00:12 -06:00
fjy
27d4f46156 [maven-release-plugin] prepare for next development iteration 2013-05-22 23:55:15 -07:00
fjy
07ac16633c [maven-release-plugin] prepare release druid-0.4.24 2013-05-22 23:55:06 -07:00
fjy
1537bcf55a restore server selector behaviour 2013-05-22 23:53:31 -07:00
xvrl
192b24c355 enable gzip compression for HTTP requests 2013-05-22 23:02:37 -07:00
fjy
3299900690 [maven-release-plugin] prepare for next development iteration 2013-05-22 13:36:50 -07:00
fjy
08f1cfb68e [maven-release-plugin] prepare release druid-0.4.23 2013-05-22 13:36:44 -07:00
fjy
3a9d892b05 [maven-release-plugin] prepare for next development iteration 2013-05-21 21:34:42 -07:00
fjy
7e6350321b [maven-release-plugin] prepare release druid-0.4.22 2013-05-21 21:34:34 -07:00
fjy
aa5280028f [maven-release-plugin] prepare for next development iteration 2013-05-21 17:12:23 -07:00
fjy
c6436dad78 [maven-release-plugin] prepare release druid-0.4.21 2013-05-21 17:12:16 -07:00
fjy
e404442ad4 [maven-release-plugin] prepare for next development iteration 2013-05-20 20:21:03 -07:00
fjy
b7604c2332 [maven-release-plugin] prepare release druid-0.4.20 2013-05-20 20:20:55 -07:00
fjy
efc92e7ca6 bug fixes for segment metadata queries and spatial indexing 2013-05-20 20:19:18 -07:00