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

1896 Commits

Author SHA1 Message Date
cheddar 8097450d8c Some things that didn't get committed with the merge for some reason!? 2013-08-27 14:29:03 -05:00
cheddar 5fa944dd26 Merge branch 'master' into guice 
Conflicts:
	client/src/main/java/com/metamx/druid/coordination/BatchDataSegmentAnnouncer.java
	client/src/main/java/com/metamx/druid/curator/announcement/Announcer.java
	client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java
	client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/S3TaskLogs.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/ForkingTaskRunner.java
	indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunner.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/WorkerCuratorCoordinator.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
	pom.xml
	server/src/main/java/com/metamx/druid/http/MasterMain.java
	server/src/main/java/com/metamx/druid/http/MasterServletModule.java
	server/src/main/java/com/metamx/druid/master/DruidMasterConfig.java
	server/src/test/java/com/metamx/druid/master/DruidMasterTest.java
	server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java
 2013-08-27 14:27:32 -05:00
cheddar 3617ac17fc 1) Eliminate ExecutorMain and have it run using the new Main! 2013-08-27 14:11:05 -05:00
Russell Jurney 2dbd49b6e6 Removed zk references from realtime config 2013-08-26 20:34:24 -07:00
cheddar 269997dc94 1) ExecutorNode is working, except for the running of the task. Need to adjust it to be able to run a task and then everything will be wonderful 2013-08-26 18:08:41 -05:00
cheddar 6636ef1ea8 Remove unused files again 2013-08-23 18:00:56 -05:00
cheddar 55dbda2046 1) Worker appears to be running! It's also now known as the MiddleManager 2013-08-23 17:59:48 -05:00
cheddar 613ebd54b5 1) Delete unused things 2013-08-23 14:32:14 -05:00
cheddar b897c2cb22 1) IndexCoordinator appears to work as the CliOverlord now, yay! 2013-08-23 14:11:34 -05:00
cheddar 91c160ba0d Adjust maven assembly so that the tarballs are not released to our artifactory on release. 2013-08-23 13:42:46 -05:00
cheddar 344ec1ec2f [maven-release-plugin] prepare for next development iteration 2013-08-23 13:20:09 -05:00
cheddar 5b0de6eb5c [maven-release-plugin] prepare release druid-0.5.48 2013-08-23 13:20:02 -05:00
cheddar 7540ad7071 Merge pull request #230 from rjurney/master 
Fixing bug where twitter example does not run.
 2013-08-23 08:02:06 -07:00
Russell Jurney 1669e46338 Fixing bug where twitter example does not run. 2013-08-22 19:48:21 -07:00
cheddar 1aa99f5878 Merge pull request #218 from metamx/guice-rt 
Port Realtime nodes to guice
 2013-08-22 16:00:12 -07:00
gianm 965c1a4353 Merge pull request #229 from metamx/fix-index 
Fix persist of empty indexes in index generator job
 2013-08-22 15:46:52 -07:00
fjy 261ef7ce56 add some fixes 2013-08-22 10:56:50 -07:00
fjy d11d0a8284 fix according to code review 2013-08-22 10:49:46 -07:00
fjy 6a8c160740 update code according to code review 2013-08-22 10:46:05 -07:00
fjy 3f51ef63a4 Merge branch 'guice' into guice-rt 2013-08-22 10:20:53 -07:00
fjy 778fd0f10e Fix persist of empty indexes in index generator job 2013-08-22 10:16:43 -07:00
fjy 4102dbd1e0 [maven-release-plugin] prepare for next development iteration 2013-08-21 21:50:55 -07:00
fjy 0daa2a95fe [maven-release-plugin] prepare release druid-0.5.47 2013-08-21 21:50:46 -07:00
fjy d92ab8bb58 more logs for RTR 2013-08-21 21:47:59 -07:00
fjy b1d0f989ec [maven-release-plugin] prepare for next development iteration 2013-08-21 20:28:15 -07:00
fjy ab467bf42a [maven-release-plugin] prepare release druid-0.5.46 2013-08-21 20:28:06 -07:00
Gian Merlino 6bbda6f043 Exclude org.apache.httpcomponents stuff from geoip2 2013-08-21 20:22:53 -07:00
fjy 1037a48a8e [maven-release-plugin] prepare for next development iteration 2013-08-21 18:55:49 -07:00
fjy 6b9ec95f01 [maven-release-plugin] prepare release druid-0.5.45 2013-08-21 18:55:40 -07:00
fjy 0fa8b48fb7 fix selector dim filter check for value null 2013-08-21 18:51:44 -07:00
Xavier Léauté ef12439df9 add wikipedia realtime example 2013-08-21 17:56:31 -07:00
Xavier Léauté 5b6273ac3d fix null values in wikipedia decoder 2013-08-21 17:56:31 -07:00
Xavier Léauté 71b19af61f fix missing json property names 2013-08-21 17:38:30 -07:00
cheddar 138860696a Merge pull request #225 from metamx/num-shard-spec 
NumberedShardSpec
 2013-08-21 15:24:59 -07:00
Gian Merlino c56c6b8bf5 Fix test oopsie 2013-08-21 15:05:37 -07:00
Gian Merlino 94b5c292b9 Fix test oopsie 2013-08-21 15:05:29 -07:00
Gian Merlino 9b9a2a9f53 Merge branch 'master' into num-shard-spec 
Conflicts:
	common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java
 2013-08-21 15:01:46 -07:00
Gian Merlino 08a95103bd More NumberedShardSpec serde tests 2013-08-21 14:45:24 -07:00
cheddar b4310d6cbf Merge pull request #219 from metamx/wikipedia-firehose 
Wikipedia firehose
 2013-08-21 14:34:07 -07:00
Xavier Léauté 7913b27066 reuse tmp file for geoip db 2013-08-21 14:12:39 -07:00
cheddar 8980a4ace9 Merge pull request #227 from metamx/version-in-status 
Add maven version to status information
 2013-08-21 13:59:19 -07:00
Xavier Léauté 3adcaab1ef Eric said I did too much work 
This reverts commit d5b3f71033.
 2013-08-21 13:58:02 -07:00
Xavier Léauté 0f4a132807 address code review 2013-08-21 13:57:50 -07:00
Xavier Léauté d5b3f71033 replace StatusServlet with StatusResource 2013-08-21 13:51:25 -07:00
Xavier Léauté b95d9498ca add version information to status 2013-08-21 13:37:56 -07:00
cheddar 3bcee8cdb3 Merge pull request #222 from metamx/rt-ut 
Basic unit tests for realtime functionality
 2013-08-21 13:33:39 -07:00
fjy ac32c6f27c fix tests according to code review 2013-08-21 13:23:38 -07:00
fjy 54ad854471 Merge branch 'master' into rt-ut 2013-08-21 13:15:02 -07:00
cheddar c4b4f8908e Merge pull request #226 from metamx/bug-fix 
1) bug fix for RemoteTaskRunner removing workers race condition
2) partition chunks not being sorted by chunk number
 2013-08-21 13:05:18 -07:00
fjy 54f00479cc add explicit null check for moving tasks from pending to running 2013-08-21 13:02:35 -07:00