Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,047 Commits 113 Branches 504 Tags 724 MiB
Commit Graph

1832 Commits

Author SHA1 Message Date
Xavier Léauté df59d2acb4 remove debug code 2014-07-25 16:25:47 -07:00
Xavier Léauté 2d4f1889e8 completely async request proxying + jetty update 2014-07-25 16:22:43 -07:00
fjy fc95a79abd add query priorities to metric emission 2014-07-25 16:10:55 -07:00
fjy 45e443bedb a few slight tweaks and bumping up curator version 2014-07-25 16:07:40 -07:00
fjy bb5c5b3ce7 fix config with broker select and add docs 2014-07-25 10:50:41 -07:00
Xavier Léauté 85f739797f remove debug println 2014-07-24 16:49:09 -07:00
Xavier Léauté 03efbb0e02 default query timeout to server idle timeout 2014-07-22 16:59:27 -07:00
Xavier Léauté 00f086665c default async timeout to server idle timeout 2014-07-22 16:55:21 -07:00
fjy 09e2f13ffc adding missing header 2014-07-22 10:12:47 -07:00
fjy 8f2fc595ee allow router to override selection based on config 2014-07-22 10:12:02 -07:00
fjy 1de0f89718 [maven-release-plugin] prepare for next development iteration 2014-07-18 11:55:50 -07:00
fjy 39bff5c1c2 [maven-release-plugin] prepare release druid-0.6.130 2014-07-18 11:55:46 -07:00
fjy 9e303527f2 [maven-release-plugin] prepare for next development iteration 2014-07-18 11:17:56 -07:00
fjy ea04022772 [maven-release-plugin] prepare release druid-0.6.129 2014-07-18 11:17:52 -07:00
nishantmonu51 4ce12470a1 Add way to skip determine partitions for index task 
Add a way to skip determinePartitions for IndexTask by manually
specifying numShards.
 2014-07-18 18:52:15 +05:30
fjy d8b8826c2e Merge branch 'cleanup-ingest' of github.com:metamx/druid into cleanup-ingest 
Conflicts:
	server/src/test/java/io/druid/realtime/firehose/CombiningFirehoseFactoryTest.java
 2014-07-17 20:26:11 -07:00
fjy 291f4c00ae Merge branch 'master' of github.com:metamx/druid into cleanup-ingest 2014-07-17 20:24:59 -07:00
nishantmonu51 0e0454a34c switch reingest task to noop & fix compilation 
switch back to noop task, its confusing to have a reinvest task that
does nothing.
fix compilation
 2014-07-18 06:50:58 +05:30
Xavier Léauté 95a09c04bf log errors in asyncForwardingServlet 2014-07-17 16:22:30 -07:00
fjy 465ac77b82 fix broken UT 2014-07-17 14:39:52 -07:00
fjy 76f096e667 Merge branch 'master' of github.com:metamx/druid into cleanup-ingest 2014-07-17 14:38:54 -07:00
fjy 8ef380b3f9 Merge pull request #638 from metamx/rejigger-cache 
Rejiggering the cache
 2014-07-17 15:19:23 -06:00
fjy ef325f15ff update pom and fix broken UT 2014-07-17 13:47:59 -07:00
fjy ba978d8b79 some minor cleanups to ingest firehose 2014-07-17 13:05:59 -07:00
fjy bc650a1c80 Merge pull request #627 from metamx/druid-firehose 
Functionality to ingest a Druid segment and change the schema
 2014-07-17 13:41:16 -06:00
fjy b70a6b1061 address code review comments 2014-07-16 13:52:06 -07:00
fjy de8cb55260 Merge branch 'master' into rejigger-cache 
Conflicts:
	pom.xml
 2014-07-16 13:37:20 -07:00
nishantmonu51 b74845e942 fix test 
committed it by mistake.
 2014-07-16 09:39:51 +05:30
fjy 27c4750780 fix infinite loop in test 2014-07-15 16:00:56 -07:00
fjy bdfeccd092 doc and timeout fix 2014-07-15 15:57:58 -07:00
fjy 2f90bfcf9a rejiggering the cache for groupBy and select 2014-07-15 12:12:33 -07:00
nishantmonu51 f5f05e3a9b Sync changes from branch new-ingestion PR #599 
Sync and Resolve Conflicts
 2014-07-11 16:15:10 +05:30
nishantmonu51 a12688bc8b fix partitionNum calculation & remove extra sorting 2014-07-10 12:21:27 +05:30
nishantmonu51 fa43049240 review comments & pom changes 2014-07-10 11:48:46 +05:30
nishantmonu51 a1a5e4254f CombiningFirehoseFactory 
can be used to ingest data from multiple sources.
 2014-07-08 21:14:48 +05:30
nishantmonu51 36fc85736c Add ShardSpec Lookup 
Optimize choosing shardSpec for Hash Partitions
 2014-07-08 18:01:31 +05:30
jisookim0513 c4397bd65a fixed merge conflicts 2014-07-07 11:26:11 -07:00
fjy c1cd9ff2ce fix broken rename of rejection policies 2014-07-02 23:41:37 -06:00
fjy 255504727a Merge pull request #615 from metamx/push-bootstrapped-sinks 
push sinks after bootstrap. fix #570
 2014-06-20 11:45:19 -06:00
fjy b978eb33f1 minor fix for cleanup of historical cache file 2014-06-20 10:42:03 -07:00
nishantmonu51 a4003966b2 push sinks after bootstrap. fix #570 2014-06-20 21:45:30 +05:30
xvrl 12ee17c4d2 Merge pull request #614 from metamx/delay-drop 
add an optional delay for how long it takes to drop a segment, fixes all...
 2014-06-19 22:38:26 -07:00
jisookim0513 0244172ccb change missigSegments to a static variable 2014-06-19 18:22:36 -07:00
jisookim0513 4e2b5b743f add more unit tests 2014-06-19 18:18:58 -07:00
jisookim0513 bdb35e2d7e fix retry logic and change the default value of retry to 0 2014-06-19 17:50:50 -07:00
fjy fc36bfbc6d remove pointless exception 2014-06-19 16:49:50 -07:00
fjy 2aab2a0cd9 address cr 2014-06-19 16:48:43 -07:00
fjy b313601a3b add an optional delay for how long it takes to drop a segment, fixes all manners of inconsistent issues 2014-06-19 16:32:38 -07:00
fjy 4c40e71e54 address cr 2014-06-19 14:48:46 -07:00
fjy a870fe5cbe inject column config 2014-06-19 14:47:57 -07:00
Xavier Léauté 09346b0a3c make column cache configurable 2014-06-19 14:43:03 -07:00
jisookim0513 8e85097999 fix header so it passes the entire context 2014-06-19 14:38:11 -07:00
jisookim0513 35e080bbc1 fix concurrency issue with the map; introduce new exception; add incomplete retry query runner test 2014-06-19 14:14:54 -07:00
jisookim0513 8515a11787 change the signature of run() 2014-06-18 18:05:09 -07:00
jisookim0513 f4b1dc032b change the way to use RetryQueryRunnerConfig 2014-06-18 17:15:04 -07:00
jisookim0513 00856f0fec add retry feature on broker side; modify QueryRunner inferface and tests 2014-06-18 16:55:33 -07:00
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
Xavier Léauté d2c729adec return proper json errors to propagate query cancellation and timeout 2014-06-10 10:36:38 -07:00
Xavier Léauté def62c74f8 properly remove completed queries from query manager 2014-06-10 10:36:38 -07:00
Xavier Léauté 4f1e157639 pass through errors from computes in DirectDruidClient 2014-06-10 10:36:38 -07:00
Xavier Léauté d6f38827db initial query cancellation commit 2014-06-10 10:36:28 -07:00
fjy 5380f14905 add header 2014-06-09 16:13:57 -07:00
fjy a3e86f7094 Merge branch 'master' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
 2014-06-09 16:01:53 -07:00
fjy 7233fce50c refactor examples to use global runtime 2014-06-09 15:59:44 -07:00
fjy d3f2faef92 address code review 2014-06-09 15:32:22 -07:00
fjy 55f1e2e2a7 add dependencies for validator error 2014-06-06 14:19:55 -07:00
nishantmonu51 5ef660f6d1 improve mem usage for getLoadStatus 2014-06-06 00:23:34 +05:30
nishantmonu51 ab31300513 remove duplicate code 2014-06-05 23:16:38 +05:30
nishantmonu51 03e1fb6f3f reduce memory usage for end points 
do not copy entire segments when not needed,
reduces memory pressure on the coordinator when no. of segments is
large enough.
 2014-06-05 23:14:51 +05:30
fjy 46ef5c4560 [maven-release-plugin] prepare for next development iteration 2014-06-05 10:03:31 -07:00
fjy 0265ae9ac0 [maven-release-plugin] prepare release druid-0.6.121 2014-06-05 10:03:26 -07:00
nishantmonu51 5bdc4a761a close IncrementalIndex properly and free up buffer 2014-06-05 19:41:43 +05:30
nishantmonu51 6265613bb9 Merge branch 'master' into offheap-incremental-index 2014-06-05 17:42:57 +05:30
nishantmonu51 01e8a713b6 unit tests passing with offheap-indexing 2014-06-05 17:42:53 +05:30
Gian Merlino 1d9675c044 Merge pull request #583 from metamx/fix-filtered-server-view 
fix memory issues in FilteredServerView
 2014-06-04 23:57:39 -07:00
Xavier Léauté 6e23ea457b fix memory issues in FilteredServerView 2014-06-04 23:54:37 -07:00
fjy e8aef86458 [maven-release-plugin] prepare for next development iteration 2014-06-04 20:22:31 -07:00
fjy 033f81ca64 [maven-release-plugin] prepare release druid-0.6.120 2014-06-04 20:22:14 -07:00
Gian Merlino 3325f6d6ed [maven-release-plugin] prepare for next development iteration 2014-06-04 17:56:20 -07:00
Gian Merlino 6309ab1973 [maven-release-plugin] prepare release druid-0.6.119 2014-06-04 17:56:15 -07:00
fjy 4524863db1 [maven-release-plugin] prepare for next development iteration 2014-06-04 16:49:49 -07:00
fjy 37c6ece150 [maven-release-plugin] prepare release druid-0.6.118 2014-06-04 16:49:44 -07:00
fjy 2d95780d12 [maven-release-plugin] prepare for next development iteration 2014-06-04 09:45:11 -07:00
fjy 30ce0ab99c [maven-release-plugin] prepare release druid-0.6.117 2014-06-04 09:45:06 -07:00
fjy 77ec4df797 update guava, java-util, and druid-api 2014-06-03 13:43:38 -07:00
fjy 8340a1b0a1 Properties module can now take multiple properties files 2014-06-03 10:34:38 -07:00
fjy f7c4d6a24a fix bug with loadqueue endpoint 2014-06-03 10:28:22 -07:00
fjy abe26a7f2e change default merge size to 500mb instead of 1g 2014-06-02 12:48:57 -07:00
fjy 1407b49da1 [maven-release-plugin] prepare for next development iteration 2014-06-02 10:53:47 -07:00
fjy f91ecf20f3 [maven-release-plugin] prepare release druid-0.6.116 2014-06-02 10:53:43 -07:00
fjy 49f03b808d fix default value for max segments to merge 2014-06-02 10:20:13 -07:00
fjy ee60183df7 [maven-release-plugin] prepare for next development iteration 2014-05-29 17:26:55 -07:00
fjy d13a354ffb [maven-release-plugin] prepare release druid-0.6.115 2014-05-29 17:26:49 -07:00
Xavier Léauté ea7eaba735 require default predicate in ServerInventoryViews 2014-05-29 17:09:34 -07:00
Xavier Léauté f32aee7804 make it explicit it's a concurrent map 2014-05-29 17:01:45 -07:00
Xavier Léauté d6f58bdced filtered batch inventory view tests 2014-05-29 15:42:57 -07:00
Xavier Léauté f30d58ad31 filter out segment callbacks not related to given filter 2014-05-29 15:42:57 -07:00
Xavier Léauté d98a10a7d8 FilteredServerView 2014-05-29 15:42:57 -07:00
fjy 7be93a770a make all firehoses work with tasks, add a lot more documentation about configuration 2014-05-28 16:33:59 -07:00
Xavier Léauté 347815cf27 preserve segment order when pulling from cache 2014-05-27 13:56:58 -07:00
fjy 5ce80068d2 [maven-release-plugin] prepare for next development iteration 2014-05-20 13:22:52 -07:00
fjy 904c9049a7 [maven-release-plugin] prepare release druid-0.6.114 2014-05-20 13:22:48 -07:00
fjy f0c40709cd fix coordinator dynamic configs 2014-05-20 13:20:43 -07:00
fjy 783f8fcc99 [maven-release-plugin] prepare for next development iteration 2014-05-20 12:47:33 -07:00
fjy def12c03bd [maven-release-plugin] prepare release druid-0.6.113 2014-05-20 12:47:29 -07:00
fjy 37dca4d437 make sure the dynamic config has at least 1 thread 2014-05-20 12:45:35 -07:00
fjy e5454b47f1 [maven-release-plugin] prepare for next development iteration 2014-05-20 10:49:00 -07:00
fjy bcffb92181 [maven-release-plugin] prepare release druid-0.6.112 2014-05-20 10:48:53 -07:00
fjy dd59b58208 [maven-release-plugin] prepare for next development iteration 2014-05-19 21:17:09 -07:00
fjy 511aca9ea8 [maven-release-plugin] prepare release druid-0.6.111 2014-05-19 21:17:04 -07:00
Xavier Léauté 2786c68411 fix file casing 2014-05-19 20:22:13 -07:00
fjy d0f87b0cf6 fix broken move test 2014-05-19 18:29:09 -07:00
Gian Merlino a7760af65a Merge pull request #553 from metamx/snapshot-coordinator 
Snapshot coordinator state before running anything
 2014-05-19 18:24:19 -07:00
fjy 1addea4dbe more code review comments 2014-05-19 17:52:34 -07:00
Xavier Léauté 5a065a8785 fix BatchServerInventoryViewTest waitForSync() logic 2014-05-19 17:43:00 -07:00
fjy 1b6e816c28 Merge pull request #544 from metamx/java-8-fix-tests 
Make tests pass with Java 8
 2014-05-19 18:11:52 -06:00
fjy 6126dd4231 fix more code review comments 2014-05-19 17:04:26 -07:00
Xavier Léauté 9ec7c71e0f fix compilation error with updated druid-api 2014-05-19 14:06:23 -07:00
fjy 7879f38ccc fix according to code review 2014-05-19 13:35:23 -07:00
fjy 5ee3f5c9d3 snapshot coordinator state before running 2014-05-18 22:32:20 -07:00
Xavier Léauté 20c4fbc98d [maven-release-plugin] prepare for next development iteration 2014-05-16 16:34:19 -07:00
Xavier Léauté 4abcf3e16a [maven-release-plugin] prepare release druid-0.6.110 2014-05-16 16:34:12 -07:00
fjy 68618ffc75 fix another code review comment 2014-05-16 15:38:46 -07:00
fjy 389319dd6e fix for code review comments 2014-05-16 15:32:58 -07:00
fjy 09ad32c5c5 fix race condition with merge and persist and sink adding 
Conflicts:
	indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
 2014-05-16 15:21:09 -07:00
nishantmonu51 b4a791a035 add comment for ignoring test and add test for thread stucking 2014-05-16 19:48:12 +05:30
fjy da285d8665 [maven-release-plugin] prepare for next development iteration 2014-05-15 16:44:36 -07:00
fjy b7009c9102 [maven-release-plugin] prepare release druid-0.6.109 2014-05-15 16:44:32 -07:00
fjy 6db0cd623f ignore jetty exception test for now 2014-05-15 16:42:48 -07:00
fjy 43853a1d9e Merge pull request #545 from metamx/union-query-fix 
Union query fix
 2014-05-15 17:17:46 -06:00
fjy 01d0234b46 Merge branch 'master' of github.com:metamx/druid 2014-05-15 14:23:26 -07:00
fjy 6098cff37a clean up event receiver firehose factory 2014-05-15 14:23:13 -07:00
nishantmonu51 ddc36c89cc union query fix and a broken test 2014-05-15 23:10:40 +05:30
fjy 793bc3539b Merge pull request #538 from metamx/fix-jetty-exception-handling 
fix jetty threads getting stuck
 2014-05-15 10:55:46 -06:00
Xavier Léauté 088c60cf3d always use ByteCountingLRUMap.remove() to remove 2014-05-14 22:48:41 -07:00
fjy c57a18d6b6 Merge branch 'master' of github.com:metamx/druid 2014-05-12 11:38:55 -07:00
fjy 32eee959c3 fix backwards compat issue 2014-05-12 11:38:46 -07:00
nishantmonu51 26569f4b7f fix jetty threads getting stuck 
Fix Jetty threads getting stuck on exceptions
 2014-05-10 02:12:19 +05:30
nishantmonu51 17e994f2e4 review comment 2014-05-09 23:53:25 +05:30
nishantmonu51 6be6337ab0 remove initial delay from polling 
remove initial delay from polling in coordinator, this will help in the
cases when the pollDuration is set to higher than coordinator
startDelay.
 2014-05-09 23:33:00 +05:30
fjy 48ae84ed56 [maven-release-plugin] prepare for next development iteration 2014-05-07 12:40:14 -07:00
fjy 27f7c45e91 [maven-release-plugin] prepare release druid-0.6.108 2014-05-07 12:40:10 -07:00
fjy 42994cebcd [maven-release-plugin] prepare for next development iteration 2014-05-07 11:25:50 -07:00
fjy 2bf5c3831d [maven-release-plugin] prepare release druid-0.6.107 2014-05-07 11:25:45 -07:00
fjy e7da1bb9ce fix injection problems with server select strategies 2014-05-07 10:13:05 -07:00
fjy 1100d2f2a1 rename configs to make a bit more sense 2014-05-06 14:52:50 -07:00
fjy b6fb4245aa Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDriverConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfigBuilder.java
	pom.xml
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java
 2014-05-06 14:32:51 -07:00
fjy ad54f150ec fix broken UT with bad api version 2014-05-06 13:51:22 -07:00
fjy 0ee2323875 Merge pull request #399 from metamx/multithread-costbalancer 
Multithread costbalancer
 2014-05-06 14:18:07 -06:00
fjy 79e6d4eb56 Merge pull request #528 from metamx/union-query-source 
Union query source
 2014-05-06 14:13:33 -06:00
nishantmonu51 66450ca6ed review comments 
remove toShortString
minor other changes
 2014-05-07 00:54:17 +05:30