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

1196 Commits

Author SHA1 Message Date
fjy d883001aaa [maven-release-plugin] prepare release druid-0.4.6 2013-05-07 09:32:46 -07:00
fjy f5dab1a4c1 add to string for groupby 2013-05-07 09:31:07 -07:00
Brian O'Neill 863b8808cc Merge branch 'master' of https://github.com/metamx/druid into cassandra-segments 2013-05-07 11:36:49 -04:00
Brian O'Neill 41e9f8fcb4 Working Push & Pull. 2013-05-07 11:35:14 -04:00
Brian O'Neill 17835e6e08 Examples for the cassandra storage. 2013-05-06 23:41:58 -04:00
Brian O'Neill 8e8736291f Added puller. 2013-05-06 23:14:18 -04:00
cheddar 01c1257cee Merge pull request #134 from metamx/event-push 
Event push
 2013-05-06 15:10:44 -07:00
Gian Merlino 7930a76b0b EventReceiverFirehoseFactory: Remove useless getHandlerId method 2013-05-06 15:00:59 -07:00
Gian Merlino 202953c57b ChatHandler: Remove useless method, add docs 2013-05-06 14:58:47 -07:00
Brian O'Neill 142668cda5 Merge branch 'master' of https://github.com/metamx/druid into cassandra-segments 2013-05-06 17:54:56 -04:00
Brian O'Neill 79d802fede Working data segment pushed for C*. 2013-05-06 17:54:12 -04:00
Gian Merlino d9b72e314e Merger: Replace EventReceivers with ChatHandlers 
This allows task-related objects to create any http endpoint their little
hearts desire.
 2013-05-06 14:46:59 -07:00
fjy f7dfea056b [maven-release-plugin] prepare for next development iteration 2013-05-06 14:30:11 -07:00
fjy a4bd6bc843 [maven-release-plugin] prepare release druid-0.4.5 2013-05-06 14:30:03 -07:00
fjy f34d73aaff fix pom versions because of failed release 2013-05-06 14:27:22 -07:00
fjy 9c8a0152d8 Merge branch 'master' of github.com:metamx/druid 2013-05-06 14:25:43 -07:00
fjy 0eb7b248d9 [maven-release-plugin] prepare release druid-0.4.4 2013-05-06 14:24:16 -07:00
xvrl 426c2b2c2d remove some_file.txt 2013-05-06 14:22:47 -07:00
cheddar a25469eba6 1) Rename "orderBy" on DefaultLimitSpec to "columns" 2013-05-06 15:43:28 -05:00
cheddar 9324b2337b Merge branch 'master' of github.com:metamx/druid 2013-05-06 15:34:50 -05:00
cheddar cdd8f78ed3 1) Make GroupByQuery not require a limit clause 
2) Make DefaultLimitSpec not require the "limit" field to be specified in JSON
3) Move a log line in Announcer to debug
 2013-05-06 15:33:08 -05:00
fjy b18a548f5c update emitter version 2013-05-06 13:22:42 -07:00
fjy 2ff9e28b2c Merge branch 'master' into spatial 2013-05-06 11:57:11 -07:00
cheddar 72e40fd97f Merge pull request #138 from metamx/kit-building 
Kit building
 2013-05-06 09:58:44 -07:00
Steve Harris 16455fe99b Merge branch 'master' of https://github.com/metamx/druid into kit-building 2013-05-04 22:10:07 -07:00
Steve Harris cfe9b7f177 Added a few comments and made sure it still works for non-kits 2013-05-04 21:02:31 -07:00
Steve Harris c0e38981ff Forgot to edit the source file so config was messed up 2013-05-04 20:50:53 -07:00
Steve Harris 5a9bf98b6c Some changes to automatically build a kit with samples. 2013-05-04 20:04:16 -07:00
fjy 8902986069 Merge branch 'master' into spatial 2013-05-03 23:09:30 -07:00
fjy 344a2b5d24 numerous bug fixes and improvements according to code review 2013-05-03 23:09:05 -07:00
cheddar de720e6e1a [maven-release-plugin] prepare for next development iteration 2013-05-03 18:41:39 -05:00
cheddar ba2b2fb39f [maven-release-plugin] prepare release druid-0.4.3 2013-05-03 18:41:33 -05:00
cheddar 36516d214e Merge pull request #136 from metamx/group_by_order_limit 
Some more adjustments to the order by/limit functionality on groupBy queries
 2013-05-03 16:38:08 -07:00
fjy 3417c50e98 Merge branch 'master' into spatial 
Conflicts:
	client/src/main/java/com/metamx/druid/query/group/DefaultLimitSpec.java
	client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java
	client/src/main/java/com/metamx/druid/query/group/LimitSpec.java
	pom.xml
 2013-05-03 16:20:37 -07:00
cheddar 665f3ef0fd 1) Unit tests for order by and limit stuff for groupBy queries 
2) Adjustments to order by and limit stuff in light of unit tests-n-stuff
 2013-05-03 17:47:18 -05:00
cheddar 3d262e6ef6 Merge pull request #135 from metamx/groupby-improve 
Orderby and Limit for Groupby
 2013-05-03 11:12:46 -07:00
fjy c15ac1fc90 limit spec for group by 2013-05-03 10:52:00 -07:00
fjy d57141f46e checking stuff in but stuff not really working yet 2013-05-03 10:35:26 -07:00
cheddar c89f4cc85f [maven-release-plugin] prepare for next development iteration 2013-05-03 12:17:05 -05:00
cheddar 4fef7c2c43 [maven-release-plugin] prepare release druid-0.4.2 2013-05-03 12:16:57 -05:00
cheddar 6649a4b38d 1) Don't require druid.zk.paths.base when attempting to load properties from zk 2013-05-03 12:13:57 -05:00
Gian Merlino b32a728863 Move indexer zk paths to ZkPathsConfig 2013-05-03 16:38:23 +03:00
Gian Merlino af08ea7617 ServiceAnnouncer: 
- Interface with two impls, Noop and Curator
- Used wherever fine services are advertised

Initialization:
- Don't automatically register with service discovery
- Add makeServiceAnnouncer, announceDefaultService methods
- Replace serviceInstance with makeServiceInstanceFactory
 2013-05-03 14:29:17 +03:00
Gian Merlino 8ce55ac632 ExecutorMain: Fix args count 2013-05-03 14:26:54 +03:00
cheddar 3c04f1635c 1) Fix bug with same name on multiple JSON properties 2013-05-02 18:00:50 -05:00
cheddar 5f184ea978 [maven-release-plugin] prepare for next development iteration 2013-05-02 17:13:28 -05:00
cheddar df6fd5eca7 [maven-release-plugin] prepare release druid-0.4.1 2013-05-02 17:13:22 -05:00
cheddar 0b96585240 1) Unbreak the build 2013-05-02 16:38:44 -05:00
cheddar 12fe145cc8 1) Setup assembly to grab all dependencies -- it's broken right now, http://jira.codehaus.org/browse/MASSEMBLY-646 2013-05-02 16:35:06 -05:00
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