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

4417 Commits

Author SHA1 Message Date
xvrl 69b75b6e4b Merge pull request #857 from metamx/fix-groupby 
test for groupBy order
 2014-11-12 22:54:33 -08:00
Xavier Léauté 19a37f773f test for groupBy order 2014-11-12 22:48:16 -08:00
xvrl 8ba28aba24 Merge pull request #855 from metamx/fix-leak 
fix leak with files not cleaning up correctly
 2014-11-12 22:30:40 -08:00
fjy 3ef21bfc66 fix leak with files not cleaning up correctly 2014-11-12 22:29:50 -08:00
xvrl 10b7ca9fa9 Merge pull request #849 from metamx/default-coordinator-service-name 
Default service names
 2014-11-12 15:06:02 -08:00
Xavier Léauté 3a9def7fb1 add broker default and define constants 2014-11-12 14:53:53 -08:00
xvrl f884e80933 Merge pull request #847 from metamx/druid-0.7.x 
master branch is now Druid 0.7
 2014-11-12 14:31:05 -08:00
Xavier Léauté 4ac1aaf90e Merge remote-tracking branch 'origin/master' into druid-0.7.x 
Conflicts:
	processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java
 2014-11-12 14:08:51 -08:00
Xavier Léauté dbab127a6d default zk host to localhost 2014-11-12 13:56:07 -08:00
Fangjin Yang 4b4f1c7d38 Merge pull request #846 from vikramakrishnan/cacheKeyFix 
Include origin when creating the cacheKey for period Grans
 2014-11-12 11:15:21 -07:00
Fangjin Yang 7ef19009db Merge pull request #834 from metamx/optimize-timestampchecking 
skip timestamp checking if not required, remove duplicate code
 2014-11-12 09:45:34 -07:00
Fangjin Yang 58260165ad Merge pull request #842 from metamx/fix-timestamp-column-exclusion 
fix dimension exclusions for timestamp and aggs
 2014-11-12 09:44:50 -07: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
Charles Allen 7c1403a351 Merge pull request #843 from metamx/fix-nondeterministic-test 
fix non-deterministic test
 2014-11-12 08:07:32 -08:00
Vikram Ramakrishnan 8151d14786 Include origin when creating the cacheKey for period Grans 2014-11-12 21:36:46 +05:30
nishantmonu51 c9bcdd5dd0 specify versions in parent pom 
- move version declarations to parent pom
- remove extra dependency
 2014-11-12 10:31:11 +05:30
Xavier Léauté 69146736a8 fix dimension exclusions for timestamp and aggs 
- also added tests
 2014-11-11 20:56:17 -08:00
Xavier Léauté 87b72e8822 fix non-deterministic test 2014-11-11 20:26:13 -08:00
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
nishantmonu51 42a61290a8 specify default service name for coordinator 2014-11-10 23:36:01 +05:30