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 |
|
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 |
|
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
|
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
|
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 |
|
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
|
ed666d9d5f
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-20 19:37:52 -07:00 |
|
fjy
|
66dcfe8c3e
|
[maven-release-plugin] prepare release druid-0.5.44
|
2013-08-20 19:37:44 -07:00 |
|
fjy
|
baedacf970
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-20 19:29:05 -07:00 |
|
fjy
|
a4eb025ba7
|
[maven-release-plugin] prepare release druid-0.5.43
|
2013-08-20 19:28:56 -07:00 |
|
Gian Merlino
|
a3793eeba4
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-20 17:58:28 -07:00 |
|
Gian Merlino
|
b792bf2ba5
|
[maven-release-plugin] prepare release druid-0.5.42
|
2013-08-20 17:58:22 -07:00 |
|
fjy
|
47ec240703
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-15 13:47:57 -07:00 |
|
fjy
|
33e2fb3e21
|
[maven-release-plugin] prepare release druid-0.5.41
|
2013-08-15 13:47:48 -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
|
0c5a906a1b
|
Merge branch 'master' of github.com:metamx/druid
|
2013-08-14 17:34:22 -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 |
|
Gian Merlino
|
a0fcd02b3c
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-14 17:03:40 -07:00 |
|
Gian Merlino
|
b6c445c726
|
[maven-release-plugin] prepare release druid-0.5.40
|
2013-08-14 17:03:28 -07:00 |
|
fjy
|
36d02ab943
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-14 14:05:49 -07:00 |
|
fjy
|
8c841e90a4
|
[maven-release-plugin] prepare release druid-0.5.39
|
2013-08-14 14:05:39 -07:00 |
|
fjy
|
fc1018bc3f
|
revert removal of master loadstatus
|
2013-08-14 14:02:47 -07:00 |
|
fjy
|
761a411b16
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-14 10:13:50 -07:00 |
|
fjy
|
4dd727d974
|
[maven-release-plugin] prepare release druid-0.5.38
|
2013-08-14 10:13:34 -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
|
9870cab855
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-13 17:21:56 -07:00 |
|
fjy
|
e4c998cfef
|
[maven-release-plugin] prepare release druid-0.5.37
|
2013-08-13 17:21:46 -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 |
|