696 Commits

Author SHA1 Message Date
fjy
469ccbbe5e 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/query/FinalizeResultsQueryRunner.java
	processing/src/main/java/io/druid/query/UnionQueryRunner.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactory.java
	processing/src/main/java/io/druid/query/topn/TopNQueryEngine.java
	processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/test/java/io/druid/server/initialization/JettyTest.java
	services/pom.xml
2014-09-11 16:20:50 -07:00
Xavier Léauté
32e256a842 [maven-release-plugin] prepare for next development iteration 2014-09-10 17:24:15 -07:00
Xavier Léauté
f7dc13d240 [maven-release-plugin] prepare release druid-0.6.153 2014-09-10 17:24:11 -07:00
Xavier Léauté
22553b0b28 [maven-release-plugin] prepare for next development iteration 2014-09-05 11:07:22 -07:00
Xavier Léauté
570a7a07bf [maven-release-plugin] prepare release druid-0.6.152 2014-09-05 11:07:14 -07:00
Xavier Léauté
c255bd76a9 add a test for the previous fix 2014-09-05 11:03:35 -07:00
Xavier Léauté
5dd23b19c3 fix interval start before end in TimewarpOperator 2014-09-05 10:55:45 -07:00
fjy
e24be03a38 [maven-release-plugin] prepare for next development iteration 2014-09-04 14:10:13 -07:00
fjy
a933ea1866 [maven-release-plugin] prepare release druid-0.6.151 2014-09-04 14:10:09 -07:00
xvrl
c4c54f7bc9 Merge pull request #721 from metamx/fix-union-query
fix Union Query result merging
2014-09-04 12:20:19 -07:00
nishantmonu51
0dec5826ed remove unused imports 2014-09-05 00:07:42 +05:30
nishantmonu51
90632ecf3a review comment - have separate methods 2014-09-05 00:03:36 +05:30
fjy
f473e62f1f Merge pull request #714 from metamx/cleanup-javadocs
Cleanup javadocs
2014-09-04 12:28:10 -06:00
nishantmonu51
2772a78b3b review comments - move merging to tool chest 2014-09-04 11:31:04 +05:30
nishantmonu51
268a42bd79 fix Union Query result merging 2014-09-03 16:38:02 +05:30
nishantmonu51
c056960082 fix nested group by with hyperuniques 2014-09-01 10:50:09 +05:30
Xavier Léauté
75134335de fix last merge from master not being forward-compatible 2014-08-30 22:45:36 -07:00
Xavier Léauté
508e982190 Merge remote-tracking branch 'origin/master' into druid-0.7.x
Conflicts:
	cassandra-storage/pom.xml
	common/pom.xml
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	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
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	server/src/main/java/io/druid/server/ClientQuerySegmentWalker.java
	services/pom.xml
2014-08-30 22:42:36 -07:00
Gian Merlino
96d7b18163 [maven-release-plugin] prepare for next development iteration 2014-08-29 15:29:58 -07:00
Gian Merlino
860cf36ab1 [maven-release-plugin] prepare release druid-0.6.150 2014-08-29 15:29:54 -07:00
xvrl
068a5fe2aa Merge pull request #715 from metamx/aggregator-factory-equals-hashcode
AggregatorFactory equals() and hashCode() methods.
2014-08-29 15:22:00 -07:00
Gian Merlino
879e615314 AggregatorFactory equals() and hashCode() methods. 2014-08-29 15:02:04 -07:00
Xavier Léauté
58ab759fc6 remove unused imports 2014-08-29 14:03:47 -07:00
Xavier Léauté
ac05836833 make Java 8 javadoc happy 2014-08-29 13:58:50 -07:00
Xavier Léauté
daca178631 [maven-release-plugin] prepare for next development iteration 2014-08-29 10:43:19 -07:00
Xavier Léauté
0793a5aee6 [maven-release-plugin] prepare release druid-0.6.149 2014-08-29 10:43:15 -07:00
Xavier Léauté
674e7b0447 add tests for timeboundary timewarp 2014-08-28 17:59:56 -07:00
Xavier Léauté
743a9bfdac fix offset and nulls 2014-08-28 17:35:26 -07:00
Xavier Léauté
9f742a87a6 fix timewarp with different bounds 2014-08-28 17:15:45 -07:00
Xavier Léauté
b0b39d6ec0 fix maxTime caching for individual bounds 2014-08-28 17:14:25 -07:00
Xavier Léauté
1d6842c7f0 [maven-release-plugin] prepare for next development iteration 2014-08-27 12:22:53 -07:00
Xavier Léauté
575951f99a [maven-release-plugin] prepare release druid-0.6.148 2014-08-27 12:22:49 -07:00
Gian Merlino
661e467d71 Fix groupBy/timeseries test, follow up to #705. 2014-08-26 22:36:08 -07:00
Gian Merlino
0eea1dc08d Test for desired timeseries zero-filling behavior. 2014-08-26 18:52:08 -07:00
Gian Merlino
da48a713ae Fix overzealous timeseries zero-filling.
When the index's maxTime is not aligned with the query granularity, gran.next
can cause an time extra bucket to get zero-filled. Truncating first prevents
that.
2014-08-26 18:52:08 -07:00
Gian Merlino
28e3191503 Merge pull request #699 from metamx/postprocessing-operators
query post-processing operators
2014-08-26 17:23:37 -07:00
Xavier Léauté
e39b6975fa rename t to now 2014-08-26 17:16:09 -07:00
Xavier Léauté
a1c8b23ba7 fix duration granularity with non-zero origin 2014-08-26 11:47:07 -07:00
Xavier Léauté
7537cf4fb1 fix compound period granularity for exact periods 2014-08-26 10:34:08 -07:00
Xavier Léauté
eb7dd6dc74 add documentation and tests 2014-08-26 09:53:46 -07:00
Xavier Léauté
b52869ff28 default to noop 2014-08-25 17:17:35 -07:00
Xavier Léauté
047f793cb7 query post-processing operators
- Allows post-processing of query results
- Example timewarp post-processing operator
2014-08-25 16:55:46 -07:00
Xavier Léauté
3261fd879a fix groupBy deserialization 2014-08-22 13:43:56 -07:00
Xavier Léauté
72eb64a40c fix HLL equals when comparing sparse and dense 2014-08-22 13:42:46 -07:00
fjy
00f7077f50 [maven-release-plugin] prepare for next development iteration 2014-08-22 08:28:56 -07:00
fjy
df488563e4 [maven-release-plugin] prepare release druid-0.6.147 2014-08-22 08:28:51 -07:00
fjy
172d0b6291 fix cache bug with group by query and uniques 2014-08-22 08:26:06 -07:00
fjy
df48b48e35 [maven-release-plugin] prepare for next development iteration 2014-08-21 12:50:33 -07:00
fjy
4f0b994037 [maven-release-plugin] prepare release druid-0.6.146 2014-08-21 12:50:30 -07:00
fjy
51988be776 [maven-release-plugin] prepare for next development iteration 2014-08-14 14:59:00 -07:00