Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,749 Commits 111 Branches 503 Tags 721 MiB
Commit Graph

8749 Commits

Author SHA1 Message Date
Fangjin Yang a5c3eab2f1 fix merge break 2012-11-02 15:59:55 -07:00
Fangjin Yang 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
Fangjin Yang abab35194a general cleanup and improvments for auto scaling 2012-11-02 15:56:18 -07:00
Eric Tschetter 88a3fb842c 1) New attempt at making OpenJDK 6 happy 2012-11-02 14:24:43 -05:00
Eric Tschetter 38ed1d8b75 1) Revert failed attempt at making OpenJDK6 happy. 2012-11-02 14:24:09 -05:00
Eric Tschetter 7921be790b 1) Bump up the maven version pre-requisite to 3.0.3 2012-11-02 14:17:50 -05:00
Eric Tschetter 63b2f502ac 1) Make TimelineEntry in VersionedIntervalTimeline a static class with its own generic parameters to hopefully make OpenJDK happier. 2012-11-02 11:35:23 -05:00
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
cheddar 4928978870 Merge pull request #17 from ianbrandt/codecleanup 
Minor code cleanup and other miscellanea.
 2012-11-01 16:14:17 -07:00
Fangjin Yang 83a51a801e cleanup redirects and reannounce workers on connection loss 2012-10-31 16:43:47 -07: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 9547ea494d fix bug with provision 2012-10-31 14:45:44 -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 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
Ian Brandt 35f04b4df6 Fixed some minor potential resource leaks. 2012-10-30 23:26:21 -07:00
Ian Brandt 0d24df7628 Removed unused imports. 2012-10-30 22:22:46 -07:00
Ian Brandt bd8d5bddd8 Ignored all Eclipse .settings folders. 2012-10-30 22:21:55 -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
cheddar 8a49c156ed Merge pull request #13 from metamx/jsbufferfix 
add buffered version of JavaScriptAggregator
 2012-10-29 16:04:13 -07:00
xvrl a34c5a100c add buffered version of JavaScriptAggregator 2012-10-29 14:34:17 -07:00
cheddar afb347f7ec Merge pull request #6 from mashion/search-examples 
Search examples
 2012-10-29 09:08:34 -07:00
cheddar aea00737b8 Merge pull request #7 from mashion/fix-zk-setup 
Allow blank mysql passwords
 2012-10-29 09:07:04 -07:00
Trotter Cashion 2c341144bf Allow blank mysql passwords 2012-10-26 10:46:30 -07:00
Trotter Cashion bcdfece878 Allow group_by or search queries in run_client.sh 2012-10-26 10:45:20 -07:00
Trotter Cashion a3eb4f3293 Add search query example 2012-10-26 10:45:20 -07:00
cheddar 2d69a833f4 Update examples/twitter/query.body 
Remove confusing unused fields
 2012-10-24 21:07:53 -03:00
cheddar 10b9425937 Merge pull request #5 from mashion/fix-twitter-example 
Fix twitter example to correctly groupBy by lang dimension
 2012-10-24 17:06:39 -07:00
Trotter Cashion 3763a0b738 Use correct key in query.body for twitter example 2012-10-24 15:47:55 -07:00
cheddar e5066397c3 Merge pull request #4 from tralfamadude/master 
cleaned up spurious errors in build.sh
 2012-10-24 14:58:43 -07:00
cheddar 3e09713e11 Merge pull request #3 from mashion/shutdown-server 
Stop java process in twitter example
 2012-10-24 14:57:44 -07:00
cheddar c8f549f7f1 Merge pull request #1 from mcroydon/master 
Build and example fixes
 2012-10-24 14:57:17 -07:00
Paul Baclace 71edede866 cleaned up build.sh to remove spurious errors. 2012-10-24 14:34:24 -07:00
Trotter Cashion 6c819c1b03 Stop java process when run_server.sh is killed 2012-10-24 12:40:22 -07:00
Matt Croydon 9575326c00 Added twitter and rand example output files to .gitignore. 2012-10-24 11:54:24 -05:00
Matt Croydon ae44e3ecfb Removed hardcoded jar version in examples/rand/run_server.sh which was preventing it from running. Also updated examples/rand/run_client.sh and examples/twitter/run_client.sh help messages to remove the unneeded &. 2012-10-24 11:54:05 -05:00
Matt Croydon 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
Eric Tschetter 631c3bf301 Remove gradle files 2012-10-24 12:08:47 -04: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 f09f595c7c Fix up the demos a bit 2012-10-24 04:51:32 -04:00
Eric Tschetter 9d41599967 Initial commit of OSS Druid Code 2012-10-24 03:39:51 -04:00
cheddar 70e993806e Initial commit 2012-10-23 12:08:07 -07:00