Commit Graph

4400 Commits

Author SHA1 Message Date
Xavier Léauté dbab127a6d default zk host to localhost 2014-11-12 13:56:07 -08:00
Charles Allen 847c01a045 Merge pull request #844 from metamx/derby-dependencies-fix
specify versions in parent pom
2014-11-12 08:28:55 -08:00
nishantmonu51 c9bcdd5dd0 specify versions in parent pom
- move version declarations to parent pom
- remove extra dependency
2014-11-12 10:31:11 +05:30
Charles Allen 581e6830d5 Merge pull request #840 from metamx/powers-of-2-buffers
make buffer size a power of 2 and optimize buffer lookup
2014-11-11 19:54:00 -08:00
Xavier Léauté 60e98c35d7 workaround for annotations requiring class literals 2014-11-11 18:48:49 -08:00
Fangjin Yang 4903f36639 Merge pull request #841 from metamx/distinguish-legacy-vs-default-bitmap
Distinguish between default and legacy bitmaps
2014-11-11 19:37:35 -07:00
Xavier Léauté b580269f6d Distinguish between default and legacy bitmaps 2014-11-11 18:35:45 -08:00
fjy bc5c56e441 fix default impl 2014-11-11 18:00:46 -08:00
fjy 63ca2375a3 remove dead code and cleanup some defaults 2014-11-11 17:57:24 -08:00
fjy 5629307548 address a few more comments on roaring 2014-11-11 17:50:03 -08:00
fjy 788a4a846b add encoding 2014-11-11 17:31:08 -08:00
fjy 2f498c3422 Merge branch 'druid-0.7.x' of github.com:metamx/druid into druid-0.7.x 2014-11-11 17:30:43 -08:00
fjy 26b358e127 Merge branch 'master' of github.com:metamx/druid into druid-0.7.x 2014-11-11 17:30:30 -08:00
Charles Allen a89b539b4f Merge pull request #823 from metamx/roaring
Configurable bitmap indexes: roaring and concise
2014-11-11 17:26:38 -08:00
Xavier Léauté 007e57f876 make buffer size a power of 2 and optimize 2014-11-11 16:24:37 -08:00
fjy 1cc162727b address code review 2014-11-11 14:05:37 -08:00
Fangjin Yang 6396d01dea Merge pull request #814 from metamx/fix-datasource-doc
Added section on union data sources
2014-11-11 13:03:41 -07:00
Igal Levy de7fb5a690 fixed typo, added note on matching schema requirement for unioned data sources 2014-11-11 11:56:22 -08:00
Igal Levy 34a6f7f7ca Merge branch 'master' into fix-datasource-doc 2014-11-11 11:55:47 -08:00
Fangjin Yang c448755dc5 Merge pull request #836 from metamx/fix-derby
Fix derby
2014-11-10 21:22:18 -07:00
fjy e6b7b03b5b fix conversion 2014-11-10 17:13:28 -08:00
fjy eb457c280e revert change 2014-11-10 17:00:53 -08:00
Xavier Léauté 59f093882d fix Derby instantiation 2014-11-10 16:55:53 -08:00
fjy 336c73bdc2 cleanup dead code 2014-11-10 16:53:13 -08:00
fjy df886fac1b fix 2014-11-10 16:49:27 -08:00
fjy d68bc3bdea cleanup unused imports 2014-11-10 16:15:28 -08:00
fjy 8cbd21af90 fix defaults 2014-11-10 15:40:57 -08:00
fjy 98d05e63bf make derby instance only on coordinator 2014-11-10 15:34:49 -08:00
fjy 6188315293 Merge branch 'master' into druid-0.7.x
Conflicts:
	processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java
2014-11-10 14:52:10 -08:00
fjy df9be030db remove more legacy code 2014-11-10 14:09:00 -08:00
fjy 72c355e8ae remove crazy handler code 2014-11-10 13:58:23 -08:00
fjy fc34858e95 fix things for real-time ingestion 2014-11-10 13:48:21 -08:00
fjy c5cc826998 make things actually work with roaring 2014-11-10 13:42:26 -08:00
fjy 358b2add17 make things actually work with roaring 2014-11-10 13:42:06 -08:00
fjy 3c21f62afd a whole bunch of fixes and some ugly conversion code 2014-11-07 16:03:22 -08:00
Xavier Léauté f956fdad2e fix injection once more 2014-11-07 14:26:03 -08:00
Xavier Léauté 0498df25df override metadata storage injection in CliHadoopIndexer 2014-11-07 13:44:56 -08:00
Xavier Léauté 70f49538dd i swear injection is fixed now 2014-11-07 12:04:09 -08:00
Xavier Léauté aeb194ad12 fix injection for real 2014-11-07 11:43:53 -08:00
Xavier Léauté 50a191425c fix injection on MetadataStorageUpdaterJob 2014-11-07 11:11:14 -08:00
Fangjin Yang e4649a24a1 Merge pull request #832 from metamx/fix-query-docs
fixes typo
2014-11-07 11:49:10 -07:00
Igal Levy 03515a4de6 fixes typo 2014-11-07 10:40:46 -08:00
Fangjin Yang 2336e6c167 Merge pull request #758 from metamx/jisoo-metadata
make metadata storage pluggable
2014-11-07 11:30:11 -07:00
Fangjin Yang 7bdb46c650 Merge pull request #828 from metamx/fix-query-docs
Fix query docs
2014-11-07 11:17:09 -07:00
Charles Allen 8d1a8564c4 Merge pull request #829 from metamx/default-servicenames
provide proper defaults for indexing service name
2014-11-07 10:06:46 -08:00
Gian Merlino b5c5a1bed3 Merge pull request #831 from metamx/fix-query-wait-emmitted
fix query/wait being emitted twice
2014-11-07 10:04:26 -08:00
nishantmonu51 5be801356a fix query/wait emitted twice 2014-11-07 23:32:36 +05:30
xvrl 18b9c5cd2f db -> metadata 2014-11-06 21:46:35 -08:00
Xavier Léauté d8bab70647 provide proper defaults for indexing service name 2014-11-06 18:16:01 -08:00
Xavier Léauté 20a9aef96a fix test 2014-11-06 17:27:05 -08:00