Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,139 Commits 111 Branches 504 Tags 700 MiB
Commit Graph

825 Commits

Author SHA1 Message Date
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
Xavier Léauté b81bd6c959 add test for single value index top-n 2014-03-10 13:10:45 -07:00
Xavier Léauté adf60d1548 test reset sanity on out of order values 2014-03-10 11:54:07 -07:00
Yuval Oren 5601c51ae6 finalize variables and optimize imports 2014-03-06 15:03:43 -08:00
Yuval Oren 4b63645802 Merge branch 'master' into subquery 
Conflicts:
	processing/src/main/java/io/druid/query/BaseQuery.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
	processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java
	processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java
 2014-03-06 13:33:59 -08:00
fjy 5826d9594c add headers 2014-03-05 14:29:00 -08:00
fjy 08138688e4 port hyperunique to open source 2014-03-05 14:19:38 -08:00
fjy 0e8e527662 Merge branch 'master' into new-schema 2014-03-04 14:42:16 -08:00
fjy 5aba6141d8 Merge pull request #414 from metamx/incremental-index-synchronization-fix 
Add test and fix one more issue caught by test
 2014-03-04 15:41:26 -07:00
nishantmonu51 4f06dd5a7e Add test and fix one more issue caught by test 2014-03-05 01:09:33 +05:30
fjy 46b9ac78e7 Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	pom.xml
	publications/whitepaper/druid.pdf
	publications/whitepaper/druid.tex
 2014-03-03 14:48:15 -08:00
nishantmonu51 eedd6a1b9e fix #362 
fix #362
 2014-02-28 12:38:39 +05:30
fjy 4b7c76762d unit tests passingn at this point, finished rt port maybe 2014-02-18 15:14:38 -08:00
fjy a8c4362d72 rejiggering druid api 2014-02-14 12:57:52 -08:00
Yuval Oren 98956cdadb Extra null value check. Not sure why this is needed in the subquery implementation and not regular queries. Bug elsewhere? 2014-02-03 15:53:10 -08:00
Yuval Oren c88cb2af16 Fix NPE when subquery returns empty result 2014-01-24 15:58:47 -08:00
Yuval Oren f2c1f798b9 Fix subquery merge issues 2014-01-24 15:03:48 -08:00
Yuval Oren cd719eab3c Merge branch 'master' into subquery 2014-01-24 14:42:41 -08:00
Yuval Oren 4c8495662f Subquery support for GroupBy queries 2014-01-15 15:38:57 -08:00
fjy 2aabc6c4e6 Merge branch 'master' into select 
Conflicts:
	processing/src/main/java/io/druid/query/Query.java
	server/src/main/java/io/druid/guice/QueryRunnerFactoryModule.java
	server/src/main/java/io/druid/guice/QueryToolChestModule.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
 2014-01-08 16:31:19 -08:00
fjy 50a6839693 inital commit of topNs 2014-01-08 15:51:03 -08:00
Gian Merlino 3b2833d55d JavaScriptAggregatorFactory: Handle missing columns by passing down null args 2013-12-16 21:05:14 -08:00
Xavier Léauté bb69f8adcd fix JS dim extraction null handling + test case 2013-12-09 18:36:14 -08:00
fjy 1fb5fc6707 tests 2013-12-09 14:59:44 -08:00
fjy b78919c729 fix NPEs 2013-12-05 16:49:28 -08:00
Xavier Léauté 5c77884684 Address code review 
- more tests
- fix license
- add missing getter
 2013-11-25 17:14:10 -08:00
Xavier Léauté 41df3e1f11 implement javascript dimextractionfn 2013-11-22 16:33:16 -08:00
fjy 0587a9ecd0 Merge pull request #289 from alberts/master 
Fix compile error in Eclipse 4.3.
 2013-11-13 13:15:55 -08:00
Xavier Léauté 074589ffce JavaScript post-aggregator 2013-11-07 15:07:14 -08:00
Albert Strasheim 1589909b9d Fix compile error in Eclipse 4.3. 
The method dimEquals(String, String) is ambiguous for the type DimFilters.
 2013-11-04 21:23:13 -08:00
cheddar c47fe202c7 Fix HadoopDruidIndexer to work with the new way of things 
There are multiple and sundry changes in here.

First, "HadoopDruidIndexer" has been split into two pieces, (1) CliHadoop which pulls the hadoop version and builds up the right classpath with the proper hadoop version to run the indexer and (2) CliInternalHadoopIndexer which actually runs the indexer.

In order to work around a bunch of jets3t version conflicts with Hadoop and Druid, I needed to extract the S3 deep storage stuff into its own module.  I then also moved the HDFS stuff into its own module so that I could eliminate the dependency on Hadoop for druid-server.

In doing these changes, I wanted to make the extensions buildable with only the druid-api jar, so a few other things had to move out of Druid and into druid-api.  They are all API-level things, however, so they really belong in druid-api instead.

Lastly, I removed the druid-realtime module and put it all in druid-server.
 2013-10-09 15:15:44 -05:00
fjy ac330f72bb first set of changes to standarize the naming convention we use in druid 2013-10-03 16:36:48 -07:00
fjy bc8db7daa5 1) make chat handler resource work again 
2) add more default configs
3) make examples work again
 2013-10-02 14:22:39 -07:00
cheddar 46631bf409 Port fix for issue where IncrementalIndex doesn't properly filter for "null" values from 0.5.x to master 2013-09-18 18:18:53 -05:00
cheddar dc728b5721 Update versions of poms and make IncrementalIndexStorageAdapterTest compile 2013-09-18 17:01:03 -05:00
cheddar 6bfe2310bb Merge branch 'master' into guice 
Conflicts:
	client/pom.xml
	client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java
	indexing-common/pom.xml
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolbox.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/TaskToolboxFactory.java
	indexing-service/src/main/java/com/metamx/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorNode.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/RemoteTaskRunnerTest.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskLifecycleTest.java
	indexing-service/src/test/java/com/metamx/druid/indexing/coordinator/TaskQueueTest.java
	realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java
	realtime/src/main/java/com/metamx/druid/realtime/firehose/IrcFirehoseFactory.java
	realtime/src/main/java/com/metamx/druid/realtime/firehose/WikipediaIrcDecoder.java
	realtime/src/main/java/com/metamx/druid/realtime/plumber/RealtimePlumberSchool.java
	server/src/main/java/com/metamx/druid/BaseServerNode.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
	server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java
	server/src/main/java/com/metamx/druid/query/group/GroupByQueryEngine.java
 2013-09-18 16:46:54 -05:00
cheddar dadd9bc5ce 1) Rename MetricSelector(Factory) to ColumnSelector(Factory) 
2) Hard coded plugin as a first pass, won't actually work for anyone else.
 2013-09-04 11:19:46 -05:00
cheddar 5ab671050e No more com.metamx.druid, it is now all io.druid! 2013-08-30 19:42:12 -05:00
cheddar bd0756e360 More stuff moved, things still compiling and tests still passing. Yay! 2013-08-30 18:58:35 -05:00
cheddar 56e2b956d0 OMG!!! A lot of stuff has been moved. Modules have been created and destroyed, but everything is compiling and unit tests are passing, OMFG this is awesome.! 2013-08-30 18:21:04 -05:00