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

309 Commits

Author SHA1 Message Date
fjy e20f547261 fix according to code review 2013-06-06 15:37:19 -07:00
fjy d48b4d8d97 Merge branch 'master' into query-prioritization 2013-06-06 14:19:50 -07:00
fjy 451d3d358b some fixes according to code review comments 2013-06-06 11:02:08 -07:00
fjy 63b379ae90 Merge branch 'master' into refactor-indexing 2013-06-04 17:25:16 -07:00
fjy 06931ee0f5 introduce availability groups 2013-06-04 17:12:19 -07:00
cheddar 85ac8d43b6 Merge pull request #153 from metamx/gzip-compression 
HTTP gzip compression support
 2013-06-04 15:45:51 -07:00
fjy 7dcbea464f fix bug with out of order events on broker 2013-05-31 15:50:53 -07:00
fjy 2138f9fdf2 prevent ISE at broker from completely failing to return results 2013-05-31 14:28:55 -07:00
fjy ffbf0e23b6 cleanup 2013-05-30 12:58:24 -07:00
fjy 09f7b181d4 first commit, working UT 2013-05-29 17:04:25 -07:00
fjy bd9e6fecc1 fix day 1 issue with VIT 2013-05-28 14:26:49 -07:00
fjy 00cfb32541 also remove curator listeners on cleanup 2013-05-26 13:41:53 -06:00
fjy 113db061a8 discovered the cause of broker not being able to find segment issue 2013-05-26 13:31:18 -06:00
fjy 58335fd73f tony the tiger must love logs beacuse they are grrreeeat 2013-05-23 11:51:44 -06:00
fjy 9b6098f778 more logging for curator events 2013-05-23 11:00:12 -06:00
fjy 1537bcf55a restore server selector behaviour 2013-05-22 23:53:31 -07:00
xvrl 192b24c355 enable gzip compression for HTTP requests 2013-05-22 23:02:37 -07:00
fjy efc92e7ca6 bug fixes for segment metadata queries and spatial indexing 2013-05-20 20:19:18 -07:00
Gian Merlino 36b6f5c639 Merge branch 'druid-0.4.12.x' 
Conflicts:
	client/pom.xml
	common/pom.xml
	examples/pom.xml
	index-common/pom.xml
	indexer/pom.xml
	indexer/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java
	merger/pom.xml
	pom.xml
	realtime/pom.xml
	server/pom.xml
	services/pom.xml
 2013-05-18 17:30:31 -07:00
fjy a66425fe2f fix according to CR 2013-05-18 13:32:33 -07:00
fjy 8af9598157 fix currSize bug and maxTime bugs 2013-05-18 13:21:45 -07:00
fjy 5af188f18d Merge branch 'master' into spatial 2013-05-14 16:10:18 -07:00
cheddar 86415e70ea Merge pull request #142 from metamx/improve-bard 
Enable the broker to select a compute node will the least number of open connections
 2013-05-14 15:18:04 -07:00
fjy 236fe64e91 fix stray import 2013-05-14 15:17:49 -07:00
cheddar 8bd19e9d04 1) Take in g9yuayon's pull request, fix merge conflicts and formatting 2013-05-14 16:55:43 -05:00
fjy 8e38a85788 Merge branch 'master' into improve-bard 2013-05-10 11:05:29 -07:00
fjy 7cc30a0747 cleanup 2013-05-10 11:04:58 -07:00
fjy 6917ff02d8 first commit 2013-05-09 16:53:29 -07:00
xvrl bec5d248f0 fix typo 2013-05-08 15:38:45 -07:00
fjy e1deaccd87 Merge branch 'master' into spatial 2013-05-08 11:46:46 -07:00
xvrl b93c7e1128 fix serialization of request logs 2013-05-08 10:39:56 -07:00
fjy 32f82364f1 Merge branch 'master' into spatial 2013-05-07 14:12:05 -07:00
fjy f5dab1a4c1 add to string for groupby 2013-05-07 09:31:07 -07:00
cheddar 01c1257cee Merge pull request #134 from metamx/event-push 
Event push
 2013-05-06 15:10:44 -07:00
cheddar a25469eba6 1) Rename "orderBy" on DefaultLimitSpec to "columns" 2013-05-06 15:43:28 -05:00
cheddar cdd8f78ed3 1) Make GroupByQuery not require a limit clause 
2) Make DefaultLimitSpec not require the "limit" field to be specified in JSON
3) Move a log line in Announcer to debug
 2013-05-06 15:33:08 -05:00
fjy 8902986069 Merge branch 'master' into spatial 2013-05-03 23:09:30 -07:00
fjy 344a2b5d24 numerous bug fixes and improvements according to code review 2013-05-03 23:09:05 -07:00
fjy 3417c50e98 Merge branch 'master' into spatial 
Conflicts:
	client/src/main/java/com/metamx/druid/query/group/DefaultLimitSpec.java
	client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java
	client/src/main/java/com/metamx/druid/query/group/LimitSpec.java
	pom.xml
 2013-05-03 16:20:37 -07:00
cheddar 665f3ef0fd 1) Unit tests for order by and limit stuff for groupBy queries 
2) Adjustments to order by and limit stuff in light of unit tests-n-stuff
 2013-05-03 17:47:18 -05:00
fjy c15ac1fc90 limit spec for group by 2013-05-03 10:52:00 -07:00
fjy d57141f46e checking stuff in but stuff not really working yet 2013-05-03 10:35:26 -07:00
cheddar 6649a4b38d 1) Don't require druid.zk.paths.base when attempting to load properties from zk 2013-05-03 12:13:57 -05:00
Gian Merlino b32a728863 Move indexer zk paths to ZkPathsConfig 2013-05-03 16:38:23 +03:00
Gian Merlino af08ea7617 ServiceAnnouncer: 
- Interface with two impls, Noop and Curator
- Used wherever fine services are advertised

Initialization:
- Don't automatically register with service discovery
- Add makeServiceAnnouncer, announceDefaultService methods
- Replace serviceInstance with makeServiceInstanceFactory
 2013-05-03 14:29:17 +03:00
Gian Merlino 8948c8d4ca Merge branch 'master' into event-push 
Conflicts:
	client/src/main/java/com/metamx/druid/initialization/Initialization.java
	examples/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java
	index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java
	merger/src/main/java/com/metamx/druid/merger/common/task/RealtimeIndexTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/executor/ExecutorNode.java
 2013-05-02 16:34:14 +03:00
fjy 6d4c0850ca Merge branch 'master' into spatial 
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
 2013-05-01 11:49:00 -07:00
fjy 63ccb24ef6 Merge branch 'master' into spatial 
Conflicts:
	pom.xml
	server/src/main/java/com/metamx/druid/http/InfoResource.java
 2013-05-01 10:12:04 -07:00
cheddar 8922adb1f2 1) Make the demos work again. 
2) First step in restructuring the demos into a single repository
 2013-04-30 18:13:55 -05:00
cheddar cee15bb88a Adjust passing of nodeType to ExecutorMain to be via a system property instead of via a command line argument. 2013-04-29 12:05:59 -05:00
cheddar 405eed7c60 Better name for ServerInventoryThingie 2013-04-29 11:48:42 -05:00
fjy 2849486251 simpler sequence limiting 2013-04-28 15:34:43 -07:00
fjy 67cafaa0b1 Merge branch 'master' into spatial 2013-04-26 17:56:18 -07:00
fjy 82a62e3ba0 bug fixes for spatial and groupby; threshold for groupby 2013-04-26 17:46:25 -07:00
cheddar 52ba60963e Screwed up the conflicts on rebasing. Fixorz orz orz 2013-04-26 19:25:23 -05:00
cheddar 74ff07ba3e Moar unit tests 2013-04-26 19:19:57 -05:00
cheddar 8768406069 1) Unit tests! 2013-04-26 19:19:57 -05:00
cheddar 046647c203 1) Make druid.zk.paths.base required 
2) Unit tests for announcer and fix race condition with session death
 2013-04-26 19:19:57 -05:00
cheddar 163a73bed1 More logging stuff 2013-04-26 19:19:57 -05:00
cheddar 19d80ccd9d Remove extraneous logs 2013-04-26 19:19:57 -05:00
cheddar 67ce1b6f26 1) Adjust all of the uses of zookeeper paths to be based on ZkPathsConfig 2013-04-26 19:19:56 -05:00
cheddar b6d72c0da4 1) Log when servers show up and when they load segments 
2) Adjust nodes to publish to ZK as the last part of their initialization
 2013-04-26 19:19:56 -05:00
cheddar 3e94204c44 1) Switch from com.netflix.curator to org.apache.curator 2013-04-26 19:19:55 -05:00
cheddar 9153cc94ac 1) Nicer logging 
2) Announcer should actually delete its zk entries when it is told to unannounce something
3) Skip over complex columns that we don't have a proper deserializer for
 2013-04-26 19:19:55 -05:00
cheddar b8ba9138ff 1) Fix bug with Master not starting up without an indexer specified 
2) Fix bug with PotentiallyGzippedCompressionProvider only catching ZipExceptions and not IOException (java 6 throws IO, java 7 throws Zip)
3) Create DruidServerMetadata and use that instead of DruidServer to represent the current server
 2013-04-26 19:19:55 -05:00
cheddar f71b941a1a 1) Refactor the announcement of segments to all exist inside the DataSegmentAnnouncer 
2) Adjust the ExecutorNodes to expose the correct nodeType given the refactorings
 2013-04-26 19:19:54 -05:00
cheddar 545b489093 1) Use PathChildrenCacheFactory to simplify creation of PathChildrenCache objects. 2013-04-26 19:19:53 -05:00
cheddar 57c31656d1 1) Eliminate PhoneBook 2013-04-26 19:19:53 -05:00
cheddar dde50a0d87 1) Remove references to zkclient 
2) Eradicate zkclient from the poms!
 2013-04-26 19:19:53 -05:00
cheddar 43d630c098 1) Replace InventoryManagers with Curator-based Inventory Managers 
2) Replace ZkSegmentAnnouncer with CuratorSegmentAnnouncer
3) Adjust LoadQueuePeons to operate using Curator
4) Remove ZkPhoneBook

Things left to do:
1) Unit tests
2) Remove references to zkclient library
3) Remove references to PhoneBook interface
 2013-04-26 19:19:23 -05:00
Gian Merlino f463b95256 Merger: Advertise event receivers through service discovery 2013-04-25 14:06:46 +03:00
xvrl e3c6bad117 add emitting request logger 2013-04-24 15:38:16 -07:00
fjy 7f43f37441 bug fixes 2013-04-23 18:06:41 -07:00
fjy 70937af7bd Merge branch 'master' of github.com:metamx/druid into spatial 
Conflicts:
	server/src/main/java/com/metamx/druid/index/v1/IndexStorageAdapter.java
	server/src/main/java/com/metamx/druid/index/v1/QueryableIndexStorageAdapter.java
 2013-04-23 11:40:44 -07:00
fjy f28abd4256 fix cache 2013-04-22 15:01:07 -07:00
Gian Merlino 4c4d30cf66 Initialization: Set service discovery address equal to druid.host (without port if any) 2013-04-19 15:45:00 -07:00
Fangjin Yang 71269d7e88 somehow tests are passing 2013-04-17 17:13:24 -07:00
Eric Tschetter 55648c47a7 1) Adjust the GroupByQuery to also be able to merge results on the local node. Fixes #116 
2) Make the GroupByQuery operate in a multi-threaded fashion by default (this is configurable via druid.query.groupBy.singleThreaded).  Fixes #96
3) Fix up some post aggregation computation stuff.  I believe #72 is fixed
4) Fix case sensitivity issue with post aggregations on GroupBy queries
 2013-04-09 19:13:08 -07:00
cheddar a678f08b67 Merge pull request #118 from darxriggs/master 
cleanup & refactoring
 2013-04-09 18:56:59 -07:00
Fangjin Yang 120b822c18 Merge branch 'master' of github.com:metamx/druid 
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
 2013-04-08 11:24:17 -07:00
Fangjin Yang 925c104dd2 update emitter version and fix some NPEs 2013-04-08 11:23:08 -07:00
René Scheibe 6c27cd2e8e cleanup - removed unused imports 2013-04-07 23:31:22 +02:00
René Scheibe a6dc29cf85 cleanup - removed extra empty lines 
- there should not be any adjacent empty lines
 2013-04-07 14:32:09 +02:00
René Scheibe 488b3ef8ff refactoring - made json type infos consistent for all query types 2013-04-07 14:32:09 +02:00
xvrl 6d5869d8e4 remove unused imports 2013-04-05 14:36:41 -07:00
xvrl 1d050245fa add argument checks to dim filters 2013-04-04 16:30:33 -07:00
Fangjin Yang f9e5a10c70 fix query problem 2013-03-28 19:47:01 -07:00
Fangjin Yang 12e0dbce68 fix broker datasources path 2013-03-28 19:12:10 -07:00
Fangjin Yang 5bdcc3613c fix inconsistent druid http paths + fix master console bugs 2013-03-27 10:40:44 -07:00
Fangjin Yang 082ea59cf1 Merge branch 'master' of github.com:metamx/druid 2013-03-25 13:11:20 -07:00
Fangjin Yang 0ab7c315dd more logging in CEQR to track down NPE 2013-03-25 13:11:02 -07:00
xvrl c420fe3b56 fix output timestamps in groupby queries with granularity "all". 2013-03-23 23:42:43 -07:00
Fangjin Yang 5eaaabce7f fix for concurrent modifications in druid server 2013-03-22 17:05:39 -07:00
Eric Tschetter a933438e4e 1) Fix bugs with VersionConverterTask 
2) Fix bugs with NPEs on indexing
 2013-03-15 13:48:55 -05:00
cheddar 2a94bd508d Merge pull request #104 from metamx/javascript-dimfilters 
support for Javascript DimFilters
 2013-03-14 11:47:55 -07:00
Eric Tschetter 1c3ef48f34 1) Adjust the Config stuff that WorkerSetupManager was using to be reusable 
2) Use new ConfigManager to pull out a whitelist for the Master
 2013-03-07 17:45:57 -06:00
Eric Tschetter 6864007c05 1) Remove Task parameter from other methods off of TaskToolbox that required it 
2) Move getTaskDir() off of TaskConfig and onto TaskToolbox
3) Rename SegmentKiller interface to DataSegmentKiller
4) Change signature of "DataSegmentKiller.kill(Collection<DataSegment>) throws ServiceException" to just kill(DataSegment) throws SegmentLoadingException
5) Add various log messages
6) Update the version of the segment that has been converted
 2013-03-07 17:44:06 -06:00
xvrl a79c9ec183 fix some issues with negative numbers 2013-03-07 14:10:58 -08:00
cheddar a3279541c6 Merge pull request #102 from metamx/cache-fixes 
log but do not fail if memcached operations do not get queued in time
 2013-03-07 13:36:51 -08:00
cheddar a1cd3c3905 Merge pull request #103 from metamx/request-logs 
make request logs machine-readable
 2013-03-07 13:35:48 -08:00