aa9aa495ae
Merge branch 'master' of github.com:metamx/druid
2013-09-27 20:50:43 -05:00
ab96301cce
Add deploy script for docs
2013-09-27 20:50:02 -05:00
4a7a28a7f6
Merge branch 'master' into fix-config
2013-09-27 17:17:46 -07:00
e60387b3d4
Merge pull request #253 from metamx/stuff
...
Fixes for property conversion, firehose registration, and the indexing service
2013-09-27 17:11:33 -07:00
2ee8bb6938
Merge pull request #252 from metamx/docs
...
Move Docs from wiki
2013-09-27 17:10:06 -07:00
dc5dab8747
Fixes for property conversion, firehose registration, and the indexing service
2013-09-27 17:09:59 -07:00
65bb68c7de
Finish converting docs over to something that displays properly
2013-09-27 19:08:34 -05:00
154b58defd
Merge branch 'master' into docs
...
Conflicts:
docs/content/Loading-Your-Data.md
2013-09-27 18:29:56 -05:00
a79ad7bab4
make dynamic master resource configuration work again
2013-09-27 15:00:40 -07:00
ca5c941560
Make more of the docs look and work correctly. Yay! Almost done with this!
2013-09-27 12:57:08 -05:00
1f3aae6edf
Merge pull request #250 from metamx/guice-is
...
Make the indexing service work with new framework
2013-09-27 10:30:24 -07:00
0b04325ee8
fix things up according to code review comments
2013-09-27 10:17:45 -07:00
86ddc7da7b
pretty !
2013-09-27 09:55:03 -07:00
7fed43041d
fix layout
2013-09-27 09:52:16 -07:00
e404295c1f
make indexing service work
2013-09-26 17:44:21 -07:00
b68c9fee83
fix layout
2013-09-26 17:38:11 -07:00
e4d4362bf9
Docs working
2013-09-26 18:22:28 -05:00
a3e16335ef
Merge pull request #248 from metamx/guice-hi
...
Port Hadoop Batch Indexer to new Guice framwork
2013-09-26 13:20:15 -07:00
8bc56daa66
fix things up according to code review comments
2013-09-26 11:35:45 -07:00
0461e4688f
Merge branch 'master' into guice-hi
2013-09-26 11:05:03 -07:00
87259321b6
port hadoop druid indexer to new guice framework
2013-09-26 11:04:42 -07:00
713ba63306
Merge pull request #245 from metamx/s3-retry-fix
...
Fix S3DataSegmentPuller retry bug
2013-09-25 15:32:18 -07:00
45e22d98f1
Fix S3DataSegmentPuller retry bug
2013-09-25 07:56:45 -07:00
9b57b4e1f3
Merge pull request #244 from metamx/guice-discovery
...
Refactor how server service discovery is done
2013-09-24 14:58:34 -07:00
19276f6bad
fix spacing issues and other code review comments
2013-09-24 14:34:09 -07:00
be5bb7f2eb
fix lifecycle startup/stop ordering problem with discovery module and make druid able to load local extensions
2013-09-24 14:20:56 -07:00
15843c3978
refactor how server service discovery is done
2013-09-24 10:36:26 -07:00
1ff04412a2
clean up realtime module and fix breakage in broker paths
2013-09-23 16:26:05 -07:00
1750b702d7
Add missed com.metamx.druid.emitter.period propery to ConvertProperties
2013-09-23 16:46:37 -05:00
4f3202f3d9
Move docs into a separate directory to better facilitate the separation that will exist. I think.
2013-09-23 16:26:10 -05:00
cc632cdb30
Make Jetty Server lazy
...
JettyServerModule had been eagerly instantiating the Server object, which was causing things that didn't care about an HTTP interface to all of a sudden require host and port parameters. The change makes the JettyServerModule only setup the bindings without eagerly instantiating the Jetty Server. Each cli needs to register the Server class with the Lifecycle in order to make it actually get used.
2013-09-23 16:02:24 -05:00
dc8a119787
fix broken unit tests are a result of the last merge
2013-09-23 12:56:01 -07:00
98c663e75c
Enable usage of SysMonitor to verify disk locations via DruidSysMonitor
2013-09-20 18:33:14 -05:00
289b4c5024
Merge pull request #243 from metamx/fix-extensionization
...
Fix issues with bindings and handling extensions
2013-09-20 16:19:02 -07:00
fefc71e34f
Refix the things that were lost in the merge.
2013-09-20 18:01:08 -05:00
b13ae3f405
Merge branch 'master' into fix-extensionization
...
Conflicts:
services/src/main/java/io/druid/cli/CliBroker.java
services/src/main/java/io/druid/cli/CliCoordinator.java
2013-09-20 17:49:13 -05:00
5712b29c8c
Fix issues with bindings and handling extensions
...
The way the Guice bindings were setup previously, each process only had bindings
for the things it cared about. This became problematic when adding extension modules
that bound everything that they could possibly need expecting that the processes would
only instantiate what they actually do need. Guice tries to fail-fast and verifies that all
bindings exist before it does anything, which is a problem because the extension bind
some objects that don't necessarily have all of their dependencies bound in all processes.
The fix for this is to build a single Injector with all bindings in it and let each of the
processes only load the things that they care about. This also requires the use of
Module overrides and other such interesting things, which are node done.
In doing the fix, I also swapped out the way that the DataSegmentPusher/Puller stuff is bound, as well as made the Cassandra stuff fail if its settings are not provided. This all of a sudden made all of the things require Cassandra's settings, so I migrated the Cassandra deep storage stuff into its own module.
In doing these changes, I also discovered that some properties weren't properly converting for the ConvertProperties command (specifically, the properties related to data segment loading and pushing), so I fixed that.
2013-09-20 17:45:01 -05:00
f26e13c61a
fix broken http endpoints
2013-09-19 17:33:58 -07:00
46631bf409
Port fix for issue where IncrementalIndex doesn't properly filter for "null" values from 0.5.x to master
2013-09-18 18:18:53 -05:00
a74b6de9c5
Merge pull request #242 from metamx/guice
...
Druid version 0.6.0
2013-09-18 16:00:08 -07:00
8d7af40313
Merge branch 'guice' of github.com:metamx/druid into guice
2013-09-18 15:59:29 -07:00
b3bfcb7792
workaround for broker to plug in extensions
2013-09-18 15:59:05 -07:00
e019dddaaa
Reapply Fix for NoSuchElementException that happens in IncrementalIndex when some columns are null
2013-09-18 17:54:49 -05:00
6150365c12
Reapply "fix regex and assign random user ids" from Xavier
2013-09-18 17:15:15 -05:00
d61fe9585a
Fix RealtimePlumberSchool.setQueryExecutorService() to actually use its argument
2013-09-18 17:05:18 -05:00
dc728b5721
Update versions of poms and make IncrementalIndexStorageAdapterTest compile
2013-09-18 17:01:03 -05:00
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
949c52d482
1) Remove snapshots
2013-09-18 15:42:30 -05:00
e551afef5d
fix broken master console
2013-09-18 09:41:59 -07:00
02b86a6fc7
Merge branch 'guice' of github.com:metamx/druid into guice
2013-09-18 09:24:24 -07:00
cheddar
fjy
fjy
cheddar
Gian Merlino
Xavier Léauté