1776 Commits

Author SHA1 Message Date
fjy
0bc1915067 Merge pull request #578 from metamx/new-guava
Update guava, java-util, and druid-api
2014-06-18 14:23:32 -06:00
Gian Merlino
7c7d170e78 [maven-release-plugin] prepare for next development iteration 2014-06-18 10:53:40 -07:00
Gian Merlino
a52a1d3929 [maven-release-plugin] prepare release druid-0.6.128 2014-06-18 10:53:36 -07:00
Gian Merlino
9532beb05c [maven-release-plugin] prepare for next development iteration 2014-06-17 17:29:31 -07:00
Gian Merlino
e3dcbde07d [maven-release-plugin] prepare release druid-0.6.127 2014-06-17 17:29:27 -07:00
Gian Merlino
a658afe902 [maven-release-plugin] prepare for next development iteration 2014-06-17 13:01:01 -07:00
Gian Merlino
4e875b8084 [maven-release-plugin] prepare release druid-0.6.126 2014-06-17 13:00:54 -07:00
fjy
3dbf475784 fix linux test failures 2014-06-17 11:05:36 -07:00
fjy
8a13e34c50 fix broken ut 2014-06-17 10:31:50 -07:00
xvrl
d3ed08e8ea Merge pull request #609 from metamx/fix-bridge
fix bridge test
2014-06-17 10:26:57 -07:00
fjy
d1c4627032 fix bridge test 2014-06-17 10:18:46 -07:00
Xavier Léauté
4a835a9f0f fix initialization test static state dependency 2014-06-17 10:07:20 -07:00
Gian Merlino
964f12b7d6 [maven-release-plugin] prepare for next development iteration 2014-06-16 16:56:44 -07:00
Gian Merlino
4e184e3793 [maven-release-plugin] prepare release druid-0.6.125 2014-06-16 16:56:37 -07:00
Gian Merlino
ef7e786b96 [maven-release-plugin] prepare for next development iteration 2014-06-16 16:38:08 -07:00
Gian Merlino
96be9faec7 [maven-release-plugin] prepare release druid-0.6.124 2014-06-16 16:37:59 -07:00
fjy
c2149f8a00 add more tests for time boundary and caching 2014-06-16 15:32:28 -07:00
fjy
a71f7152a5 fix broken UT 2014-06-16 14:53:26 -07:00
nishantmonu51
2d03888a2c Merge branch 'master' into offheap-incremental-index
Conflicts:
	processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java

processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChe
st.java

processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.j
ava
2014-06-16 20:43:17 +05:30
nishantmonu51
0629be622c remove unnecessary changes & fix index closing subquery 2014-06-16 18:50:49 +05:30
Xavier Léauté
a5c533dcab [maven-release-plugin] prepare for next development iteration 2014-06-13 15:17:00 -07:00
Xavier Léauté
903f1a695f [maven-release-plugin] prepare release druid-0.6.123 2014-06-13 15:16:36 -07:00
fjy
0fd57dbc75 [maven-release-plugin] prepare for next development iteration 2014-06-13 15:05:18 -07:00
fjy
bcc6e77919 [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 15:05:14 -07:00
Xavier Léauté
b7b28ad2f9 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 15:03:03 -07:00
Xavier Léauté
695a2946a9 [maven-release-plugin] prepare for next development iteration 2014-06-13 15:01:13 -07:00
Xavier Léauté
83b2434cad [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 15:01:09 -07:00
Xavier Léauté
bd18fef474 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 14:57:31 -07:00
Xavier Léauté
1159e2e415 [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 14:56:12 -07:00
Xavier Léauté
6505f82053 [maven-release-plugin] rollback the release of druid-0.6.122 2014-06-13 14:54:23 -07:00
Xavier Léauté
f6d319dac2 [maven-release-plugin] prepare for next development iteration 2014-06-13 14:46:08 -07:00
Xavier Léauté
394d0cfbca [maven-release-plugin] prepare release druid-0.6.122 2014-06-13 14:45:43 -07:00
fjy
332ba3ef20 fix bad merge 2014-06-13 11:36:36 -07:00
fjy
4cc0353be2 Merge branch 'master' of github.com:metamx/druid into new-guava 2014-06-13 11:30:07 -07:00
fjy
5bd4ad3f0f address code review 2014-06-13 11:29:49 -07:00
fjy
a63cda3281 Merge branch 'master' into new-guava
Conflicts:
	server/src/main/java/io/druid/server/QueryResource.java
2014-06-13 10:08:10 -07:00
nishantmonu51
49d3bd94da Merge branch 'master' into offheap-incremental-index 2014-06-13 15:39:34 +05:30
nishantmonu51
0ddaf4c307 fix race while index closing and querying 2014-06-13 15:36:57 +05:30
Xavier Léauté
b2419b1530 fix missing return statement 2014-06-12 17:09:21 -07:00
Xavier Léauté
8f7c82d351 avoid closing yielder prematurely 2014-06-12 16:00:06 -07:00
nishantmonu51
025814cfff Merge branch 'master' into offheap-incremental-index
Conflicts:
	processing/src/main/java/io/druid/query/GroupByParallelQueryRunner.java

processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactor
y.java

processing/src/main/java/io/druid/segment/incremental/IncrementalIndexSt
orageAdapter.java
2014-06-12 20:02:27 +05:30
nishantmonu51
a7e19ad892 configure buffer sizes 2014-06-12 19:32:37 +05:30
xvrl
ada2d92c16 Merge pull request #576 from metamx/query-cancellation
Query cancellation & timeout
2014-06-11 12:18:43 -07:00
Xavier Léauté
ababbcadfd fix package groupId 2014-06-10 15:01:44 -07:00
xvrl
1b5095ac57 Merge pull request #588 from metamx/resolve-validator
add dependencies for validator error
2014-06-10 14:05:29 -07:00
Xavier Léauté
1fb9b21cf0 async servlet delete support + cleanup 2014-06-10 10:36:39 -07:00
Xavier Léauté
b84884ab76 remove methods used only for testing 2014-06-10 10:36:39 -07:00
Xavier Léauté
d0f9c438f8 proper query cancellation tests 2014-06-10 10:36:38 -07:00
Xavier Léauté
855c66c9ad less stack traces when cancelling queries 2014-06-10 10:36:38 -07:00
Xavier Léauté
d01f272a7a forward cancellation in direct druid client 2014-06-10 10:36:38 -07:00