Commit Graph

772 Commits

Author SHA1 Message Date
Fangjin Yang e21978603a Merge branch 'master' of github.com:metamx/druid 2013-03-01 19:03:29 -08:00
Fangjin Yang df532f021a more logging 2013-03-01 19:03:16 -08:00
Gian Merlino 665d1723c0 Add TaskLockPosse#toString 2013-03-01 18:48:34 -08:00
Fangjin Yang 0b054cdd3d better logging for indexing service 2013-03-01 18:43:40 -08:00
Fangjin Yang e2b4163e31 [maven-release-plugin] prepare for next development iteration 2013-03-01 18:24:09 -08:00
Fangjin Yang 023199702e [maven-release-plugin] prepare release druid-0.3.10 2013-03-01 18:24:03 -08:00
Fangjin Yang a574da55ed fix broken UT 2013-03-01 18:22:30 -08:00
Fangjin Yang 8a9655a19e Merge branch 'master' of github.com:metamx/druid 2013-03-01 18:00:12 -08:00
Fangjin Yang 375e342d5f remove deadlock problem in pending tasks 2013-03-01 18:00:02 -08:00
Gian Merlino 0092ad7efb [maven-release-plugin] prepare for next development iteration 2013-03-01 16:57:47 -08:00
Gian Merlino 03ff72b7e2 [maven-release-plugin] prepare release druid-0.3.8 2013-03-01 16:57:38 -08:00
Fangjin Yang c9cf091998 Merge branch 'master' of github.com:metamx/druid 2013-03-01 16:54:00 -08:00
Fangjin Yang 53021c2e35 more logging 2013-03-01 16:53:49 -08:00
Gian Merlino 998ed0a8de [maven-release-plugin] prepare for next development iteration 2013-03-01 14:43:20 -08:00
Gian Merlino 89d5ddf2f7 [maven-release-plugin] prepare release druid-0.3.7 2013-03-01 14:43:13 -08:00
Gian Merlino 6b4f6bffce DbTaskStorage: Fix getAuditLogs 2013-03-01 14:40:38 -08:00
Fangjin Yang 360c6a1df1 [maven-release-plugin] prepare for next development iteration 2013-03-01 13:55:07 -08:00
Fangjin Yang a43dc44ebb [maven-release-plugin] prepare release druid-0.3.6 2013-03-01 13:55:01 -08:00
Fangjin Yang 7f32629429 fix a bug with client info resource with guice 2013-03-01 13:53:27 -08:00
Fangjin Yang 3264a689f1 [maven-release-plugin] prepare for next development iteration 2013-03-01 11:43:23 -08:00
Fangjin Yang 334fffdef5 [maven-release-plugin] prepare release druid-0.3.5 2013-03-01 11:43:16 -08:00
Fangjin Yang fb87458056 cleaner code for dimension/metric exploration on broker 2013-03-01 11:41:28 -08:00
cheddar e0bf3187b2 Merge pull request #64 from metamx/hadoop-index-task
Hadoop index task
2013-03-01 10:02:46 -08:00
Gian Merlino 26dca5630f QueryServlet: Send alerts with remote address as "peer" instead of "host"
"host" is used by the emitter. Both end up being emitted, which can be confusing.
2013-03-01 06:59:25 -08:00
Gian Merlino e40fba4de2 HadoopIndexTask: Jackson fixes and general overriding of storage-specific stuff 2013-02-28 07:53:28 -08:00
Gian Merlino f862d9205d Merge branch 'master' into hadoop-index-task
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
2013-02-27 06:53:06 -08:00
Nelson Ray d1634fe5ef fix cost balancing so assignment/balancing doesn't get stuck 2013-02-26 18:58:16 -08:00
Fangjin Yang 2e1e1753d5 [maven-release-plugin] prepare for next development iteration 2013-02-26 15:15:54 -08:00
Fangjin Yang ab456cf3b1 [maven-release-plugin] prepare release druid-0.3.4 2013-02-26 15:15:36 -08:00
fjy 3b31aa7459 Merge pull request #51 from metamx/new_balancer
New balancer
2013-02-26 14:41:45 -08:00
Nelson Ray e67a8757ba Merge remote-tracking branch 'origin/master' into new_balancer
Conflicts:
	server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-02-26 14:18:07 -08:00
Gian Merlino d32a6284ce Merge branch 'task-stuff' into indexing_refactor
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/worker/config/WorkerConfig.java
2013-02-26 13:03:56 -08:00
Gian Merlino d8fbddb9d4 Merger: Service discovery for worker -> master communication 2013-02-26 11:36:07 -08:00
Gian Merlino 2427e81874 Merger: Feedback from code review 2013-02-25 17:27:02 -08:00
Gian Merlino 14cf506c43 DefaultObjectMapper: Add GuavaModule 2013-02-25 17:05:01 -08:00
Gian Merlino 3129e5451b Merge branch 'master' into task-stuff 2013-02-25 12:33:45 -08:00
Gian Merlino 9964e7dfe4 [maven-release-plugin] prepare for next development iteration 2013-02-25 12:24:24 -08:00
Gian Merlino 99c4f9446c [maven-release-plugin] prepare release druid-0.3.3 2013-02-25 12:24:15 -08:00
gianm 4811b50055 Merge pull request #94 from metamx/fix-dpj
Fix DeterminePartitionsJob ISE for dimensions not present in all rows
2013-02-25 12:21:48 -08:00
Gian Merlino 49700dffe9 Merge branch 'master' into task-stuff
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.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
2013-02-25 12:18:31 -08:00
Gian Merlino 7d7ce2b7fe Fix DeterminePartitionsJob ISE for dimensions not present in all rows 2013-02-25 11:22:25 -08:00
Eric Tschetter 8513a5ab2a 1) Fix SimpleColumn to not produce NPEs when one of its parts is null. 2013-02-24 22:18:44 -08:00
Eric Tschetter e0f6df1a5c [maven-release-plugin] prepare for next development iteration 2013-02-21 20:39:50 -06:00
Eric Tschetter 846bc0e4f0 [maven-release-plugin] prepare release druid-0.3.2 2013-02-21 20:39:45 -06:00
Eric Tschetter 5e123988a0 1) Specify old Jackson version to resolve version conflicts between AWS SDK and curator 2013-02-21 20:37:51 -06:00
Fangjin Yang 9dbb8841a1 initial commit 2013-02-21 18:16:14 -08:00
Eric Tschetter 699aadd2b1 [maven-release-plugin] prepare for next development iteration 2013-02-21 15:50:01 -06:00
Eric Tschetter 606a2e4b01 [maven-release-plugin] prepare release druid-0.3.1 2013-02-21 15:49:55 -06:00
Eric Tschetter f8c54a72c2 1) Changes to allow for local storage 2013-02-21 15:47:01 -06:00
Eric Tschetter dc3459d3f9 1) Initial commit of refactorings on top of housejester's to simplify the zipping and simplify the creation of other methods of loading data 2013-02-21 15:47:01 -06:00