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

6115 Commits

Author SHA1 Message Date
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
cheddar d1a8b93b3f 1) druid-services -> services 2013-05-01 17:37:38 -05:00
cheddar b82a4e57f3 1) A "working" assembly 2013-05-01 17:31:29 -05:00
Brian O'Neill b8c8ed8d68 Formatting. 2013-05-01 15:17:15 -04:00
Brian O'Neill bf01399a2a Cassandra Data Segment Pusher, initial commit. 2013-05-01 15:11:50 -04:00
fjy 6d4c0850ca Merge branch 'master' into spatial 
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
 2013-05-01 11:49:00 -07:00
Brian O'Neill fd4b14ece2 Eclipse formatting file. (only what I inferred from a few files) 2013-05-01 14:17:57 -04:00
Brian O'Neill 7f839f7e00 Fixes compilation error to accomodate multiple generic constraints in CharStream. 
[ERROR] /Users/bone/git/boneill42/druid/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerNode.java:[100,39] cannot find symbol
[ERROR] symbol  : method toString(<anonymous com.google.common.io.InputSupplier<java.lang.Readable>>)
 2013-05-01 14:17:57 -04:00
cheddar e21e85b9fa 1) Make RealtimeIndexTask merge results like it should 2013-05-01 13:08:13 -05:00
cheddar e1a2c43baf 1) Adjust the example code to all be in one repository. 
2) Adjust the run scripts to be able to switch between different examples.
 2013-05-01 12:51:26 -05:00
fjy 63ccb24ef6 Merge branch 'master' into spatial 
Conflicts:
	pom.xml
	server/src/main/java/com/metamx/druid/http/InfoResource.java
 2013-05-01 10:12:04 -07:00
Gian Merlino 407e413a90 IndexerCoordinatorResource: Return 404 with proper json for status not found 2013-05-01 17:13:02 +03:00
Gian Merlino 1a2135a0ea TaskStorageQueryAdapter: Fix getSameGroupMergedStatus for nonexistent tasks 2013-05-01 12:26:36 +03: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 72982f5980 Remove the rand demo directory 2013-04-30 18:18:15 -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 e1367f256b Fixes #112, paths specified as "s3://" when given to HadoopDruidIndexerMain will be converted to "s3n://" and loaded via Hadoop's default file system for s3n. 2013-04-30 12:58:36 -05:00
cheddar 60b279b0d3 1) Add support for storing segments in HDFS 2013-04-30 12:47:43 -05:00
cheddar cd535fcd79 Merge pull request #131 from metamx/curator 
Remove references to i0tec.zkClient and replace with Curator
 2013-04-30 09:02:47 -07:00
cheddar 25d7ecacb1 No more snapshots 2013-04-30 11:01:04 -05:00
Gian Merlino 862365e1fa EventReceiverFirehoseFactory: Move parse exceptions from hasMore to addAll 2013-04-30 15:05:26 +03:00
cheddar a665e8b3b7 whitespace! 2013-04-29 14:02:30 -05:00
cheddar 2630d75cd3 More explicit comments around Zookeeper race condition 2013-04-29 13:58:57 -05:00
cheddar cee15bb88a Adjust passing of nodeType to ExecutorMain to be via a system property instead of via a command line argument. 2013-04-29 12:05:59 -05:00
cheddar 405eed7c60 Better name for ServerInventoryThingie 2013-04-29 11:48:42 -05:00
fjy 2849486251 simpler sequence limiting 2013-04-28 15:34:43 -07:00
fjy 67cafaa0b1 Merge branch 'master' into spatial 2013-04-26 17:56:18 -07:00
fjy 82a62e3ba0 bug fixes for spatial and groupby; threshold for groupby 2013-04-26 17:46:25 -07:00
cheddar 52ba60963e Screwed up the conflicts on rebasing. Fixorz orz orz 2013-04-26 19:25:23 -05:00
cheddar 99305b29c8 Fixorz unit tests! 2013-04-26 19:19:57 -05:00
cheddar 74ff07ba3e Moar unit tests 2013-04-26 19:19:57 -05:00
cheddar 8768406069 1) Unit tests! 2013-04-26 19:19:57 -05:00