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

4702 Commits

Author SHA1 Message Date
fjy 56dfe5d883 Merge branch 'master' of github.com:metamx/druid 2014-12-15 09:42:08 -08:00
fjy 88858ea1c3 make default handler service announcing 2014-12-15 09:42:03 -08:00
Charles Allen bed3e7e1d2 Merge pull request #966 from metamx/fix-tasklog-streaming 
fix task log streaming
 2014-12-14 09:31:41 -08:00
Xavier Léauté bd91a40491 fix task log streaming 2014-12-13 15:22:55 -08:00
Charles Allen 225a039a01 Merge pull request #965 from metamx/doc-fix 
Fix documented default value for druid.coordinator.merge.on.
 2014-12-13 11:13:14 -08:00
Gian Merlino 020f8653f0 Fix documented default value for druid.coordinator.merge.on. 2014-12-13 08:03:09 -08:00
Charles Allen 3c33118f3a Merge pull request #962 from metamx/add-broker-loadstatus 
add loadstatus endpoint for serverView status
 2014-12-12 17:13:48 -08:00
Charles Allen e7222c6429 Merge pull request #964 from metamx/fix-index-task-tmpdir 
fix IndexTaskTest temp dir
 2014-12-12 17:13:27 -08:00
Xavier Léauté 092dfe0309 fix IndexTaskTest tmp dir 
- Create local firehose files in a clean temp directory to avoid
firehose reading other random temp files that start with 'druid'
 2014-12-12 17:05:45 -08:00
xvrl fc7f1e6975 Merge pull request #932 from metamx/directDruidClientSpeedupRebase 
Replace AppendableByteArrayInputStream in DirectDruidClient
 2014-12-12 14:44:36 -08:00
Charles Allen ca8300a461 Replace AppendableByteArrayInputStream in DirectDruidClient 
* Replace with SequenceInputStream fueled by an enumeration of ChannelBufferInputStream which directly wrap the response context ChannelBuffer
* Added zero-length byte array when DirectDruidClient is done. This prevents an odd race condition on `done`.
 2014-12-12 14:01:13 -08:00
Xavier Léauté 4b5282d224 add loadstatus endpoint for serverView status 2014-12-12 13:18:31 -08:00
Fangjin Yang 016d07fda3 Merge pull request #961 from metamx/fixTwitter 
Fix the twitter firehose
 2014-12-12 12:17:23 -07:00
Charles Allen 92ea82da6d Fix the twitter firehose 
* It was missing some json annotations
 2014-12-11 16:19:47 -08:00
Fangjin Yang dfecfb71be Merge pull request #959 from metamx/remove-health-endpoint 
/status replaces /health
 2014-12-11 10:03:05 -07:00
Xavier Léauté eb661d3130 /status replaces /health 2014-12-10 17:35:05 -08:00
Charles Allen 6104cad74a Merge pull request #956 from metamx/fix-test-port-collision 
use first available port for JettyTest
 2014-12-10 14:19:06 -08:00
Xavier Léauté 7878d391bd use first available port for JettyTest 2014-12-10 12:53:11 -08:00
Charles Allen 6f6cc463b0 Merge pull request #950 from metamx/fix-bysegment-serde 
Fix bySegment metrics de-serialization
 2014-12-10 12:42:40 -08:00
Charles Allen daa9b409ef Merge pull request #954 from metamx/fix-status-redirect 
prevent /status from redirecting, fixes #953
 2014-12-10 11:53:52 -08:00
Xavier Léauté 5f3f4e0a60 prevent /status from redirect, fixes #953 2014-12-10 11:32:22 -08:00
Xavier Léauté 7853e801d5 fixes for bySegment queries and caching 
- prevent bySegment queries from getting cached
- avoid computing cache keys if not populating or using cache
- avoid computing cache data when not populating cache
 2014-12-10 10:57:48 -08:00
fjy 3055a562ab small fixes to examples 2014-12-10 10:47:57 -08:00
Xavier Léauté c44242f0af add comment about de-serialing bySegment 2014-12-09 17:02:24 -08:00
Xavier Léauté a7da9aed9f fix metrics de-serialization for bySegment results 2014-12-09 17:02:23 -08:00
fjy 123db3da4d fix another broken ut 2014-12-09 15:47:28 -08:00
fjy 7620dfbd1a fix broken ut 2014-12-09 15:43:07 -08:00
Fangjin Yang d6d3ec6846 Merge pull request #948 from metamx/ingestion-docs 
Redocumenting ingestion
 2014-12-09 15:30:03 -07:00
fjy 14ab10a9c7 fix properties of examples 2014-12-09 14:30:54 -08:00
fjy f0e5bb1ba9 remove excess tutorials 2014-12-09 14:29:19 -08:00
fjy 5727193873 more fixes to docs 2014-12-09 14:28:15 -08:00
fjy 4e3d8faed8 fix bad example 2014-12-09 14:21:47 -08:00
fjy 9596c11f42 address cr 2014-12-09 14:19:18 -08:00
xvrl 89afd83116 Merge pull request #947 from metamx/configUpdates 
Move some config description from Configuration.md to the Broker and Historical config pages
 2014-12-08 16:21:17 -08:00
fjy 38a369c0ff fix links and some errors 2014-12-08 16:20:35 -08:00
fjy 28b72a69ad redocumenting ingestion 2014-12-08 16:15:46 -08:00
Charles Allen 0fbbcd5885 Move some config description from Configuration.md to the Broker and Historical config pages 2014-12-08 15:53:58 -08:00
Xavier Léauté 7871470491 fix jackson-annotations version dependencies 2014-12-08 15:31:58 -08:00
Fangjin Yang 623443a145 Merge pull request #946 from metamx/MoreMediaTypes 
Changed all "application/json" to MediaType.APPLICATION_JSON  except for in druid.js
 2014-12-08 15:24:21 -07:00
Charles Allen a0f9f9877e Changed all "application/json" to MediaType.APPLICATION_JSON except for in druid.js 2014-12-08 14:21:49 -08:00
xvrl 1392e2731f Merge pull request #936 from metamx/cachingRunnerImprovements 
General Caching Query Runners cleanup (40% query time reduction for HLL)
 2014-12-08 14:07:52 -08:00
Charles Allen 7b65f0635d General Caching Query Runners cleanup 
* Add type strictness to CachingClusteredClient.
* Add background caching to CachingClusteredClient. Gives between 0% and 5% query speed increase.
* Add @BackgroundCaching annotation for injected ExecutorService items
* Add `numBackgroundThreads' configuration options to CacheConfig (default 0 aka same thread legacy behavior)
* Add unit tests for CacheConfig
* Add an abstract caching query runner class, currently it doesn't do anything exceppt simply make the two caching queries distinct.
* Add caching to CachingQueryRunner. Gives up to a WHOPPING 40% reduction in query time on HLL queries
* Updated docs with more info on cache settings.
 2014-12-08 13:29:32 -08:00
Fangjin Yang c48839a0a0 Merge pull request #945 from metamx/MediaTypeFixes 
Added checks for backwards compat on MediaTypes
 2014-12-08 14:11:58 -07:00
Charles Allen 43041ed4ba Added checks for backwards compat on MediaTypes 2014-12-08 13:11:00 -08:00
Fangjin Yang eb233fe50e Merge pull request #921 from metamx/onheap-incremental-index 
separate implementations of  incremental index
 2014-12-08 13:59:08 -07:00
Fangjin Yang cc9d0ec73e Merge pull request #944 from metamx/MediaTypeFixes 
Changed references to MediaType to use standard strings
 2014-12-08 13:53:44 -07:00
Charles Allen 03f7fae3e8 Changed references to MediaType to pull from javax.ws.rs.core.MediaType or com.fasterxml.jackson.jaxrs.smile.MediaType 2014-12-08 12:39:36 -08:00
Xavier Léauté c88de97370 Merge branch 'master' into onheap-incremental-index 
Conflicts:
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
 2014-12-08 11:48:21 -08:00
Fangjin Yang 86a837a653 Merge pull request #939 from 7eggs/doc-fixes 
Fix link to Druid Cluster Tutorial in Booting a Druid Cluster page
 2014-12-08 12:10:15 -07:00
Fangjin Yang 3a7f571aeb Merge pull request #942 from metamx/fix-tiered-selector-naming 
fix tiered selector service name usage
 2014-12-08 12:09:45 -07:00