Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,093 Commits 113 Branches 506 Tags 736 MiB
Commit Graph

289 Commits

Author SHA1 Message Date
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
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 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 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
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
Xavier Léauté e5a13544a0 fix column selector on varying incr index schema 2014-09-17 10:36:05 -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
fjy 9e0a2fd487 fix select for non existant dimensions and metrics 2014-09-16 14:01:21 -07:00
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é c255bd76a9 add a test for the previous fix 2014-09-05 11:03:35 -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
fjy f473e62f1f Merge pull request #714 from metamx/cleanup-javadocs 
Cleanup javadocs
 2014-09-04 12:28:10 -06:00
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
Xavier Léauté 58ab759fc6 remove unused imports 2014-08-29 14:03:47 -07:00
Xavier Léauté 674e7b0447 add tests for timeboundary timewarp 2014-08-28 17:59:56 -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é 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é 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
Xavier Léauté b448deeca0 fix compilation with Java 8 2014-08-12 14:02:08 -07:00
nishantmonu51 c6712739dc merge changes from druid-0.7.x 2014-08-12 15:47:42 +05:30
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
Xavier Léauté d198959c60 fix test harness 2014-08-08 14:05:10 -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
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
jisookim0513 6f58cd1156 fix merge conflcts; change test files 2014-08-04 17:45:56 -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 45e443bedb a few slight tweaks and bumping up curator version 2014-07-25 16:07:40 -07:00
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 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
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 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
Xavier Léauté 0602a45200 add column config test (disabled by default) 2014-06-19 14:48:51 -07:00
fjy a870fe5cbe inject column config 2014-06-19 14:47:57 -07:00
Xavier Léauté 09346b0a3c make column cache configurable 2014-06-19 14:43:03 -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
jisookim0513 8515a11787 change the signature of run() 2014-06-18 18:05:09 -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
Xavier Léauté 9b03f5b13a fix timeout test race condition 2014-06-17 09:00:07 -07:00
fjy ce61e60ee8 all manners of new tests 2014-06-16 16:19:26 -07:00
fjy a71f7152a5 fix broken UT 2014-06-16 14:53:26 -07:00
fjy d2cf7d3f0a address cr 2014-06-16 14:00:01 -07:00
fjy d4a47fe6e8 enable tb to return just max or min time 2014-06-16 13:45:32 -07:00
nishantmonu51 2d03888a2c Merge branch 'master' into offheap-incremental-index 
Conflicts:
	processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java

processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChe
st.java

processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.j
ava
 2014-06-16 20:43:17 +05:30
nishantmonu51 0629be622c remove unnecessary changes & fix index closing subquery 2014-06-16 18:50:49 +05:30
fjy d5d2873d3c Merge pull request #593 from metamx/fix-groupyb 
Support all standard Druid functions in GroupBy and nested groupBy
 2014-06-13 15:37:55 -06:00
fjy 8246d42715 Merge branch 'master' into new-guava 2014-06-13 11:44:05 -07:00
Xavier Léauté 294a9ba78f fix same race condition in other test 2014-06-13 11:42:19 -07:00
fjy 332ba3ef20 fix bad merge 2014-06-13 11:36:36 -07:00
fjy 4cc0353be2 Merge branch 'master' of github.com:metamx/druid into new-guava 2014-06-13 11:30:07 -07:00
fjy 5bd4ad3f0f address code review 2014-06-13 11:29:49 -07:00
Xavier Léauté 4c4047165f fix query cancellation test race condition 2014-06-13 11:28:48 -07:00
fjy a63cda3281 Merge branch 'master' into new-guava 
Conflicts:
	server/src/main/java/io/druid/server/QueryResource.java
 2014-06-13 10:08:10 -07:00
Xavier Léauté bfa3caa589 js/cardinality/hyperUnique happy groupBy family 2014-06-12 15:19:01 -07:00
fjy 4a4cccf10e Merge branch 'master' into fix-groupyb 
Conflicts:
	processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryEngine.java
 2014-06-12 13:24:16 -07:00
fjy 403962fe0b add some failing tests for groupBy 2014-06-12 11:36:53 -07:00
nishantmonu51 025814cfff Merge branch 'master' into offheap-incremental-index 
Conflicts:
	processing/src/main/java/io/druid/query/GroupByParallelQueryRunner.java

processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactor
y.java

processing/src/main/java/io/druid/segment/incremental/IncrementalIndexSt
orageAdapter.java
 2014-06-12 20:02:27 +05:30
fjy cde86d81e2 make having and limitspec work for nested queries 2014-06-10 15:50:13 -07:00
Xavier Léauté a541029b41 segmentMetadata query cancellation 2014-06-10 11:51:07 -07:00
Xavier Léauté 6550cb1776 groupBy query cancellation 2014-06-10 11:51:06 -07:00
Xavier Léauté b84884ab76 remove methods used only for testing 2014-06-10 10:36:39 -07:00
Xavier Léauté 97d5455f3a properly kill timed out queries 2014-06-10 10:36:38 -07:00
Xavier Léauté d0f9c438f8 proper query cancellation tests 2014-06-10 10:36:38 -07:00
Xavier Léauté d6f38827db initial query cancellation commit 2014-06-10 10:36:28 -07:00
fjy 187b2beb47 cleaner way of implementing things 2014-06-09 22:27:33 -07:00
fjy 6adc3011fa fix post aggs with group by in #472 2014-06-09 18:25:10 -07:00
nishantmonu51 bf09f979bd fix segment metadataquery 2014-06-05 20:35:57 +05:30
nishantmonu51 01e8a713b6 unit tests passing with offheap-indexing 2014-06-05 17:42:53 +05:30
fjy 77ec4df797 update guava, java-util, and druid-api 2014-06-03 13:43:38 -07:00
fjy c56f3fd1af Merge pull request #565 from metamx/add-hll-test 
test for correct HLL bytebuffer folding
 2014-05-28 12:12:34 -06:00
xvrl 18685542ec Merge pull request #568 from metamx/fix-topn 
Fix inverted lexicographic topns and topns with dim extraction dimension specs
 2014-05-28 10:47:10 -07:00
fjy 2ee1defce9 better handle dim extraction regex cases 2014-05-28 10:27:00 -07:00
fjy 8bcf4bc60e address code review comments 2014-05-27 19:47:13 -07:00
fjy 9f62589d71 fix bug with previousStop not being respected for inverse lexi topN 2014-05-27 19:39:55 -07:00
fjy 07a95a0e05 Fix inverted lexicographic topNs 2014-05-27 17:02:28 -07:00
Xavier Léauté c273298ad4 don't discard current maxOverflow if offset is high enough 2014-05-27 11:03:12 -07:00
Xavier Léauté d96d82252d test fold permutations with various maxOverflow / offsets 2014-05-27 11:03:12 -07:00
Xavier Léauté df3fb07e51 test for correct bytebuffer folding 2014-05-22 17:48:19 -07:00
Xavier Léauté 9ec7c71e0f fix compilation error with updated druid-api 2014-05-19 14:06:23 -07:00
fjy 77289a4148 Merge pull request #531 from metamx/listenable-prioritized-executorservice 
make prioritized executor service listenable
 2014-05-16 16:59:04 -06:00
Xavier Léauté 07b2a0efa6 replace iterables with sequences, fixes #128 2014-05-16 13:22:53 -07:00
Xavier Léauté d8282d0126 add JavascriptAggregatorBenchmark 2014-05-16 10:41:54 -07:00
Gian Merlino 918ee8741a More JS aggregator tests. 2014-05-15 23:08:56 -07:00
Gian Merlino d389fbc961 More consistent ObjectColumnSelectors. JS aggregator tests for nulls. 2014-05-15 23:02:44 -07:00
Gian Merlino cb028f490a JavaScriptAggregator: Context.newArray makes nicer arrays than Context.javaToJS. 2014-05-15 20:02:36 -07:00
Gian Merlino c2137e8416 ObjectColumnSelector/JS aggregator support for multi-valued columns. 2014-05-15 19:34:22 -07:00
nishantmonu51 ce3d461e7d add header 2014-05-16 04:30:58 +05:30
nishantmonu51 e06b29edb9 add sanity unit tests 2014-05-16 03:15:35 +05:30
fjy 9d35490cdf Revert "Merge pull request #495 from metamx/dim-extraction-null-values" 
This reverts commit 76437379d7, reversing
changes made to 79e6d4eb56.

Conflicts:
	pom.xml
 2014-05-07 12:32:51 -07:00
fjy b6fb4245aa Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDriverConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfigBuilder.java
	pom.xml
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java
 2014-05-06 14:32:51 -07:00
fjy 76437379d7 Merge pull request #495 from metamx/dim-extraction-null-values 
Support null values in DimExtractionFn in topN and groupBy
 2014-05-06 14:17:55 -06:00
fjy 79e6d4eb56 Merge pull request #528 from metamx/union-query-source 
Union query source
 2014-05-06 14:13:33 -06:00
nishantmonu51 66450ca6ed review comments 
remove toShortString
minor other changes
 2014-05-07 00:54:17 +05:30
nishantmonu51 f2725994b7 refactor method 2014-05-05 19:57:32 +05:30
Xavier Léauté dab30395d5 make prioritized executor service listenable 2014-05-01 15:51:59 -07:00
nishantmonu51 728a606d32 Add support for union queries 2014-05-01 01:54:52 +05:30
Xavier Léauté c1e6f6d83e formatting changes 2014-04-25 14:54:17 -07:00
fjy 76e0a48527 Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DbUpdaterJob.java
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	indexing-service/src/main/java/io/druid/indexing/common/task/HadoopIndexTask.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
 2014-04-25 14:03:28 -07:00
Xavier Léauté 3c9b8dc999 cardinality aggregator 2014-04-24 22:08:25 -07:00
nishantmonu51 4721ba3f1e add test + small fix for other test 2014-04-22 23:03:48 +05:30
nishantmonu51 7bafb71841 Revert "fix npe in topNBinaryFn with post aggs" 
This reverts commit bbedde3418.
 2014-04-22 11:10:55 +05:30
Xavier Léauté bbedde3418 fix npe in topNBinaryFn with post aggs 2014-04-21 22:20:41 -07:00
Xavier Léauté 48590862cb support for null values in group-by 2014-04-21 17:58:44 -07:00
Xavier Léauté 44bd4339b5 support for null values in DimExtractionFn 2014-04-21 15:16:56 -07:00
nishantmonu51 e8b993b765 fix by segment results 
1) fix class cast in by segment results
2) exclude old netty version coming from curator
 2014-04-21 21:26:34 +05:30
nishantmonu51 68e8cda2da fix post aggregator 2014-04-19 04:24:07 +05:30
fjy c00fb1d08e Merge pull request #445 from metamx/hadoop-version-update 
Hadoop version update
 2014-04-17 19:16:44 -06:00
fjy 399efe7dc4 make uniques work for groupby 2014-04-17 14:41:17 -07:00
nishantmonu51 2b5fec1dcf review comments 2014-04-16 17:12:27 +05:30
fjy 228be3acb0 Merge pull request #467 from metamx/optimize-postAgg-calculation 
Optimize post agg calculation
 2014-04-15 15:18:01 -06:00
nishantmonu51 36f6f8ab5a Add testOutOfOrderPruneDependentPostAgg 2014-04-16 00:49:56 +05:30
nishantmonu51 d66ae5ac10 fix dependent PostAggregators 2014-04-15 13:37:31 +05:30
Xavier Léauté be30d450d7 support dimension extraction functions in group by 2014-04-09 17:17:01 -07:00
nishantmonu51 22c3296aa3 Merge branch 'master' into optimize-postAgg-calculation 
Conflicts:
	server/src/test/java/io/druid/client/CachingClusteredClientTest.java
 2014-04-08 03:35:56 +05:30
nishantmonu51 c322f44863 time series post Aggregation improved 
move post aggregation to finalise results
 2014-04-08 03:17:15 +05:30
fjy bae0fdf936 add context serde tests and deprecate backwards compatible methods 2014-04-07 13:18:55 -07:00
nishantmonu51 db35009acd Compute postage only when required 2014-04-07 23:17:25 +05:30
Xavier Léauté 0be29df8ae make hll tests deterministic 2014-03-27 16:15:32 -07:00
Xavier Léauté 5f0ada925d add HLL maxOverflow tests 2014-03-27 16:01:40 -07:00
Xavier Léauté 11f08b3895 benchmark more closely matches actual implementation 2014-03-26 22:18:26 -07:00
Xavier Léauté 2580a9c7f1 mark long-running tests as @Ignore + docs 2014-03-26 16:49:55 -07:00
Xavier Léauté f42b850d60 clean up + header 2014-03-26 09:31:45 -07:00
nishantmonu51 a9a6682a0e Upgrade to Hadoop 2.3.0 2014-03-26 11:43:31 +05:30
Xavier Léauté cd340aa314 hll benchmark 2014-03-25 17:07:09 -07:00
nishantmonu51 dc0e7f404a fix serialisation of segmentMetaDataQuery 2014-03-21 14:11:26 +05:30
nishantmonu51 32ad26210d Fix backwards compatibilty constant post aggregator 2014-03-18 20:34:49 +05:30
fjy 2adcf07f5f Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
	indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java
	processing/src/test/java/io/druid/segment/TestIndex.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
 2014-03-17 10:59:31 -07:00