bff5a7d786
fix some merge issues
2012-11-08 10:43:39 -08:00
8323feedb4
Merge branch 'master' into moarunittests
...
Conflicts:
client/src/main/java/com/metamx/druid/http/BrokerMain.java
2012-11-08 10:37:05 -08:00
4d6cfdc774
Merge branch 'master' into autoscaling
2012-11-07 17:27:42 -08:00
b1475219a9
Merge branch 'master' of git://github.com/tralfamadude/druid-1
...
Added DruidSetup.java and install/druid_setup.sh to run it for Druid ensemble setup (put properties to zk, create zk zpaths, prep db, and dump properties/paths in zk); property druid.zk.paths.base can establish a namespace for a druid ensemble allowing more than one ensemble to use the same zookeepers; this namespace is the base zpath prefix for paths with properties in the form druid.zk.paths.*Path which are normally set automatically now; if druid.zk.paths.*Path are explicitly set, then all of them must be set with absolute paths to ensure careful attention; ZkSetup is now deprecated, use DruidSetup instead; examples/twitter RealtimeStandaloneMain will exit properly now after a kill -15 (control-c or kill pid) instead of hanging on an unstopped daemon.
2012-11-06 20:15:57 -08:00
cb02c6841b
removed recursive zpath listing from DruidSetup dump command.
2012-11-06 15:30:46 -08:00
86d2fb3550
added DruidSetup.java and install/druid_setup.sh to run it for Druid ensemble setup (put properties to zk, create zk zpaths, prep db, and dump properties/paths in zk); property druid.zk.paths.base can establish a namespace for a druid ensemble allowing more than one ensemble to use the same zookeepers; this namespace is the base zpath prefix for paths with properties in the form druid.zk.paths.*Path which are normally set automatically now; if druid.zk.paths.*Path are explicitly set, then all of them must be set with absolute paths to ensure careful attention; ZkSetup is now deprecated, use DruidSetup instead; examples/twitter RealtimeStandaloneMain will exit properly now after a kill -15 (control-c or kill pid) instead of hanging on an unstopped daemon.
2012-11-06 00:16:27 -08:00
499263386c
timeseries for druid + unit tests
2012-11-05 11:38:03 -08:00
b1b611735e
Merge branch 'master' into autoscaling
...
Conflicts:
client/src/main/java/com/metamx/druid/http/BrokerMain.java
merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java
2012-11-02 15:57:16 -07:00
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
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
f07b15db1f
Undo massive import re-ordering
2012-11-01 18:38:27 -05:00
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
83a51a801e
cleanup redirects and reannounce workers on connection loss
2012-10-31 16:43:47 -07:00
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
11c64593ae
improvements to the indexing service and auto scaling
2012-10-31 14:35:09 -07:00
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
d0f66c1fb3
bug fix for merging with empty strings
2012-10-31 10:28:24 -07:00
e24948319b
Removed some dead/unused code.
2012-10-31 00:00:30 -07:00
c5e2a88187
Resolved dead code warning by null checking the correct variable according to the associated log statement.
2012-10-30 23:59:31 -07:00
35f04b4df6
Fixed some minor potential resource leaks.
2012-10-30 23:26:21 -07:00
0d24df7628
Removed unused imports.
2012-10-30 22:22:46 -07:00
2c341144bf
Allow blank mysql passwords
2012-10-26 10:46:30 -07:00
6a9d86e1ef
Removed unused import in IndexMerger that was causing build.sh to fail with Java 1.7.0_04-b21 on OS X 10.7.4.
2012-10-24 11:46:32 -05:00
27999caca0
1) Create LICENSE
...
2) Attach copyright and notice of license to files
2012-10-24 05:09:47 -04:00
9d41599967
Initial commit of OSS Druid Code
2012-10-24 03:39:51 -04:00
Fangjin Yang
Eric Tschetter
Paul Baclace
Ian Brandt
Trotter Cashion
Matt Croydon