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

1863 Commits

Author SHA1 Message Date
fjy 4e509d1d09 Merge branch 'master' into is-docs 2013-10-09 14:05:10 -07:00
fjy 3364b9ae5e Merge pull request #262 from metamx/fix-hadoop 
Fix HadoopDruidIndexer to work with the new way of things
 2013-10-09 13:27:49 -07:00
cheddar c47fe202c7 Fix HadoopDruidIndexer to work with the new way of things 
There are multiple and sundry changes in here.

First, "HadoopDruidIndexer" has been split into two pieces, (1) CliHadoop which pulls the hadoop version and builds up the right classpath with the proper hadoop version to run the indexer and (2) CliInternalHadoopIndexer which actually runs the indexer.

In order to work around a bunch of jets3t version conflicts with Hadoop and Druid, I needed to extract the S3 deep storage stuff into its own module.  I then also moved the HDFS stuff into its own module so that I could eliminate the dependency on Hadoop for druid-server.

In doing these changes, I wanted to make the extensions buildable with only the druid-api jar, so a few other things had to move out of Druid and into druid-api.  They are all API-level things, however, so they really belong in druid-api instead.

Lastly, I removed the druid-realtime module and put it all in druid-server.
 2013-10-09 15:15:44 -05:00
fjy a96eb634d4 Merge pull request #260 from rjurney/master 
Changed indexGranularity on webstream example from minute to second
 2013-10-09 12:25:10 -07:00
Russell Jurney 806bc0f58c Changed webstream example to second indexGranularity. 2013-10-09 12:23:00 -07:00
fjy 4ec4b8e024 rewrite indexing service docs 2013-10-08 16:34:58 -07:00
Russell Jurney 4e30a14438 Reverted minute/second change. 2013-10-08 13:27:39 -07:00
Russell Jurney caa3c663f5 Changed wikipedia example to second indexGranularity. 2013-10-08 13:05:38 -07:00
fjy ed6ba44917 Merge pull request #258 from metamx/fix-docs 
Fix docs for 0.6 (part 1 of many)
 2013-10-07 14:49:04 -07:00
fjy af1dbe6eab fix docs for 0.6 part 1 of many 2013-10-07 14:47:04 -07:00
fjy de71c14114 Merge pull request #257 from metamx/az 
Add availability zone info to autoscaling
 2013-10-07 12:17:42 -07:00
fjy 703b674800 add availability zone info to autoscaling 2013-10-07 12:16:50 -07:00
fjy dd0b31785d Merge pull request #256 from metamx/rename 
Refactor our modules to standarize Druid node naming convention
 2013-10-06 14:23:32 -07:00
fjy cdbbf445fd remove ec2 startup files; they are obsoleted by whirr 2013-10-06 14:22:44 -07:00
fjy ac330f72bb first set of changes to standarize the naming convention we use in druid 2013-10-03 16:36:48 -07:00
fjy bf157ea8ef fix the example assembly and have better error logging for rabbitmq 2013-10-03 10:54:25 -07:00
fjy 8885412b33 Merge pull request #255 from metamx/fix-examples 
Update examples to work with Druid v0.6
 2013-10-03 10:00:38 -07:00
fjy 17874eeb67 make the CliPeon actually able to run on its own 2013-10-02 15:55:10 -07:00
fjy bc8db7daa5 1) make chat handler resource work again 
2) add more default configs
3) make examples work again
 2013-10-02 14:22:39 -07:00
fjy 216bed9c36 Merge branch 'local-index' into fix-examples 2013-10-02 14:21:28 -07:00
Gian Merlino 384dcda7e4 Chat handlers still don't work, but, they're closer maybe. 2013-10-01 17:45:53 -07:00
cheddar 1c77177de3 Merge pull request #254 from metamx/local-index 
Add a local firehose for indexing local files
 2013-10-01 14:17:05 -07:00
fjy 59f2d0711d Merge branch 'master' into local-index 2013-10-01 13:21:43 -07:00
fjy 30df53671e remove line iterator factory because it is not needed 2013-10-01 13:21:20 -07:00
Gian Merlino 62eda5020c ShardSpec: Remove isInChunk(Map<String, String>) 2013-10-01 12:50:08 -07:00
fjy 5d0d71250b fix chat handler resources not correctly registering themselves 2013-10-01 11:25:39 -07:00
fjy d6445cd8f3 remove imports 2013-10-01 09:42:28 -07:00
fjy 53698a135a add interface to new firehose as per code review comments 2013-09-30 18:00:59 -07:00
fjy f55a5199b1 add a firehose module to remove so much copy and pasted code 2013-09-30 16:29:20 -07:00
fjy ed9e0cf9f6 add a local firehose for indexing local files 2013-09-30 16:03:26 -07:00
cheddar 16558404d6 Merge pull request #251 from metamx/fix-config 
Make dynamic master resource configuration work again
 2013-09-30 10:54:11 -07:00
cheddar aa9aa495ae Merge branch 'master' of github.com:metamx/druid 2013-09-27 20:50:43 -05:00
cheddar ab96301cce Add deploy script for docs 2013-09-27 20:50:02 -05:00
fjy 4a7a28a7f6 Merge branch 'master' into fix-config 2013-09-27 17:17:46 -07:00
fjy e60387b3d4 Merge pull request #253 from metamx/stuff 
Fixes for property conversion, firehose registration, and the indexing service
 2013-09-27 17:11:33 -07:00
cheddar 2ee8bb6938 Merge pull request #252 from metamx/docs 
Move Docs from wiki
 2013-09-27 17:10:06 -07:00
Gian Merlino dc5dab8747 Fixes for property conversion, firehose registration, and the indexing service 2013-09-27 17:09:59 -07:00
cheddar 65bb68c7de Finish converting docs over to something that displays properly 2013-09-27 19:08:34 -05:00
cheddar 154b58defd Merge branch 'master' into docs 
Conflicts:
	docs/content/Loading-Your-Data.md
 2013-09-27 18:29:56 -05:00
fjy a79ad7bab4 make dynamic master resource configuration work again 2013-09-27 15:00:40 -07:00
cheddar ca5c941560 Make more of the docs look and work correctly. Yay! Almost done with this! 2013-09-27 12:57:08 -05:00
cheddar 1f3aae6edf Merge pull request #250 from metamx/guice-is 
Make the indexing service work with new framework
 2013-09-27 10:30:24 -07:00
fjy 0b04325ee8 fix things up according to code review comments 2013-09-27 10:17:45 -07:00
Xavier Léauté 86ddc7da7b pretty ! 2013-09-27 09:55:03 -07:00
Xavier Léauté 7fed43041d fix layout 2013-09-27 09:52:16 -07:00
fjy e404295c1f make indexing service work 2013-09-26 17:44:21 -07:00
Xavier Léauté b68c9fee83 fix layout 2013-09-26 17:38:11 -07:00
cheddar e4d4362bf9 Docs working 2013-09-26 18:22:28 -05:00
cheddar a3e16335ef Merge pull request #248 from metamx/guice-hi 
Port Hadoop Batch Indexer to new Guice framwork
 2013-09-26 13:20:15 -07:00
fjy 8bc56daa66 fix things up according to code review comments 2013-09-26 11:35:45 -07:00