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

999 Commits

Author SHA1 Message Date
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
Xavier Léauté 80166314d9 [maven-release-plugin] prepare release druid-0.6.156 2014-09-23 16:31:21 -07:00
fjy 4235e14fc6 [maven-release-plugin] prepare for next development iteration 2014-09-23 16:12:43 -07:00
fjy 576e9b8a84 [maven-release-plugin] prepare release druid-0.6.155 2014-09-23 16:12:39 -07:00
fjy 0187c7f1c3 Merge pull request #748 from metamx/fix-columnschema-access 
fix column selector on varying incr index schema
 2014-09-23 11:25:46 -06:00
fjy 01bb7de3aa Merge pull request #756 from metamx/dimdim-comments 
add some comments about string interning
 2014-09-23 11:24:11 -06:00
nishantmonu51 f51ab84386 merge changes from druid-0.7.x 2014-09-22 23:48:45 +05:30
nishantmonu51 443e5788fb make OffheapIncrementalIndex tuneable 2014-09-22 19:26:10 +05:30
nishantmonu51 59aa8dc368 Merge branch 'offheap-incremental-index' into mapdb-branch 2014-09-19 23:09:35 +05:30
nishantmonu51 8c16377e9e add custom serializer 
add custom serializers
 2014-09-19 23:09:31 +05:30
nishantmonu51 8eb6466487 revert buffer size and add back rowFlushBoundary 2014-09-19 23:06:04 +05:30
Xavier Léauté e5a13544a0 fix column selector on varying incr index schema 2014-09-17 10:36:05 -07:00
fjy a17794a516 [maven-release-plugin] prepare for next development iteration 2014-09-16 15:22:55 -07:00
fjy f9c91ace3f [maven-release-plugin] prepare release druid-0.6.154 2014-09-16 15:22:49 -07:00
fjy cada14586a fix tests 2014-09-16 14:16:49 -07:00
fjy 8b5c2fcd82 fix compile error 2014-09-16 14:10:02 -07:00
xvrl ff3163516f Merge pull request #744 from metamx/fix-select 
fix select for non existant dimensions and metrics
 2014-09-16 14:03:51 -07:00
fjy 9e0a2fd487 fix select for non existant dimensions and metrics 2014-09-16 14:01:21 -07:00
Xavier Léauté 0c35fe2cf4 properly close reader 2014-09-15 13:00:06 -07:00
Xavier Léauté c8b8e3f6e9 negating compare is bad 2014-09-15 13:00:06 -07:00
Xavier Léauté 137ad50bf1 classes that should be static 2014-09-15 13:00:06 -07:00
Xavier Léauté e57e2d97ba make constants final 2014-09-15 12:53:40 -07:00
Xavier Léauté d4795ce927 fix missing charsets 2014-09-15 12:53:40 -07:00
Xavier Léauté cfa92e8217 fix incorrect nullable annotations 2014-09-15 12:13:52 -07:00
fjy 257fb3f18e fix retry logic 2014-09-12 15:47:41 -07:00
nishantmonu51 19bc77134a use hash map and in memory sort during index generation 
use hash map and in memory sort during index generation
 2014-09-12 23:39:02 +05:30
nishantmonu51 b94c5f0bd6 use putIfAbsent instead of get and put 
use putIfAbsent instead of get and put. reduce no. of calls to mapdb
decreases latency.
 2014-09-12 22:32:40 +05:30
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
fjy e0c167753e Merge branch 'offheap-incremental-index' into mapdb-branch 2014-09-11 11:03:01 -07:00
nishantmonu51 c39eaf870b TimeAndDims optimise to store indexes 2014-09-11 16:13:37 +05:30
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
fjy fec7b43fcb make making v9 segments something completely configurable 2014-09-10 15:28:30 -07:00
nishantmonu51 2e3be39048 Merge branch 'offheap-incremental-index' into mapdb-branch 2014-09-10 11:06:54 +05:30
fjy 351afb8be7 allow legacy index generator 2014-09-09 17:04:35 -07:00
nishantmonu51 2b3ad4d742 append a random UUID to map name 
avoid collision with dimension name
 2014-09-09 23:20:19 +05:30
nishantmonu51 e7a5a01f7b cache size locally 2014-09-09 16:02:50 +05:30
nishantmonu51 178f002f05 indexing working with mapdb 2014-09-09 15:59:33 +05:30
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
Xavier Léauté d15cd8fde7 add some comments about string interning 2014-08-26 21:33:38 -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 197c80a694 fix logging 2014-08-21 13:40:55 -07:00
fjy 64ff5f0880 add back broken synch 2014-08-21 13:20:23 -07:00
fjy e5d1c390fa add extra logging 2014-08-21 13:17:29 -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
nishantmonu51 c216eb7340 remove ThreadSafeAggregator 2014-08-21 23:56:07 +05:30
nishantmonu51 67f4bbae74 fixes from review comments 
fix sync of aggs,
fix NPE in sink.isFull,
RealtimeTuningConfig lower the bufferSize to 256m
 2014-08-21 09:24:14 +05:30
Xavier Léauté 8933685884 log allocation of conversionBuf 2014-08-20 12:41:47 -07:00
fjy fd09b1b5f1 cleanup things according to cr 2014-08-20 09:49:21 -07:00
nishantmonu51 33354cf7fe replace maxRowsInMemory with BufferSize 2014-08-20 20:59:44 +05:30
nishantmonu51 e525562767 review comments - cleanup ColumnSelectorFactory 2014-08-20 15:04:43 +05:30
nishantmonu51 60906c3244 Revert "make valueType configurable" 
This reverts commit 6f60a3f604.
 2014-08-20 11:55:26 +05:30
nishantmonu51 0c77f549ff Revert "return correct valueType" 
This reverts commit 0b42ca4c75.
 2014-08-20 11:54:20 +05:30
fjy 88a904e0b3 address cr about progress ind 2014-08-19 12:59:01 -07:00
fjy 0facb4202d cleanup 2014-08-18 17:22:44 -07:00
fjy 3933af79a0 fix small bug 2014-08-18 17:13:06 -07:00
nishantmonu51 4dd01d4eae review comments 2014-08-18 19:34:56 +05:30
fjy 51988be776 [maven-release-plugin] prepare for next development iteration 2014-08-14 14:59:00 -07:00
fjy 2830028092 [maven-release-plugin] prepare release druid-0.6.145 2014-08-14 14:58:57 -07:00
fjy 8fabc541f0 Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-14 11:39:44 -07:00
Xavier Léauté 603152eb18 fix compilation with Java 8 2014-08-14 11:37:47 -07:00
fjy 18d3acd3a8 fix all manners of brokenness from nulls and empty strings 2014-08-14 11:11:57 -07:00
nishantmonu51 0b42ca4c75 return correct valueType 2014-08-13 18:34:00 +05:30
nishantmonu51 6f60a3f604 make valueType configurable 2014-08-13 14:37:57 +05:30
nishantmonu51 03d7ec04be make tests pass 2014-08-13 10:55:20 +05:30
nishantmonu51 1b0a72751b Add support for LongColumn 2014-08-13 08:52:36 +05:30
fjy 1adec23126 some better null handling for MV 2014-08-12 16:40:02 -07:00
Xavier Léauté b448deeca0 fix compilation with Java 8 2014-08-12 14:02:08 -07:00
Xavier Léauté 161c2f0fff Merge branch '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
	services/pom.xml
 2014-08-12 14:00:21 -07:00
fjy 4e3f4fbc22 [maven-release-plugin] prepare for next development iteration 2014-08-12 13:24:55 -07:00
fjy f3aafc246c [maven-release-plugin] prepare release druid-0.6.144 2014-08-12 13:24:50 -07:00
fjy d4014c6a4e Merge pull request #675 from metamx/slimmer-column-cache 
reduce object count overhead of column cache
 2014-08-12 14:16:33 -06:00
fjy 578e0b4fb6 add more logging for groupby caching 2014-08-12 12:35:39 -07:00
nishantmonu51 f36d030ef2 fix NPE while indexing 2014-08-13 00:54:31 +05:30
nishantmonu51 c6712739dc merge changes from druid-0.7.x 2014-08-12 15:47:42 +05:30
Xavier Léauté a1bcff49c5 disable column cache by default 2014-08-11 18:10:33 -07:00
Xavier Léauté 69f4c2677f formatting 2014-08-11 18:10:19 -07:00
Xavier Léauté da399724eb add approximate object overhead 2014-08-11 17:07:10 -07:00
Xavier Léauté aecf4491be reduce object count overhead of column cache 2014-08-11 15:25:14 -07:00
fjy b740987381 Merge pull request #616 from metamx/jisoo 
add retry feature on broker side; modify QueryRunner inferface and tests
 2014-08-11 15:36:16 -06:00
fjy 2ecd55bae5 Merge branch 'druid-0.7.x' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
 2014-08-11 12:47:38 -07:00
fjy 70b86c5551 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
	rabbitmq/pom.xml
	s3-extensions/pom.xml
	server/pom.xml
	services/pom.xml
 2014-08-11 12:35:47 -07:00
fjy 0cff63c7c6 [maven-release-plugin] prepare for next development iteration 2014-08-09 19:36:11 -07:00
fjy 724562b181 [maven-release-plugin] prepare release druid-0.6.143 2014-08-09 19:36:05 -07:00
fjy d58ae945a4 [maven-release-plugin] prepare for next development iteration 2014-08-08 16:22:38 -07:00
fjy d240479133 [maven-release-plugin] prepare release druid-0.6.142 2014-08-08 16:22:34 -07:00
fjy 8998700760 prepare for next release 2014-08-08 16:19:45 -07:00
fjy 199f2b1683 [maven-release-plugin] prepare for next development iteration 2014-08-08 15:53:53 -07:00
fjy 29a077d893 [maven-release-plugin] prepare release druid-0.6.141 2014-08-08 15:53:49 -07:00
fjy 958792db5c [maven-release-plugin] prepare for next development iteration 2014-08-08 15:16:38 -07:00
fjy 4482e1b7d8 [maven-release-plugin] prepare release druid-0.6.140 2014-08-08 15:16:34 -07:00
Xavier Léauté d198959c60 fix test harness 2014-08-08 14:05:10 -07:00
fjy ddcea18631 fix dependencies 2014-08-08 14:02:14 -07:00
fjy c860de43cf fix dependencies 2014-08-08 13:46:25 -07:00
fjy ab5c529ad6 Merge branch 'druid-0.7.x' into new-init 2014-08-08 13:45:37 -07:00
fjy 4af6a05378 Merge pull request #632 from metamx/lz4-compression 
Change default column compression from LZF to LZ4
 2014-08-08 14:24:00 -06:00
fjy f3970bb1d8 Merge branch 'master' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
 2014-08-08 12:44:29 -07:00
fjy 74646f18f4 [maven-release-plugin] prepare for next development iteration 2014-08-08 11:40:52 -07:00
fjy 78c7140b52 [maven-release-plugin] prepare release druid-0.6.139 2014-08-08 11:40:46 -07:00
Gian Merlino 889c85c64f Fix OrderByColumnSpec cacheKey. 2014-08-07 06:53:34 -07:00
Xavier Léauté 6fa611c262 refactor FixedSizeCompressedObjectStrategy 2014-08-06 16:13:39 -07:00
Xavier Léauté 991e1828b0 make LZ4 the default compression strategy 
- LZ4 is now hardwired to be the default strategy
- Rework tests to test all available compression strategies
 2014-08-06 15:50:07 -07:00
fjy 7624bb5ea3 Merge branch 'master' into new-init 
Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	server/src/main/java/io/druid/initialization/Initialization.java
 2014-08-06 15:47:22 -07:00
fjy 9f4dd7b33e [maven-release-plugin] prepare for next development iteration 2014-08-06 13:34:04 -07:00
fjy aa5cb91618 [maven-release-plugin] prepare release druid-0.6.138 2014-08-06 13:33:59 -07:00
fjy 4d4c6b891e address cr 2014-08-05 15:58:42 -07:00
fjy d73492bf0f add missing final 2014-08-05 15:51:56 -07:00
fjy 8097e04938 fix naming 2014-08-05 15:48:30 -07:00
fjy 3a78960e65 Fix how metrics are emitted from servermanager 2014-08-05 15:47:30 -07:00
fjy 66225d698f fix stupidness with spatial indexing 2014-08-05 15:07:56 -07:00
jisookim0513 6f58cd1156 fix merge conflcts; change test files 2014-08-04 17:45:56 -07:00
fjy 65b8278add [maven-release-plugin] prepare for next development iteration 2014-08-01 10:14:34 -07:00
fjy 0ecbef6c5d [maven-release-plugin] prepare release druid-0.6.137 2014-08-01 10:14:30 -07:00
fjy 37f3cb38db fix to string error 2014-07-31 17:23:56 -07:00
fjy bf8c24f88d [maven-release-plugin] prepare for next development iteration 2014-07-31 14:08:38 -07:00
fjy 66020fc2b6 [maven-release-plugin] prepare release druid-0.6.136 2014-07-31 14:08:34 -07:00
nishantmonu51 32b9290723 fix compilation 2014-07-31 16:20:58 +05:30
nishantmonu51 637bd35785 merge changes from druid-0.7.x 2014-07-31 16:07:22 +05:30
fjy a8c8e4cb51 [maven-release-plugin] prepare for next development iteration 2014-07-29 22:03:14 -07:00
fjy 25eda62a0c [maven-release-plugin] prepare release druid-0.6.135 2014-07-29 22:03:09 -07:00
fjy 0c898c58d1 [maven-release-plugin] prepare for next development iteration 2014-07-29 18:01:06 -07:00
fjy c8244d05d1 [maven-release-plugin] prepare release druid-0.6.134 2014-07-29 18:01:02 -07:00
fjy f7319620c4 [maven-release-plugin] prepare for next development iteration 2014-07-29 17:40:56 -07:00
fjy 540a146eaa [maven-release-plugin] prepare release druid-0.6.133 2014-07-29 17:40:52 -07:00
fjy b5ecf000ad [maven-release-plugin] prepare for next development iteration 2014-07-29 16:20:14 -07:00
fjy 877bd98667 [maven-release-plugin] prepare release druid-0.6.132 2014-07-29 16:20:10 -07:00
fjy e1d87ed5ea [maven-release-plugin] prepare for next development iteration 2014-07-29 14:13:41 -07:00
fjy c46965c52c [maven-release-plugin] prepare release druid-0.6.131 2014-07-29 14:13:37 -07:00
xvrl d21e377a20 Merge pull request #651 from metamx/rewrite-async 
rewrite router async logic
 2014-07-29 13:56:01 -07:00
fjy 2ad1bd3f44 add back metrics 2014-07-29 10:22:55 -07:00
Xavier Léauté df7a39a682 fix index out of bounds 2014-07-28 09:59:21 -07:00
fjy 45e443bedb a few slight tweaks and bumping up curator version 2014-07-25 16:07:40 -07:00
fjy 1de0f89718 [maven-release-plugin] prepare for next development iteration 2014-07-18 11:55:50 -07:00
fjy 39bff5c1c2 [maven-release-plugin] prepare release druid-0.6.130 2014-07-18 11:55:46 -07:00
fjy 9e303527f2 [maven-release-plugin] prepare for next development iteration 2014-07-18 11:17:56 -07:00
fjy ea04022772 [maven-release-plugin] prepare release druid-0.6.129 2014-07-18 11:17:52 -07:00
fjy 8ef380b3f9 Merge pull request #638 from metamx/rejigger-cache 
Rejiggering the cache
 2014-07-17 15:19:23 -06:00
fjy bc650a1c80 Merge pull request #627 from metamx/druid-firehose 
Functionality to ingest a Druid segment and change the schema
 2014-07-17 13:41:16 -06:00
nishantmonu51 e59c9ebdbc minor fixes 
fix IndexOutOfBoundsException
fix ingestFirehose
 2014-07-17 17:24:57 +05:30
fjy b70a6b1061 address code review comments 2014-07-16 13:52:06 -07:00
fjy 2f90bfcf9a rejiggering the cache for groupBy and select 2014-07-15 12:12:33 -07:00
nishantmonu51 f5f05e3a9b Sync changes from branch new-ingestion PR #599 
Sync and Resolve Conflicts
 2014-07-11 16:15:10 +05:30
jisookim0513 c4397bd65a fixed merge conflicts 2014-07-07 11:26:11 -07:00
Xavier Léauté c40a315c81 initial support for LZ4 compression 2014-07-07 11:01:08 -07:00
fjy d37527ca79 make histos work with groupby maybe 2014-07-01 16:46:58 -07:00
fjy 92bc340099 Merge branch 'master' into more-tests 2014-06-30 18:40:00 -07:00
fjy afa73a2d3a fix one of the TODOs and add test case 2014-06-30 17:29:19 -07:00
Xavier Léauté 1499ee6458 add toString method for JavascriptDimExtractionFn 2014-06-25 10:47:57 -06:00
jisookim0513 cc8a4d0847 revert changes to RetryQueryRunnerConfig 2014-06-20 13:49:33 -07:00
jisookim0513 5e7dfaf298 change retry tests 2014-06-20 13:45:04 -07:00
jisookim0513 3418291333 add a test for retrying multiple times 2014-06-20 13:15:46 -07:00
jisookim0513 1cb3fc250e change missigSegments to a static variable 2014-06-19 18:29:00 -07:00
jisookim0513 0244172ccb change missigSegments to a static variable 2014-06-19 18:22:36 -07:00
jisookim0513 4e2b5b743f add more unit tests 2014-06-19 18:18:58 -07:00
jisookim0513 bdb35e2d7e fix retry logic and change the default value of retry to 0 2014-06-19 17:50:50 -07:00
Xavier Léauté 0602a45200 add column config test (disabled by default) 2014-06-19 14:48:51 -07:00
fjy 4c40e71e54 address cr 2014-06-19 14:48:46 -07:00
fjy a870fe5cbe inject column config 2014-06-19 14:47:57 -07:00
jisookim0513 ff980091c5 delete an unused flag in IncrementalIndexSegment 2014-06-19 14:43:58 -07:00
Xavier Léauté c2e2391e3a fix thread local initial value 2014-06-19 14:43:03 -07:00
Xavier Léauté 09346b0a3c make column cache configurable 2014-06-19 14:43:03 -07:00
Xavier Léauté 8840af5977 make GenericIndexed release cache resources on close 2014-06-19 14:42:08 -07:00
jisookim0513 c4048d06dd delete an unused flag in QueryableIndexSegment 2014-06-19 14:42:04 -07:00
jisookim0513 35e080bbc1 fix concurrency issue with the map; introduce new exception; add incomplete retry query runner test 2014-06-19 14:14:54 -07:00
Xavier Léauté be25d67894 add comments 2014-06-19 14:12:40 -07:00
Xavier Léauté 618afd9976 optimize single value lookup 2014-06-19 14:12:39 -07:00
Xavier Léauté 7a351dfde3 optimize lookups by caching bytebuffer copy 2014-06-19 14:12:39 -07:00
Xavier Léauté be92c322e3 make ObjectStrategy cacheable 2014-06-19 14:12:39 -07:00
jisookim0513 8515a11787 change the signature of run() 2014-06-18 18:05:09 -07:00
jisookim0513 f4b1dc032b change the way to use RetryQueryRunnerConfig 2014-06-18 17:15:04 -07:00
jisookim0513 00856f0fec add retry feature on broker side; modify QueryRunner inferface and tests 2014-06-18 16:55:33 -07:00
fjy 0bc1915067 Merge pull request #578 from metamx/new-guava 
Update guava, java-util, and druid-api
 2014-06-18 14:23:32 -06:00
Gian Merlino 7c7d170e78 [maven-release-plugin] prepare for next development iteration 2014-06-18 10:53:40 -07:00
Gian Merlino a52a1d3929 [maven-release-plugin] prepare release druid-0.6.128 2014-06-18 10:53:36 -07:00
Gian Merlino 9532beb05c [maven-release-plugin] prepare for next development iteration 2014-06-17 17:29:31 -07:00
Gian Merlino e3dcbde07d [maven-release-plugin] prepare release druid-0.6.127 2014-06-17 17:29:27 -07:00
Gian Merlino a658afe902 [maven-release-plugin] prepare for next development iteration 2014-06-17 13:01:01 -07:00
Gian Merlino 4e875b8084 [maven-release-plugin] prepare release druid-0.6.126 2014-06-17 13:00:54 -07:00