Fangjin Yang
69b929fad5
Merge branch 'master' into moarunittests
...
Conflicts:
merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java
merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
merger/src/main/java/com/metamx/druid/merger/worker/Worker.java
merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java
2012-11-01 16:41:13 -07:00
Fangjin Yang
09cc2e3353
Merge branch 'master' into moarunittests
...
Conflicts:
client/src/main/java/com/metamx/druid/http/BrokerMain.java
merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java
merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
merger/src/main/java/com/metamx/druid/merger/worker/Worker.java
merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java
merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java
2012-11-01 16:39:28 -07:00
Eric Tschetter
f07b15db1f
Undo massive import re-ordering
2012-11-01 18:38:27 -05:00
Eric Tschetter
8dd6f5c059
1) Refactor the BrokerMain into a BrokerMain and a BrokerNode to allow for extensions
...
2) Rename ServerMain to ComputeMain
3) Refactor ComputeMain to ComputeMain and ComputeNode to allow for extensions
4) Remove "TheSizeAdjuster", was old legacy stuff that's not relevant anymore
5) Fix bug with registering different IndexIO handlers
6) Adjust it so that when a query type is unknown, it returns an error message instead of just emitting an alert and returning nothing
7) Create super classes for the various *Node classes that allow for code sharing on pieces that are common
2012-11-01 18:20:38 -05:00
Ian Brandt
e7ec073d75
Cleaned Maven dependency configuration. In particular the 'mvn dependency:analyze' report no longer warns of used but undeclared dependencies.
2012-10-31 16:10:07 -07:00
Fangjin Yang
11c64593ae
improvements to the indexing service and auto scaling
2012-10-31 14:35:09 -07:00
Ian Brandt
e8f02219bb
Streamlined the Maven POMs, in particular the plugin configurations. The 'mvn versions:display-plugin-updates' report is now warning free, and there are no more Maven warnings reported in Eclipse.
2012-10-31 12:58:16 -07:00
Fangjin Yang
fe9cb397a1
remove unncessarily created file
2012-10-31 10:29:03 -07:00
Fangjin Yang
d0f66c1fb3
bug fix for merging with empty strings
2012-10-31 10:28:24 -07:00
Ian Brandt
e24948319b
Removed some dead/unused code.
2012-10-31 00:00:30 -07:00
Ian Brandt
0d24df7628
Removed unused imports.
2012-10-30 22:22:46 -07:00
Eric Tschetter
d7f85cfbc4
1) Fix configuration property naming issue.
2012-10-30 12:08:30 -05:00
Eric Tschetter
f062e136d0
1) Fix bug with sharded realtime data ingestion
2012-10-30 10:59:07 -05:00
Eric Tschetter
27999caca0
1) Create LICENSE
...
2) Attach copyright and notice of license to files
2012-10-24 05:09:47 -04:00
Eric Tschetter
9d41599967
Initial commit of OSS Druid Code
2012-10-24 03:39:51 -04:00