Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,309 Commits 113 Branches 506 Tags 724 MiB
Commit Graph

332 Commits

Author SHA1 Message Date
Gian Merlino 8948c8d4ca Merge branch 'master' into event-push 
Conflicts:
	client/src/main/java/com/metamx/druid/initialization/Initialization.java
	examples/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java
	index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java
	merger/src/main/java/com/metamx/druid/merger/common/task/RealtimeIndexTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/executor/ExecutorNode.java
 2013-05-02 16:34:14 +03:00
cheddar e21e85b9fa 1) Make RealtimeIndexTask merge results like it should 2013-05-01 13:08:13 -05:00
cheddar 0a3492c9f5 Move all the code for examples under the examples directory. Also add initial take on flights demo. 2013-04-30 18:27:38 -05:00
cheddar 8922adb1f2 1) Make the demos work again. 
2) First step in restructuring the demos into a single repository
 2013-04-30 18:13:55 -05:00
cheddar 405eed7c60 Better name for ServerInventoryThingie 2013-04-29 11:48:42 -05:00
cheddar 67ce1b6f26 1) Adjust all of the uses of zookeeper paths to be based on ZkPathsConfig 2013-04-26 19:19:56 -05:00
cheddar f71b941a1a 1) Refactor the announcement of segments to all exist inside the DataSegmentAnnouncer 
2) Adjust the ExecutorNodes to expose the correct nodeType given the refactorings
 2013-04-26 19:19:54 -05:00
cheddar dde50a0d87 1) Remove references to zkclient 
2) Eradicate zkclient from the poms!
 2013-04-26 19:19:53 -05:00
cheddar 43d630c098 1) Replace InventoryManagers with Curator-based Inventory Managers 
2) Replace ZkSegmentAnnouncer with CuratorSegmentAnnouncer
3) Adjust LoadQueuePeons to operate using Curator
4) Remove ZkPhoneBook

Things left to do:
1) Unit tests
2) Remove references to zkclient library
3) Remove references to PhoneBook interface
 2013-04-26 19:19:23 -05:00
Gian Merlino 341ee27419 Changes to allow pushing events directly to realtime tasks, and the creation 
of single-segment realtime tasks.

Realtime:
- Move firehose stuff to com.metamx.druid.realtime.firehose package
- ClippedFirehoseFactory provides a time-clipped view
- TimedShutoffFirehoseFactory shuts off at a particular time

Indexer:
- Split StringInputRowParser into {String,Map}InputRowParser

Merger:
- Remove minTime in favor of clipped firehoses
- Add task executor servlet that can push events to EventReceivers
- Add EventReceivingFirehose that accepts events as an EventReceiver
 2013-04-25 14:06:46 +03:00
Gian Merlino deefa870ec [maven-release-plugin] prepare for next development iteration 2013-04-19 17:15:07 -07:00
Gian Merlino 5ea1a77a45 [maven-release-plugin] prepare release druid-0.4.0 2013-04-19 17:15:00 -07:00
Gian Merlino 78850a0706 MinTimeFirehose: Care less about making nextRow work without hasMore 2013-04-19 16:57:20 -07:00
Gian Merlino 5edbf2b4b9 MinTimeFirehose: Correcter logic 2013-04-19 14:51:41 -07:00
Gian Merlino 17205ebea4 RealtimeIndexTask: Add minTime to assist in graceful switchover 2013-04-19 14:07:28 -07:00
xvrl de5622d792 bump up druid version to 0.4.0 2013-04-16 09:33:47 -07:00
Gian Merlino a166344297 [maven-release-plugin] prepare for next development iteration 2013-04-15 18:55:53 -07:00
Gian Merlino 21c2aa5793 [maven-release-plugin] prepare release druid-0.3.38 2013-04-15 18:55:46 -07:00
Gian Merlino d879c9a41e [maven-release-plugin] prepare for next development iteration 2013-04-15 18:17:42 -07:00
Gian Merlino c3d229df7f [maven-release-plugin] prepare release druid-0.3.37 2013-04-15 18:17:36 -07:00
Gian Merlino 128b873022 [maven-release-plugin] prepare for next development iteration 2013-04-15 16:43:53 -07:00
Gian Merlino eb80429177 [maven-release-plugin] prepare release druid-0.3.36 2013-04-15 16:43:47 -07:00
Gian Merlino beff15f8d4 [maven-release-plugin] prepare for next development iteration 2013-04-15 15:03:26 -07:00
Gian Merlino b71ae8ade3 [maven-release-plugin] prepare release druid-0.3.35 2013-04-15 15:03:20 -07:00
Fangjin Yang 6ed0308c59 Merge branch 'master' into stop_task 2013-04-12 22:13:45 -07:00
Gian Merlino a0b2a34845 Merge branch 'master' into stop_task 
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/actions/LockListAction.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/ExecutorServiceTaskRunner.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-04-12 14:10:27 -07:00
Gian Merlino 4d7dace033 Realtime: Update to kafka-0.7.2 
Firehose configs will need to have their "kafka-0.6.3" type changed to
"kafka-0.7.2", and "/kafka" added to the zk.connect string in consumerProps
(kafka-0.6-mmx11 hardcoded this path).
 2013-04-10 10:34:09 -07:00
cheddar a678f08b67 Merge pull request #118 from darxriggs/master 
cleanup & refactoring
 2013-04-09 18:56:59 -07:00
Fangjin Yang e125a58f0e [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:14 -07:00
Fangjin Yang 27cef03724 [maven-release-plugin] prepare release druid-0.3.33 2013-04-09 10:34:14 -07:00
Fangjin Yang 2fcf7e018b [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:14 -07:00
Fangjin Yang 4f232fe430 [maven-release-plugin] prepare release druid-0.3.32 2013-04-09 10:34:14 -07:00
Fangjin Yang bf2f2df22c [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:13 -07:00
Fangjin Yang d4dc593ecc [maven-release-plugin] prepare release druid-0.3.31 2013-04-09 10:34:13 -07:00
Fangjin Yang 185d367153 [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:12 -07:00
Fangjin Yang ff0fdc15c2 [maven-release-plugin] prepare release druid-0.3.30 2013-04-09 10:34:12 -07:00
Fangjin Yang dbb03deb26 [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:12 -07:00
Fangjin Yang ef50da3b9b [maven-release-plugin] prepare release druid-0.3.29 2013-04-09 10:34:12 -07:00
Fangjin Yang fb5b1b441e remove conflicting dependencies on ZK 2013-04-09 10:34:12 -07:00
Fangjin Yang 741a13fcac fix inconsistent druid http paths + fix master console bugs 2013-04-09 10:34:12 -07:00
Fangjin Yang 6fe9707f96 [maven-release-plugin] prepare for next development iteration 2013-04-08 11:26:37 -07:00
Fangjin Yang f0ab28be90 [maven-release-plugin] prepare release druid-0.3.34 2013-04-08 11:26:32 -07:00
René Scheibe 6c27cd2e8e cleanup - removed unused imports 2013-04-07 23:31:22 +02:00
René Scheibe a6dc29cf85 cleanup - removed extra empty lines 
- there should not be any adjacent empty lines
 2013-04-07 14:32:09 +02:00
Eric Tschetter 0b621c7bde 1) Expand logging of unregistering real-time segments to help diagnose strange zookeeper behavior 2013-04-06 11:10:36 -05:00
Fangjin Yang 8b100248a8 [maven-release-plugin] prepare for next development iteration 2013-04-01 17:17:50 -07:00
Fangjin Yang bbb3991bc9 [maven-release-plugin] prepare release druid-0.3.33 2013-04-01 17:17:44 -07:00
Fangjin Yang e8c6936aca [maven-release-plugin] prepare for next development iteration 2013-04-01 14:28:43 -07:00
Fangjin Yang 1f342dc0f2 [maven-release-plugin] prepare release druid-0.3.32 2013-04-01 14:28:36 -07:00
Fangjin Yang 30465b5c26 [maven-release-plugin] prepare for next development iteration 2013-03-28 19:48:46 -07:00
Fangjin Yang 1515dddfe0 [maven-release-plugin] prepare release druid-0.3.31 2013-03-28 19:48:39 -07:00
Fangjin Yang 04a46fb74f [maven-release-plugin] prepare for next development iteration 2013-03-28 19:21:14 -07:00
Fangjin Yang 36601ee3aa [maven-release-plugin] prepare release druid-0.3.30 2013-03-28 19:21:07 -07:00
Fangjin Yang 9e54e11827 [maven-release-plugin] prepare for next development iteration 2013-03-27 11:55:48 -07:00
Fangjin Yang 8fee044c68 [maven-release-plugin] prepare release druid-0.3.29 2013-03-27 11:55:38 -07:00
Fangjin Yang 4e209a1483 remove conflicting dependencies on ZK 2013-03-27 11:43:54 -07:00
Fangjin Yang 5bdcc3613c fix inconsistent druid http paths + fix master console bugs 2013-03-27 10:40:44 -07:00
Fangjin Yang 537f527960 Merge branch 'master' into stop_task 
Conflicts:
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
 2013-03-26 14:14:23 -07:00
Fangjin Yang e785b87be0 [maven-release-plugin] prepare for next development iteration 2013-03-26 11:10:15 -07:00
Fangjin Yang a97287fa50 [maven-release-plugin] prepare release druid-0.3.28 2013-03-26 11:10:04 -07:00
Fangjin Yang a57951c7d6 Merge branch 'stop_task' of github.com:metamx/druid into stop_task 2013-03-25 13:31:19 -07:00
Fangjin Yang f0f4eee787 Merge branch 'master' into stop_task 2013-03-25 13:31:03 -07:00
Fangjin Yang efd57dcf38 [maven-release-plugin] prepare for next development iteration 2013-03-25 13:17:50 -07:00
Fangjin Yang 3d7a0ea2d3 [maven-release-plugin] prepare release druid-0.3.27 2013-03-25 13:17:43 -07:00
Gian Merlino 3266139774 RealtimePlumberSchool: Fix wait-for-handoff in finishJob 2013-03-24 18:23:17 -07:00
Fangjin Yang e4c8122f9c Merge branch 'master' of github.com:metamx/druid into stop_task 2013-03-22 12:53:51 -07:00
Eric Tschetter 35cfd1f186 [maven-release-plugin] prepare for next development iteration 2013-03-21 13:14:20 -05:00
Eric Tschetter 3860710f11 [maven-release-plugin] prepare release druid-0.3.26 2013-03-21 13:14:14 -05:00
Fangjin Yang a1dcdab54d clean up shutdown 2013-03-20 10:51:16 -07:00
Gian Merlino dc615ab795 RealtimePlumberSchool: Faster graceful shutdown 2013-03-19 18:29:00 -07:00
Gian Merlino ce1ef94061 GracefulShutdownFirehose: MutableBoolean -> AtomicBoolean 2013-03-19 18:18:32 -07:00
Fangjin Yang 424e899760 more logs 2013-03-19 18:18:20 -07:00
Fangjin Yang 9cdfea31b2 fix shutdown problem 2013-03-19 18:05:27 -07:00
Fangjin Yang c05629e6a4 more logging 2013-03-19 17:08:48 -07:00
Fangjin Yang d53822130b Merge branch 'forking-task-runner' into stop_task 
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java
 2013-03-19 12:23:20 -07:00
Fangjin Yang 30fdb2956d intiial commit for stop task 2013-03-19 11:30:33 -07:00
Eric Tschetter f47319f118 [maven-release-plugin] prepare for next development iteration 2013-03-18 17:09:01 -05:00
Eric Tschetter 1066144b43 [maven-release-plugin] prepare release druid-0.3.25 2013-03-18 17:08:56 -05:00
Eric Tschetter cba404a65d [maven-release-plugin] prepare for next development iteration 2013-03-18 13:02:40 -05:00
Eric Tschetter 29a0a7e6c6 [maven-release-plugin] prepare release druid-0.3.24 2013-03-18 13:02:33 -05:00
Fangjin Yang b9de751b32 [maven-release-plugin] prepare for next development iteration 2013-03-15 14:32:31 -07:00
Fangjin Yang 57655f19c4 [maven-release-plugin] prepare release druid-0.3.23 2013-03-15 14:32:24 -07:00
Eric Tschetter 7dacf952d6 [maven-release-plugin] prepare for next development iteration 2013-03-15 13:53:39 -05:00
Eric Tschetter ff017fe72a [maven-release-plugin] prepare release druid-0.3.22 2013-03-15 13:53:33 -05:00
Eric Tschetter a933438e4e 1) Fix bugs with VersionConverterTask 
2) Fix bugs with NPEs on indexing
 2013-03-15 13:48:55 -05:00
Gian Merlino b8c08f235a Realtime: 
- Move VersioningPolicy, RetryPolicy outside of RealtimePlumberSchool
- Move plumber stuff into its own package, since there's a lot of it
 2013-03-14 12:56:25 -07:00
Gian Merlino 9fe6a37f86 Realtime: Remove MetadataUpdater 2013-03-14 12:35:38 -07:00
Gian Merlino df8e4d4061 Merge branch 'master' into realtime-index-task 2013-03-13 22:43:01 -07:00
Eric Tschetter 2bd34f1454 [maven-release-plugin] prepare for next development iteration 2013-03-13 18:32:00 -05:00
Eric Tschetter b7960e202d [maven-release-plugin] prepare release druid-0.3.21 2013-03-13 18:31:55 -05:00
Eric Tschetter f1175389c4 [maven-release-plugin] prepare for next development iteration 2013-03-13 16:33:17 -05:00
Eric Tschetter 8aac482618 [maven-release-plugin] prepare release druid-0.3.20 2013-03-13 16:33:10 -05:00
Fangjin Yang a49d0c5e4c [maven-release-plugin] prepare for next development iteration 2013-03-11 17:20:16 -07:00
Fangjin Yang 97f828f6b1 [maven-release-plugin] prepare release druid-0.3.19 2013-03-11 17:20:09 -07:00
Gian Merlino 3fa46988f5 Realtime: 
- MetadataUpdater now built from SegmentAnnouncer, SegmentPublisher instances.
- Sinks can take a version instead of always using interval.start. The realtime
  plumber selects a version using a VersioningPolicy.
- Plumbers gained a startJob method.
- Realtime plumbers gained an implementation for finishJob.
 2013-03-11 11:14:51 -07:00
Gian Merlino 4126893ba3 KafkaFirehoseFactory: Fix serialization 2013-03-11 11:13:19 -07:00
Eric Tschetter c9b411c0ca 1) Remove the need for TaskActions to require a Task as a constructor parameter 2013-03-07 17:44:05 -06:00
Fangjin Yang 552b365194 [maven-release-plugin] prepare for next development iteration 2013-03-04 15:11:37 -08:00
Fangjin Yang fdb3911794 [maven-release-plugin] prepare release druid-0.3.18 2013-03-04 15:11:28 -08:00
Fangjin Yang 91f54a72ee fix broken UT 2013-03-04 15:09:55 -08:00
Fangjin Yang 6977fe03bd [maven-release-plugin] prepare for next development iteration 2013-03-04 13:08:26 -08:00
Fangjin Yang d4f4e41320 [maven-release-plugin] prepare release druid-0.3.16 2013-03-04 13:08:09 -08:00
Fangjin Yang ee38d096c7 [maven-release-plugin] prepare for next development iteration 2013-03-02 09:29:04 -08:00
Fangjin Yang a90d204ba2 [maven-release-plugin] prepare release druid-0.3.15 2013-03-02 09:28:51 -08:00
Fangjin Yang 879b2475d4 [maven-release-plugin] prepare for next development iteration 2013-03-01 19:53:13 -08:00
Fangjin Yang e3ba6efb80 [maven-release-plugin] prepare release druid-0.3.14 2013-03-01 19:53:07 -08:00
Fangjin Yang 7f6747194d [maven-release-plugin] prepare for next development iteration 2013-03-01 19:45:59 -08:00
Fangjin Yang 06a2a3a793 [maven-release-plugin] prepare release druid-0.3.13 2013-03-01 19:45:50 -08:00
Fangjin Yang e0700bb161 [maven-release-plugin] prepare for next development iteration 2013-03-01 19:28:34 -08:00
Fangjin Yang 38c8ffb552 [maven-release-plugin] prepare release druid-0.3.12 2013-03-01 19:28:28 -08:00
Fangjin Yang 49e61d00fd [maven-release-plugin] prepare for next development iteration 2013-03-01 19:05:46 -08:00
Fangjin Yang 7e316e3508 [maven-release-plugin] prepare release druid-0.3.11 2013-03-01 19:05:39 -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
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
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
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 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 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
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
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 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
Gian Merlino 824e3c0eb2 [maven-release-plugin] prepare for next development iteration 2013-02-15 13:03:39 -08:00
Gian Merlino 6bbc992101 [maven-release-plugin] prepare release druid-0.3.0 2013-02-15 13:03:32 -08:00
Eric Tschetter c5b78e75cf 1) Move up to Jackson 2.1 
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
 2013-02-13 18:51:32 -08:00
xvrl 07b0b4611b bump up to 0.3.0 2013-02-12 09:52:21 -08:00
Fangjin Yang e519f82e87 [maven-release-plugin] prepare for next development iteration 2013-02-11 10:58:51 -08:00
Fangjin Yang 73f7468a23 [maven-release-plugin] prepare release druid-0.2.7 2013-02-11 10:58:43 -08:00
Fangjin Yang ec2b906fad [maven-release-plugin] prepare for next development iteration 2013-02-06 18:43:42 -08:00
Fangjin Yang 22d9607169 [maven-release-plugin] prepare release druid-0.2.6 2013-02-06 18:43:34 -08:00
Fangjin Yang e09c658352 [maven-release-plugin] prepare for next development iteration 2013-02-06 17:42:39 -08:00
Fangjin Yang 668353e895 [maven-release-plugin] prepare release druid-0.2.5 2013-02-06 17:42:33 -08:00
Fangjin Yang d023d219ae [maven-release-plugin] prepare for next development iteration 2013-02-06 16:54:21 -08:00
Fangjin Yang d0fdf4ccf0 [maven-release-plugin] prepare release druid-0.2.4 2013-02-06 16:54:16 -08:00
Eric Tschetter 34b4383934 1) Adjust DataSegment to have a binaryVersion field that indicates the expected binary version of the segment files 
2) Eliminate race condition from RemoteTaskRunnerTest.testAlreadyExecutedTask()
 2013-02-01 18:59:33 -06:00
xvrl 7ec3563e7b [maven-release-plugin] prepare for next development iteration 2013-02-01 16:25:42 -08:00
xvrl a239f62158 [maven-release-plugin] prepare release druid-0.2.3 2013-02-01 16:25:35 -08:00
Fangjin Yang 00e6ac1e10 [maven-release-plugin] prepare for next development iteration 2013-01-30 17:09:23 -08:00
Fangjin Yang ef19de8270 [maven-release-plugin] prepare release druid-0.2.2 2013-01-30 17:09:18 -08:00