Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-03-03 07:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,951 Commits 116 Branches 508 Tags
Commit Graph

543 Commits

Author SHA1 Message Date
cheddar
cb90ed05b0 Revert the previous commit. After going down this path, I realized that extracting things enough to allow Queries to be extended without depending on Druid proper was going to lead down a very nasty path. So, I've decided against that. Extending queries will require a tight dependency on Druid proper. 2013-08-29 16:45:03 -05:00
cheddar
2a46086e20 1) Didn't remove the io.druid files from client. Remove those and make sure things compile 
2) Switch DefaultObjectMapper to CommonObjectMapper
3) Create new DefaultObjectMapper in client that has Query stuff registered on it by default
 2013-08-29 15:25:36 -05:00
cheddar
5ad023cd3f Merge branch 'master' into guice 2013-08-29 13:59:59 -05:00
cheddar
df2465eb99 1) Add unit test for groupBy query with dimension that doesn't exist 
2) Fix group by query to work with new unit test, fixes #232
 2013-08-29 11:48:34 -05:00
cheddar
15ec8e7054 1) Remove the Searchable interface 2013-08-28 18:51:19 -05:00
cheddar
c02d887cfe 1) Rewrite SearchQueryRunner to not require StorageAdapter to be "Searchable" 
2) Extract SearchQueryRunner out of SearchQueryRunnerFactory
3) Extract ColumnSelectorBitmapIndexSelector out to make it reusable
 2013-08-28 18:50:40 -05:00
cheddar
1f37e962f6 1) Delete the files that have moved to druid-api and get them through the druid-api dependency. Still need to fix Searchable on StorageAdapter, but other than that, everything should compile. 2013-08-28 16:18:40 -05:00
cheddar
9c30ced5ea 1) Move various "api" classes to io.druid packages and make sure things compile and stuff 2013-08-28 15:51:02 -05:00
cheddar
fc60158273 1) What is an .Rhistory file and why is it checked in? It's not! (anymore) 2013-08-27 14:37:12 -05:00
cheddar
ee1e73cfa1 1) Make it compile again after the merge 2013-08-27 14:36:01 -05:00
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
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
55dbda2046 1) Worker appears to be running! It's also now known as the MiddleManager 2013-08-23 17:59:48 -05:00
cheddar
b897c2cb22 1) IndexCoordinator appears to work as the CliOverlord now, yay! 2013-08-23 14:11:34 -05: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
1fb6107a37 fix the case where RTR does not clean up a completed task on startup 2013-08-15 13:09:02 -07:00
cheddar
ba5ed4c9d4 1) Fix bug with NPE thrown when requesting a dimension on a GroupBy query that is not dictionary encoded 2013-08-14 17:34:11 -07:00
fjy
fc1018bc3f revert removal of master loadstatus 2013-08-14 14:02:47 -07:00
cheddar
c0624d9591 Merge branch 'master' of github.com:metamx/druid 2013-08-14 10:04:04 -07:00
cheddar
a7ef5b8b70 1) Fix bug with SingleSegmentLoader.StorageLocation keeping track of its storage size incorrectly. Add unit test ftw. 2013-08-14 10:03:47 -07:00
cheddar
7ebe053ac1 Fix bug with segment loader counting thingie 2013-08-14 09:37:22 -07:00
cheddar
4791d0466d Merge pull request #198 from metamx/loadBalancer 
Improve runtime of segment distribution algorithm
 2013-08-13 18:47:43 -07:00
cheddar
c2305a82f9 Merge pull request #209 from zanox/kafka-protobuf 
Kafka protobuf
 2013-08-13 18:38:27 -07:00
fjy
85ee8bb267 port realtime to guice 2013-08-13 17:08:45 -07:00
cheddar
145e08682c 1) Add check in ServerManagerTest to make sure that the Segment has been "checked out" before the factory ever sees it. 
2) Some code readability changes to ReferenceCountingSegment
 2013-08-13 17:01:24 -07:00
cheddar
a5855fb749 1) Fix ServerManager to make sure that it "checks out" the Segment before it starts processing 2013-08-13 14:51:14 -07:00
cheddar
28c7e78a91 1) Fix ReferenceCountingSegmentTest to actually work again 2013-08-13 14:28:44 -07:00
fjy
41347c82bb fix broken server manager tests 2013-08-13 12:07:45 -07:00
fjy
070d822345 fix broken UT 2013-08-13 12:01:24 -07:00
fjy
13e522c8a7 update the server manager unit tests to check for the case where a segment may be accessed in toYield calls before an increment occurs 2013-08-13 11:53:41 -07:00
cheddar
bb18b162ab 1) Include new version of java-util to fix issue with resources not getting closed when an exception is thrown sometimes 
2) Whitespace changes to GroupByQueryEngine
 2013-08-12 17:57:30 -07:00
Gian Merlino
8d7a4f4493 Retries for S3TaskLogs, S3DataSegmentPusher 2013-08-12 14:27:34 -07:00
fjy
a39eb65edb change summary of segment failures to one per line 2013-08-12 13:15:35 -07:00
fjy
dd20950f8a adding missing continue 2013-08-12 13:07:29 -07:00
fjy
2ec2957207 clean up the error reporting code according to code review 2013-08-12 13:04:48 -07:00
fjy
0c360c05c2 better handling of exceptions during startup 2013-08-12 12:56:59 -07:00
fjy
2f728f3478 fix zk coord to not fail during startup exceptions 2013-08-12 11:33:42 -07:00
Jan Rudert
3f32ef7bbc Merge branch 'master' of github.com:metamx/druid into kafka-protobuf 2013-08-12 17:42:40 +02:00
jan
55267ca0e4 removed @author tags 2013-08-11 13:44:13 +02:00
Dhruv Parthasarathy
01db89ac6e fixed issue with web console. Cleaned up code 2013-08-09 00:33:40 -07:00
fjy
a190269faa fix druid master segments getting stuck bug 2013-08-08 22:06:41 -07:00
Dhruv Parthasarathy
fc5e15f72b merged changes with master 2013-08-08 18:11:33 -07:00
Dhruv Parthasarathy
abe347efd3 merged with master 2013-08-08 17:21:57 -07:00
Dhruv Parthasarathy
764863d6f5 made volatile. fixed parens 2013-08-08 16:40:10 -07:00
Dhruv Parthasarathy
8a8ea5d028 removed test annotation from profiler 2013-08-08 16:38:24 -07:00
Dhruv Parthasarathy
01b35ec819 all tests passed. Ready for merge 2013-08-08 16:23:26 -07:00
Dhruv Parthasarathy
eed9e1b373 merged with master 2013-08-08 16:14:06 -07:00