Commit Graph

1786 Commits

Author SHA1 Message Date
cheddar 6bfe2310bb Merge branch 'master' into guice
Conflicts:
	client/pom.xml
	client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java
	indexing-common/pom.xml
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java
	realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java
	realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java
	realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java
	realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
	server/src/main/java/com/metamx/druid/BaseServerNode.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
	server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java
	server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
2013-09-18 16:46:54 -05:00
cheddar 949c52d482 1) Remove snapshots 2013-09-18 15:42:30 -05:00
fjy e551afef5d fix broken master console 2013-09-18 09:41:59 -07:00
fjy 02b86a6fc7 Merge branch 'guice' of github.com:metamx/druid into guice 2013-09-18 09:24:24 -07:00
fjy f7df951610 broker needs to announce itself in service discovery 2013-09-18 09:23:46 -07:00
cheddar 4557838c5d Merge pull request #241 from rjurney/guice
Updated config to create tables.
2013-09-17 17:58:52 -07:00
Russell Jurney 295426df9f Updated config to create tables. 2013-09-17 17:07:55 -07:00
cheddar 48dea82890 Merge pull request #240 from rjurney/guice
Working import, sans tables
2013-09-17 13:14:45 -07:00
fjy 64f3821b4e throw exception for annotated members 2013-09-16 17:36:31 -07:00
Russell Jurney 6df31408d9 made layouts work 2013-09-16 17:09:59 -07:00
Russell Jurney 946a9e502f Replaced spaces with dashes 2013-09-16 16:19:49 -07:00
fjy cabae7993d port over multi threaded realtime and also fix broken realtime nodes that can't start up 2013-09-16 16:03:47 -07:00
Russell Jurney 063a068ab2 Converted links, sans space to slash 2013-09-16 16:01:14 -07:00
Russell Jurney 248fba683a Added prepend tag to make pages display. 2013-09-16 14:49:36 -07:00
Russell Jurney c06b37f36e Won't serve html 2013-09-16 14:08:22 -07:00
fjy 9b4c3756ed fix exception catching logic of moving segments 2013-09-15 10:27:37 -07:00
Gian Merlino 163fa14e62 [maven-release-plugin] prepare for next development iteration 2013-09-13 19:02:46 -07:00
Gian Merlino a20f3fc6dd [maven-release-plugin] prepare release druid-0.5.58 2013-09-13 19:02:40 -07:00
fjy d0b0adbb68 [maven-release-plugin] prepare for next development iteration 2013-09-13 18:57:25 -07:00
fjy 23c5fdb107 [maven-release-plugin] prepare release druid-0.5.57 2013-09-13 18:57:20 -07:00
fjy b0a09ba1f1 [maven-release-plugin] prepare for next development iteration 2013-09-13 18:45:20 -07:00
fjy b17f5c403b [maven-release-plugin] prepare release druid-0.5.56 2013-09-13 18:45:14 -07:00
fjy 30bde45556 Merge branch 'master' of github.com:metamx/druid 2013-09-13 18:41:36 -07:00
fjy 5a8b71ddec fix how druid services is assembled 2013-09-13 18:41:33 -07:00
Gian Merlino 22a99c7589 [maven-release-plugin] prepare for next development iteration 2013-09-13 17:59:03 -07:00
Gian Merlino 542d564453 [maven-release-plugin] prepare release druid-0.5.55 2013-09-13 17:58:56 -07:00
cheddar 8b480e55db Add docs from github wiki 2013-09-13 17:20:39 -05:00
fjy 48db34a4b7 Merge branch 'master' of github.com:metamx/druid 2013-09-13 14:36:49 -07:00
fjy 87dc839fb2 fix example properties for real time node 2013-09-13 14:36:42 -07:00
Gian Merlino 24df6c482d Use shared query executor in indexing-service 2013-09-13 14:33:13 -07:00
cheddar 73a87fe2f6 Merge branch 'guice' of github.com:metamx/druid into guice 2013-09-13 16:28:21 -05:00
cheddar 66c2ea2ce3 1) Move doc/publications to top-level publications directory.
2) Move data_flow and segment propagation stuff to static.druid.io/docs/flow and remove from repository
2013-09-13 16:26:41 -05:00
cheddar 242476a73f Merge pull request #239 from metamx/mt-rt
Correctly use number of processing threads for realtime query execution
2013-09-13 14:00:41 -07:00
fjy 1ec098c010 use num processing threads for realtime query execution 2013-09-13 13:54:41 -07:00
cheddar ef1ac46a7e Merge pull request #237 from metamx/is-ut
Rework tests in indexing service to be more unit testy
2013-09-13 13:21:03 -07:00
fjy f7c10e3594 rework tests in indexing service to be more unit testy 2013-09-12 16:37:58 -07:00
cheddar e0738b3b22 1) Add tool to convert properties from the old settings to the new ones. 2013-09-12 17:59:23 -05:00
cheddar 044e43d231 1) Remove last TODO related to segment lifetime. Don't think we care about that anymore. 2013-09-12 14:17:11 -05:00
cheddar a001c1d32a 1) Remove TODO from ZkCoordinator. Always load the cache, 'cause I say so. 2013-09-12 13:02:40 -05:00
cheddar 2ea09e2d70 1) Clean up specification of StorageLocations 2013-09-12 12:56:56 -05:00
cheddar a2dcc45a8e 1) Remove SingleSegmentLoader and replace with OmniSegmentLoader 2013-09-12 11:47:03 -05:00
cheddar b8bd19e87c whitespace 2013-09-12 10:13:04 -05:00
cheddar 3e4a4f5566 1) Adjustments to allow for the addition of new Runnables via modules. Modules should implement CliCommandCreator and add their stuff there. 2013-09-11 17:41:20 -05:00
cheddar 6c9a107356 1) remove duplicate package initialization.initialization 2013-09-09 17:02:57 -05:00
fjy e03c623467 [maven-release-plugin] prepare for next development iteration 2013-09-05 13:48:21 -07:00
fjy 552d0c061a [maven-release-plugin] prepare release druid-0.5.54 2013-09-05 13:48:11 -07:00
Xavier Léauté cd14e7fbca fix regex and assign random user ids 2013-09-05 13:43:25 -07:00
fjy 5a64e2a64a [maven-release-plugin] prepare for next development iteration 2013-09-04 14:24:04 -07:00
fjy 523355d00b [maven-release-plugin] prepare release druid-0.5.53 2013-09-04 14:23:56 -07:00
fjy 898f937f3c also update wikipedia example query.body 2013-09-04 14:20:25 -07:00