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

1729 Commits

Author SHA1 Message Date
fjy b6aeb5b376 code review fixes 2013-07-22 14:14:21 -07:00
fjy f5536ed010 compression for batch-zk 2013-07-22 14:05:48 -07:00
fjy 5d96f6dc99 Merge branch 'master' of github.com:metamx/druid 2013-07-22 10:47:20 -07:00
fjy 2d0fae2fde add to string to spatial wrapper 2013-07-22 10:47:11 -07:00
cheddar 15f756c3a4 Fix upload script to actually upload into the directory 2013-07-19 16:57:55 -07:00
cheddar 1c34e3f364 1) Fix class-level javadoc on RabbitMQFirehoseFactory to reflect changes in config 2013-07-19 16:47:00 -07:00
cheddar 5f01c633bd Merge pull request #192 from activitystream/rabbitmq 
Adding a RabbitMQFirehoseFactory implementation
 2013-07-19 16:44:44 -07:00
cheddar 85a35201b7 1) The Master compiles and runs with Guice bindings!!!! 
2) The service discovery stuff really needs to be reworked.  It's unhappy now.
 2013-07-19 16:29:54 -07:00
Jan Rudert 527c6c81c5 refactored StringInputRowParser to handle a ByteBuffer, better wiring and configuration of KafkaFirehose 2013-07-19 14:12:53 +02:00
Stefán Freyr Stefánsson ade00e441f Adding minor class-level JavaDoc. 2013-07-19 11:24:13 +00: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
cheddar e493267bfa Merge pull request #193 from metamx/queryFileFix 
query file fixed
 2013-07-18 13:58:00 -07:00
Dhruv Parthasarathy f114e2f425 query file fixed 2013-07-18 13:37:33 -07:00
fjy 4e2f6380e6 Merge branch 'master' of github.com:metamx/druid 2013-07-18 13:25:08 -07:00
fjy 7d58a2d8db fix bug with enabling segments and improve replication logic 2013-07-18 13:24:52 -07:00
cheddar 0edfbaffab Errr, needed to make the ConnectionFactory a JacksonifiedConnectionFactory 2013-07-18 13:17:11 -07:00
cheddar 807a52f963 Another take on the configuration 2013-07-18 13:16:42 -07:00
Stefán Freyr Stefánsson ae4132adba Adding a test producer application. 2013-07-18 19:42:07 +00:00
Stefán Freyr Stefánsson da658ac69a Changes according to Eric's comments on the pull request. 
- moved the RabbitMQ ConnectionFactory configuration to a method of its own to clean up the FirehoseFactory.connect() method.
- using Throwables.propagate*() methods in exception handling.
- removed TODOs and instead using the "keyword" FUTURE as well as adding some context to the comments themselves.
- cleaned up the exception handling in hasMore() a little and made it more readable.
 2013-07-18 19:30:14 +00:00
cheddar 861542cc3c Merge branch 'master' of github.com:metamx/druid 2013-07-18 11:37:11 -07:00
cheddar d4afeb5ebe 1) upload.sh pushes up to artifacts/releases 
2) Delete some commented stuff in build.sh
 2013-07-18 11:18:28 -07:00
cheddar e885cb5a4d 1) Switch CuratorDiscoveryConfig to not be an abstract class 'cause Jackson cannot instantiate them 2013-07-18 11:15:39 -07:00
Jan Rudert d3412c851b Merge branch 'master' of github.com:metamx/druid into kafka-protobuf 2013-07-18 15:14:02 +02:00
cheddar e906481704 Merge pull request #191 from metamx/s3-puller-retries 
S3 puller retries
 2013-07-17 17:07:57 -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
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 4e84fb5f03 better logic for exiting load rule assign if replicants cannot be created 2013-07-16 16:50:52 -07:00
fjy f422bfae8c [maven-release-plugin] prepare for next development iteration 2013-07-16 13:35:38 -07:00