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

819 Commits

Author SHA1 Message Date
fjy 41ebdd2bae Merge branch 'druid-0.7.x' into fix-test 
Conflicts:
	processing/pom.xml
	processing/src/main/java/io/druid/segment/IndexMerger.java
	processing/src/main/java/io/druid/segment/MetricHolder.java
	processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java
	processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java
	processing/src/test/java/io/druid/segment/SchemalessTestFull.java
	server/src/test/java/io/druid/client/CachingClusteredClientTest.java
	services/src/main/java/io/druid/cli/CliHistorical.java
 2014-10-24 11:07:52 -07:00
fjy bef74104d9 merge with 0.7.x and resolve any conflicts 2014-10-23 17:24:06 -07:00
fjy f790a05bd7 Merge branch 'master' into fix-test 
Conflicts:
	pom.xml
 2014-10-23 14:39:51 -07:00
fjy 1b3921faad fix for long columns 2014-10-23 14:33:25 -07:00
fjy 3b29e77866 [maven-release-plugin] prepare for next development iteration 2014-10-22 16:25:32 -07:00
fjy dcab2997f2 [maven-release-plugin] prepare release druid-0.6.160 2014-10-22 16:25:27 -07:00
fjy 94da2b6ad3 more logging for potential NPE because of segment unmapping 2014-10-22 16:16:10 -07:00
Xavier Léauté 4ec1e6ef13 simplify code a bit 2014-10-22 14:25:59 -07:00
nishantmonu51 0785baf54c review comments 2014-10-22 21:28:31 +05:30
nishantmonu51 6cb6ec39cf add support for not filter and add test 2014-10-22 10:25:24 +05:30
Xavier Léauté e24a6d222f we even have tests now 2014-10-21 17:46:24 -07:00
Xavier Léauté 23a6ab19b0 cleanup and add missing methods 2014-10-21 17:00:39 -07:00
nishantmonu51 56912adccb avoid typecasts 2014-10-21 16:47:50 -07:00
nishantmonu51 10db94101f skip value lookup 
compare ids instead of values
 2014-10-21 16:47:49 -07:00
Xavier Léauté 71831e49d9 rudimentary filtered aggregator 2014-10-21 16:47:49 -07:00
fjy bb90432862 Updated druid-api version to always sort dimension names, these tests needed fixing 2014-10-15 12:27:21 -04:00
Xavier Léauté 5b194ee5fe fix groupBy ordering casing bug 2014-10-15 12:16:17 -04:00
nishantmonu51 bce388fb27 merge changes from 0.7.x branch 2014-10-14 18:46:02 +05:30
fjy a4c8f04409 [maven-release-plugin] prepare for next development iteration 2014-10-13 12:50:45 -07:00
fjy 7fd1747ffa [maven-release-plugin] prepare release druid-0.6.159 2014-10-13 12:50:41 -07:00
Xavier Léauté 592611f2ee fix cardinality aggregator serde 2014-10-09 17:06:29 -07:00
fjy d0fbd5f729 [maven-release-plugin] prepare for next development iteration 2014-10-09 14:24:53 -07:00
fjy dada60a301 [maven-release-plugin] prepare release druid-0.6.158 2014-10-09 14:24:48 -07:00
Xavier Léauté 290107ce7b remove unused jsonspec content type 2014-10-09 10:26:47 -07:00
fjy 8a4b32c482 [maven-release-plugin] prepare for next development iteration 2014-10-07 14:30:26 -07:00
fjy 96e29c2fdd [maven-release-plugin] prepare release druid-0.6.157 2014-10-07 14:30:20 -07:00
Xavier Léauté 30183d3b4d update druid-api for json parsing improvements 2014-10-07 13:25:02 -07:00
fjy fde510bbfc Merge pull request #779 from metamx/fix-histo 
Fix groupBy with histograms
 2014-10-07 11:53:24 -06:00
fjy d4217f1588 Merge pull request #777 from metamx/initialized-endpoint 
Historical endpoints accessible while loading + new loadstatus endpoint
 2014-10-06 17:35:58 -06:00
fjy c7b4d5b7b4 Merge branch 'master' into druid-0.7.x 
Conflicts:
	processing/src/test/java/io/druid/segment/filter/SpatialFilterTest.java
 2014-10-02 18:12:10 -07:00
fjy 816986f914 cleanup according to cr 2014-10-02 17:51:33 -07:00
fjy 1a67d6cb2e some tests for broken approx histo 2014-10-01 15:10:23 -07:00
nishantmonu51 09c41afb5b license header 2014-10-01 17:52:57 +05:30
nishantmonu51 ad75a21040 separate offheapIncrementalIndex implementation 2014-10-01 13:58:51 +05:30
fjy 267e861162 fix search 2014-09-30 13:36:55 -07:00
fjy 0f96a09939 use multi-val dims for metrics 2014-09-30 13:36:01 -07:00
nishantmonu51 358ff915bb fix merge conflicts 2014-09-30 22:19:18 +05:30
nishantmonu51 63fcd11864 fix compilation 2014-09-30 22:12:06 +05:30
nishantmonu51 2789536bed merge changes from druid-0.7.x 2014-09-30 22:05:49 +05:30
nishantmonu51 7ba914d379 review comments 2014-09-30 18:26:43 +05:30
nishantmonu51 61c7fd2e6e make ingestOffheap tuneable 2014-09-30 15:30:02 +05:30
Gian Merlino a3a2c8b86f Merge pull request #765 from metamx/fix-spatial 
fix spatial indexing with multiple spatial dims
 2014-09-29 17:23:29 -07:00
fjy e1c1e8997a address cr 2014-09-29 17:22:58 -07:00
fjy b57ac513bd Fixes #761 2014-09-29 14:56:43 -07:00
fjy 2b5ce89554 fix spatial indexing with multi spatial dims 2014-09-29 12:07:27 -07:00
nishantmonu51 3f66d3c167 review comments + mapdb deadlock fix 2014-09-29 21:49:12 +05:30
nishantmonu51 adb4a65e0a Merge branch 'offheap-incremental-index' into mapdb-branch 2014-09-29 12:38:31 +05:30
fjy eaf0a48b92 Merge branch 'master' into druid-0.7.x 
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/pom.xml
	hdfs-storage/pom.xml
	histogram/pom.xml
	indexing-hadoop/pom.xml
	indexing-service/pom.xml
	kafka-eight/pom.xml
	kafka-seven/pom.xml
	pom.xml
	processing/pom.xml
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	services/pom.xml
 2014-09-26 11:39:24 -07:00
Xavier Léauté 77c9afe92f try to make javadoc happy 2014-09-23 18:53:29 -07:00
Xavier Léauté 7cfe86b7bc [maven-release-plugin] prepare for next development iteration 2014-09-23 16:31:25 -07:00