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

2079 Commits

Author SHA1 Message Date
fjy 3b29e77866 [maven-release-plugin] prepare for next development iteration 2014-10-22 16:25:32 -07:00
fjy dcab2997f2 [maven-release-plugin] prepare release druid-0.6.160 2014-10-22 16:25:27 -07:00
jisookim0513 02e79d6b15 attempted to solve merge-conflict; IncrementalIndex has unresolved classes after updates - needs to be fixed 2014-10-22 00:18:17 -07:00
jisookim0513 197878ae75 changed SQLMetadataConnector to a concrete class 2014-10-21 23:39:58 -07:00
jisookim0513 a0d9944fa6 changed SQLMetadataConnector to a concrete class 2014-10-21 23:38:26 -07:00
Fangjin Yang 3d8f33d4ad Merge pull request #801 from metamx/fix-unordered-merging 
fix ordering for partitions with same start time, fixes #796
 2014-10-21 16:47:31 -06:00
Xavier Léauté 8735272ce3 fix file casing 2014-10-21 15:36:49 -07:00
Xavier Léauté fd7d3e5ace make it work with Java 8 2014-10-21 15:33:28 -07:00
Xavier Léauté 9d5e65913d fix serde 2014-10-21 15:05:08 -07:00
jisookim0513 37979282fe enabled ansi-quote in mysql; insert statement should now work 2014-10-21 00:09:19 -07:00
Xavier Léauté 23a59db566 fix ordering for partitions with same start time, fixes #796 
Partitions with same start time may produce results out of order,
           especially in the presence of data gaps.

Results for those segments must be re-ordered prior to being merged
 2014-10-20 17:22:23 -07:00
Xavier Léauté 38cb73e0cc javacript tiered broker selector strategy 2014-10-20 14:12:30 -07:00
jisookim0513 7d5c5f2083 fixed createTable; fixed miscellaneous stuff; added DerbyMetadataRuleManagerProvider 2014-10-17 00:10:36 -07:00
nishantmonu51 f4a97aebbc fix rollup for hashed partitions 
truncate timestamp while calculating the partitionNumber
 2014-10-15 22:32:56 +05:30
nishantmonu51 bce388fb27 merge changes from 0.7.x branch 2014-10-14 18:46:02 +05:30
nishantmonu51 b5d66381f3 more cleanup 2014-10-14 18:32:40 +05:30
jisookim0513 76304d6b7b made modifications according to comments; need to fix some more 2014-10-13 23:56:09 -07:00
fjy a4c8f04409 [maven-release-plugin] prepare for next development iteration 2014-10-13 12:50:45 -07:00
fjy 7fd1747ffa [maven-release-plugin] prepare release druid-0.6.159 2014-10-13 12:50:41 -07:00
nishantmonu51 035b4c1af4 more cleanup 2014-10-14 00:57:15 +05:30
nishantmonu51 454acd3f5a remove backwards compatible code 
1) remove backwards compatible and deprecated code
2) make hashed partitions spec default
 2014-10-13 19:30:44 +05:30
jisookim0513 0dda8975e7 deleted DerbyMetadataRule/SegmentManagerProvider and replaced them with SQL ones 2014-10-10 16:54:33 -07:00
jisookim0513 66277ddf2b deleted dbSegmentPublisher 2014-10-10 12:41:35 -07:00
fjy d0fbd5f729 [maven-release-plugin] prepare for next development iteration 2014-10-09 14:24:53 -07:00
fjy dada60a301 [maven-release-plugin] prepare release druid-0.6.158 2014-10-09 14:24:48 -07:00
Xavier Léauté 290107ce7b remove unused jsonspec content type 2014-10-09 10:26:47 -07:00
fjy 8a4b32c482 [maven-release-plugin] prepare for next development iteration 2014-10-07 14:30:26 -07:00
fjy 96e29c2fdd [maven-release-plugin] prepare release druid-0.6.157 2014-10-07 14:30:20 -07:00
Xavier Léauté 8f7f497b55 jax-rs smile support 2014-10-07 14:19:59 -07:00
Xavier Léauté 30183d3b4d update druid-api for json parsing improvements 2014-10-07 13:25:02 -07:00
fjy d4217f1588 Merge pull request #777 from metamx/initialized-endpoint 
Historical endpoints accessible while loading + new loadstatus endpoint
 2014-10-06 17:35:58 -06:00
Xavier Léauté 81641d7887 http accessible while loading + status endpoint 2014-10-06 13:32:27 -07:00
fjy c7b4d5b7b4 Merge branch 'master' into druid-0.7.x 
Conflicts:
	processing/src/test/java/io/druid/segment/filter/SpatialFilterTest.java
 2014-10-02 18:12:10 -07:00
Gian Merlino efa898422d Merge pull request #773 from metamx/cleanup-metrics 
Use multi-val dims for metrics
 2014-10-02 17:58:50 -07:00
fjy 816986f914 cleanup according to cr 2014-10-02 17:51:33 -07:00
fjy 75fb7986df Merge pull request #602 from metamx/offheap-incremental-index 
Offheap incremental index
 2014-10-01 16:20:24 -06:00
fjy 4fc0382d8a add more logging 2014-10-01 09:13:59 -07:00
nishantmonu51 ad75a21040 separate offheapIncrementalIndex implementation 2014-10-01 13:58:51 +05:30
fjy c3bea245a7 fix up some bugs 2014-09-30 17:20:52 -07:00
fjy 5b166134fb add docs 2014-09-30 14:59:02 -07:00
fjy 6d2747adcf make loading local files easier 2014-09-30 14:50:48 -07:00
fjy ee713f8e94 Merge pull request #727 from metamx/new-console-0.7.x 
New console 0.7.x
 2014-09-30 15:36:32 -06:00
jisookim0513 0e50852985 fixed MetadataTaskStorage and handler 2014-09-30 14:09:23 -07:00
jisookim0513 9d7b5d9b0f fixed javadoc; fixed pom files; deleted unnecessary class 2014-09-30 13:47:35 -07:00
fjy 0f96a09939 use multi-val dims for metrics 2014-09-30 13:36:01 -07:00
nishantmonu51 91eecfe3e7 fix #730 - memory check throws exception if fails 
fix exception handling, do not catch ProvisionException
 2014-09-30 23:03:40 +05:30
nishantmonu51 358ff915bb fix merge conflicts 2014-09-30 22:19:18 +05:30
nishantmonu51 2789536bed merge changes from druid-0.7.x 2014-09-30 22:05:49 +05:30
nishantmonu51 61c7fd2e6e make ingestOffheap tuneable 2014-09-30 15:30:02 +05:30
nishantmonu51 8cecb00aa9 upgrade jetty and workaround for half open connection 
Upgrade jetty and set acceptor priority delta to -1
 to give priority to servicing connections already accepted rather than
opening new connections.
 2014-09-30 14:22:16 +05:30
fjy 1a67ebe861 fix regression in test 2014-09-29 15:22:26 -07:00
nishantmonu51 adb4a65e0a Merge branch 'offheap-incremental-index' into mapdb-branch 2014-09-29 12:38:31 +05:30
jisookim0513 74565c9371 cleaned up the code 2014-09-27 13:10:01 -07:00
jisookim0513 aa887edb73 added two seperate modules for mysql and postgres 2014-09-27 13:08:53 -07:00
fjy fb1d6c177a fix dynamic config bug 2014-09-26 15:45:20 -07:00
jisookim0513 91bf8fadcf added MetadataSegmentManagerTest 2014-09-26 15:38:40 -07:00
jisookim0513 59b3e79c70 derby seems to be working..? 2014-09-26 14:36:17 -07:00
jisookim0513 6a641621b2 finished merging into druid-0.7.x; derby not working (to be fixed) 2014-09-26 14:24:53 -07:00
jisookim0513 43cc6283d3 trying to revert files that have overwritten changes 2014-09-26 12:38:04 -07:00
fjy 4244accab5 Merge branch 'druid-0.7.x' of github.com:metamx/druid into druid-0.7.x 2014-09-26 11:39:50 -07:00
fjy eaf0a48b92 Merge branch 'master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	services/pom.xml
 2014-09-26 11:39:24 -07:00
jisookim0513 a5d02b9030 second attempt to fix merge-conflicts 2014-09-24 15:59:00 -07:00
jisookim0513 3bf39cc9f8 attempted to fix merge-conflicts 2014-09-24 15:55:42 -07:00
Xavier Léauté 77c9afe92f try to make javadoc happy 2014-09-23 18:53:29 -07:00
Xavier Léauté 7cfe86b7bc [maven-release-plugin] prepare for next development iteration 2014-09-23 16:31:25 -07:00
Xavier Léauté 80166314d9 [maven-release-plugin] prepare release druid-0.6.156 2014-09-23 16:31:21 -07:00
Xavier Léauté d02fd97ea3 fix comment 2014-09-23 16:25:46 -07:00
Xavier Léauté 8603d2fd3e keep default behavior 2014-09-23 16:23:02 -07:00
fjy 4235e14fc6 [maven-release-plugin] prepare for next development iteration 2014-09-23 16:12:43 -07:00
fjy 576e9b8a84 [maven-release-plugin] prepare release druid-0.6.155 2014-09-23 16:12:39 -07:00
Xavier Léauté 35fb210cfa add test for parallel loading 2014-09-23 16:06:46 -07:00
Xavier Léauté 05d4f71ddc fix background annoucing race condition 2014-09-23 15:04:48 -07:00
Xavier Léauté 12449481e3 parallelize segment loading 2014-09-22 16:33:25 -07:00
nishantmonu51 f51ab84386 merge changes from druid-0.7.x 2014-09-22 23:48:45 +05:30
nishantmonu51 443e5788fb make OffheapIncrementalIndex tuneable 2014-09-22 19:26:10 +05:30
jisookim0513 273205f217 initial attempt for abstraction; druid cluster works with Derby as a default 2014-09-19 17:39:59 -07:00
nishantmonu51 8eb6466487 revert buffer size and add back rowFlushBoundary 2014-09-19 23:06:04 +05:30
Xavier Léauté 32b6135f3d background announce segment cache 2014-09-18 12:09:20 -07:00
fjy a17794a516 [maven-release-plugin] prepare for next development iteration 2014-09-16 15:22:55 -07:00
fjy f9c91ace3f [maven-release-plugin] prepare release druid-0.6.154 2014-09-16 15:22:49 -07:00
Xavier Léauté d9a0d403b3 default zk compressed + batch announcements in 0.7 2014-09-16 14:54:45 -07:00
fjy 8b387034a3 Merge pull request #741 from metamx/serverview-initialization 
initialize segment view before announcing broker
 2014-09-16 15:35:09 -06:00
fjy 1dbb6fd4b0 Merge pull request #736 from metamx/fix-synchronized 
fix synchronized on field getting updated
 2014-09-16 11:06:35 -06:00
Xavier Léauté 762485a0c9 remove unnecessary transient 2014-09-16 09:59:25 -07:00
Xavier Léauté f1e3518f37 initialize segment view before announcing broker 2014-09-16 00:07:31 -07:00
xvrl a73670ee7b Merge pull request #738 from metamx/dim-ex 
Have better dimension exclusions
 2014-09-15 17:14:29 -07:00
fjy 77dbac3739 fix import 2014-09-15 17:10:34 -07:00
fjy f2d6360d4d cleanup 2014-09-15 17:08:45 -07:00
fjy 34ae426ffa address cr 2014-09-15 17:08:02 -07:00
fjy 1ab2662772 have better dimension exclusions 2014-09-15 16:52:07 -07:00
Xavier Léauté 02892233ac fix synchronized on field getting updated 2014-09-15 13:56:31 -07:00
fjy aa28bc0613 address cr 2014-09-15 13:14:23 -07:00
Xavier Léauté 0712c666cb null check for something that cannot be null 2014-09-15 13:00:06 -07:00
Xavier Léauté c8b8e3f6e9 negating compare is bad 2014-09-15 13:00:06 -07:00
Xavier Léauté 137ad50bf1 classes that should be static 2014-09-15 13:00:06 -07:00
Xavier Léauté e57e2d97ba make constants final 2014-09-15 12:53:40 -07:00
Xavier Léauté d4795ce927 fix missing charsets 2014-09-15 12:53:40 -07:00
Xavier Léauté cfa92e8217 fix incorrect nullable annotations 2014-09-15 12:13:52 -07:00
fjy cbf5076961 still propagate log 2014-09-12 11:43:42 -07:00
fjy e62ed40d86 make some logs not emit 2014-09-11 16:49:18 -07:00
fjy 469ccbbe5e Merge branch 'master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java
	processing/src/main/java/io/druid/query/UnionQueryRunner.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java
	processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java
	processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/test/java/io/druid/server/initialization/JettyTest.java
	services/pom.xml
 2014-09-11 16:20:50 -07:00
Xavier Léauté 32e256a842 [maven-release-plugin] prepare for next development iteration 2014-09-10 17:24:15 -07:00
Xavier Léauté f7dc13d240 [maven-release-plugin] prepare release druid-0.6.153 2014-09-10 17:24:11 -07:00
fjy fec7b43fcb make making v9 segments something completely configurable 2014-09-10 15:28:30 -07:00
Xavier Léauté d6f6a59ae2 fix for missing context when embedding broker 2014-09-09 14:25:56 -07:00
Tarek Rached 609887887e updated env when we are local 2014-09-09 13:29:42 -07:00
Tarek Rached ae2a09ab5e added new console 2014-09-09 12:44:57 -07:00
Tarek Rached 47b52aaae1 moved old console to old-console 2014-09-09 12:44:30 -07:00
Xavier Léauté 22553b0b28 [maven-release-plugin] prepare for next development iteration 2014-09-05 11:07:22 -07:00
Xavier Léauté 570a7a07bf [maven-release-plugin] prepare release druid-0.6.152 2014-09-05 11:07:14 -07:00
fjy e24be03a38 [maven-release-plugin] prepare for next development iteration 2014-09-04 14:10:13 -07:00
fjy a933ea1866 [maven-release-plugin] prepare release druid-0.6.151 2014-09-04 14:10:09 -07:00
xvrl c4c54f7bc9 Merge pull request #721 from metamx/fix-union-query 
fix Union Query result merging
 2014-09-04 12:20:19 -07:00
nishantmonu51 0dec5826ed remove unused imports 2014-09-05 00:07:42 +05:30
nishantmonu51 90632ecf3a review comment - have separate methods 2014-09-05 00:03:36 +05:30
fjy f473e62f1f Merge pull request #714 from metamx/cleanup-javadocs 
Cleanup javadocs
 2014-09-04 12:28:10 -06:00
nishantmonu51 2772a78b3b review comments - move merging to tool chest 2014-09-04 11:31:04 +05:30
nishantmonu51 268a42bd79 fix Union Query result merging 2014-09-03 16:38:02 +05:30
Xavier Léauté 508e982190 Merge remote-tracking branch 'origin/master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java
	services/pom.xml
 2014-08-30 22:42:36 -07:00
Gian Merlino 96d7b18163 [maven-release-plugin] prepare for next development iteration 2014-08-29 15:29:58 -07:00
Gian Merlino 860cf36ab1 [maven-release-plugin] prepare release druid-0.6.150 2014-08-29 15:29:54 -07:00
Xavier Léauté 58ab759fc6 remove unused imports 2014-08-29 14:03:47 -07:00
Xavier Léauté ac05836833 make Java 8 javadoc happy 2014-08-29 13:58:50 -07:00
Xavier Léauté daca178631 [maven-release-plugin] prepare for next development iteration 2014-08-29 10:43:19 -07:00
Xavier Léauté 0793a5aee6 [maven-release-plugin] prepare release druid-0.6.149 2014-08-29 10:43:15 -07:00
Xavier Léauté b0b39d6ec0 fix maxTime caching for individual bounds 2014-08-28 17:14:25 -07:00
Xavier Léauté 1d6842c7f0 [maven-release-plugin] prepare for next development iteration 2014-08-27 12:22:53 -07:00
Xavier Léauté 575951f99a [maven-release-plugin] prepare release druid-0.6.148 2014-08-27 12:22:49 -07:00
Xavier Léauté 047f793cb7 query post-processing operators 
- Allows post-processing of query results
- Example timewarp post-processing operator
 2014-08-25 16:55:46 -07:00
Xavier Léauté 8b79749989 add tests for groupBy caching with HLL 2014-08-22 13:44:21 -07:00
fjy 00f7077f50 [maven-release-plugin] prepare for next development iteration 2014-08-22 08:28:56 -07:00
fjy df488563e4 [maven-release-plugin] prepare release druid-0.6.147 2014-08-22 08:28:51 -07:00
fjy df48b48e35 [maven-release-plugin] prepare for next development iteration 2014-08-21 12:50:33 -07:00
fjy 4f0b994037 [maven-release-plugin] prepare release druid-0.6.146 2014-08-21 12:50:30 -07:00
nishantmonu51 4641b3ac1b Add test for MessageTimeRejectionPolicy 
Add test for persist for MessageTimeRejectionPolicy
 2014-08-22 01:07:34 +05:30
Gian Merlino 92b0611afb Merge pull request #693 from metamx/handle-arithmetic-ex 
Handle arithmetic ex - additional commit for PR #692
 2014-08-20 23:24:06 -07:00
nishantmonu51 fe03476c53 truncate segmentGranularity 2014-08-21 11:40:30 +05:30
Gian Merlino 5970b96dc5 Merge pull request #692 from metamx/handle-arithmetic-ex 
Handle arithmetic exception for overlow
 2014-08-20 23:09:43 -07:00
nishantmonu51 8c9d639947 review comment - better way to handle it 2014-08-21 11:38:24 +05:30
nishantmonu51 87b83e7bdb better comment 2014-08-21 09:47:23 +05:30
nishantmonu51 c48c4ac0f6 handle arithmeticEx 2014-08-21 09:44:55 +05:30
nishantmonu51 67f4bbae74 fixes from review comments 
fix sync of aggs,
fix NPE in sink.isFull,
RealtimeTuningConfig lower the bufferSize to 256m
 2014-08-21 09:24:14 +05:30
nishantmonu51 79ff993b31 increase default buffer size to 512m 2014-08-20 22:15:06 +05:30
nishantmonu51 33354cf7fe replace maxRowsInMemory with BufferSize 2014-08-20 20:59:44 +05:30
nishantmonu51 60906c3244 Revert "make valueType configurable" 
This reverts commit 6f60a3f604.
 2014-08-20 11:55:26 +05:30
fjy a15d32da9b Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-18 17:11:12 -07:00
Xavier Léauté 78054d7f05 fix test initialization 2014-08-18 13:37:47 -07:00
fjy 77e514688a Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-18 11:14:19 -07:00
Xavier Léauté 1fd30ab588 default service/host/port for all nodes 2014-08-15 17:14:05 -07:00
fjy 51988be776 [maven-release-plugin] prepare for next development iteration 2014-08-14 14:59:00 -07:00
fjy 2830028092 [maven-release-plugin] prepare release druid-0.6.145 2014-08-14 14:58:57 -07:00
fjy 4f0f198a00 add more logging 2014-08-14 14:43:54 -07:00
fjy c36ffd1e55 address cr 2014-08-14 14:39:08 -07:00
fjy 6ba0a0df8b address cr 2014-08-14 13:56:36 -07:00
fjy 96d5d4a59a fix some rt cleanup and failure edge cases 2014-08-14 13:38:32 -07:00
nishantmonu51 6f60a3f604 make valueType configurable 2014-08-13 14:37:57 +05:30
nishantmonu51 1b0a72751b Add support for LongColumn 2014-08-13 08:52:36 +05:30
fjy 4e3f4fbc22 [maven-release-plugin] prepare for next development iteration 2014-08-12 13:24:55 -07:00
fjy f3aafc246c [maven-release-plugin] prepare release druid-0.6.144 2014-08-12 13:24:50 -07:00
nishantmonu51 c6712739dc merge changes from druid-0.7.x 2014-08-12 15:47:42 +05:30
fjy b740987381 Merge pull request #616 from metamx/jisoo 
add retry feature on broker side; modify QueryRunner inferface and tests
 2014-08-11 15:36:16 -06:00
fjy 2ecd55bae5 Merge branch 'druid-0.7.x' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
 2014-08-11 12:47:38 -07:00
fjy 70b86c5551 Merge branch 'master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	services/pom.xml
 2014-08-11 12:35:47 -07:00
fjy 0cff63c7c6 [maven-release-plugin] prepare for next development iteration 2014-08-09 19:36:11 -07:00
fjy 724562b181 [maven-release-plugin] prepare release druid-0.6.143 2014-08-09 19:36:05 -07:00
fjy 0e1a8f6f02 concurrency my old foe, we meet again 2014-08-09 19:33:07 -07:00
fjy d58ae945a4 [maven-release-plugin] prepare for next development iteration 2014-08-08 16:22:38 -07:00
fjy d240479133 [maven-release-plugin] prepare release druid-0.6.142 2014-08-08 16:22:34 -07:00
fjy 8998700760 prepare for next release 2014-08-08 16:19:45 -07:00
fjy 199f2b1683 [maven-release-plugin] prepare for next development iteration 2014-08-08 15:53:53 -07:00
fjy 29a077d893 [maven-release-plugin] prepare release druid-0.6.141 2014-08-08 15:53:49 -07:00
fjy e5896f4863 fix yet another bug with LQP 2014-08-08 15:50:57 -07:00
fjy 958792db5c [maven-release-plugin] prepare for next development iteration 2014-08-08 15:16:38 -07:00
fjy 4482e1b7d8 [maven-release-plugin] prepare release druid-0.6.140 2014-08-08 15:16:34 -07:00
fjy 9a371f3490 Merge pull request #674 from metamx/fix-arbitrary-granularity 
fix missing queryGranularity in ArbitraryGranularitySpec
 2014-08-08 16:12:24 -06:00
Xavier Léauté 3826b1d976 fix missing queryGranularity in ArbitraryGranularitySpec 2014-08-08 15:11:35 -07:00
fjy 68827ff88b fix another bug in LQP with concurrency 2014-08-08 15:06:03 -07:00
fjy 48b99e43fc fix LQP register callback 2014-08-08 14:34:54 -07:00
fjy ddcea18631 fix dependencies 2014-08-08 14:02:14 -07:00
fjy c860de43cf fix dependencies 2014-08-08 13:46:25 -07:00
fjy f3970bb1d8 Merge branch 'master' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
 2014-08-08 12:44:29 -07:00
fjy 74646f18f4 [maven-release-plugin] prepare for next development iteration 2014-08-08 11:40:52 -07:00
fjy 78c7140b52 [maven-release-plugin] prepare release druid-0.6.139 2014-08-08 11:40:46 -07:00
xvrl 038f2de496 Merge pull request #672 from metamx/router-strat 
Add more config to router strategies; fix bad test
 2014-08-08 11:37:35 -07:00
fjy 9803be7529 Merge pull request #673 from metamx/rt-plumber-merge-behavior 
Change merged-segment-removing behavior in RealtimePlumber.
 2014-08-08 12:24:23 -06:00
Gian Merlino 179170224d Fix conditional. 2014-08-08 11:20:36 -07:00
Gian Merlino f547049929 Change merged-segment-removing behavior in RealtimePlumber. 
Old: Merged segments are deleted upon successful push, or on IOException.
New: Merged segments are deleted on any Exception, but NOT successful push.

Deleting a merged segment means that the next merge-and-push run will try to
push it again. So we want that to happen if there was any sort of Exception.
We *don't* want it to happen if the merge-and-push was successful, since in
that case, we are just waiting for historical nodes to load the segment. It
might take a while, but there's no reason to re-push while waiting.
 2014-08-08 10:59:16 -07:00
fjy a855db2170 make things immutable 2014-08-08 10:53:10 -07:00
fjy d2c7a67a0c clean up some redundant code 2014-08-08 10:52:05 -07:00
fjy f1409f751a fix bad defaults 2014-08-08 10:46:36 -07:00
fjy d4cf2763ac fix test again 2014-08-08 10:45:59 -07:00
fjy 8877ee9714 fix test 2014-08-08 10:43:50 -07:00
fjy b3eb4cc5da fix defaults 2014-08-08 10:42:58 -07:00
fjy 627447c6f8 add more config to router strategies; fix bad test 2014-08-08 10:41:11 -07:00
fjy 08c7aabb34 fix deadlock condition that can exist in the coordinator 2014-08-07 15:55:25 -07:00
fjy 91ebe45b4e support both rejectionPolicy and rejectionPolicyFactory in serde 2014-08-07 10:06:27 -07:00
fjy 7624bb5ea3 Merge branch 'master' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	server/src/main/java/io/druid/initialization/Initialization.java
 2014-08-06 15:47:22 -07:00
Xavier Léauté 87fc354237 rename CleanupAvailable -> CleanupUnneeded 2014-08-06 14:29:00 -07:00
Xavier Léauté 70660ad295 separate cleanup of overshadowed vs. unavailable segments 2014-08-06 14:06:52 -07:00
fjy 9f4dd7b33e [maven-release-plugin] prepare for next development iteration 2014-08-06 13:34:04 -07:00