Commit Graph

5688 Commits

Author SHA1 Message Date
Fangjin Yang 6a0389297c Merge pull request #1634 from metamx/IrcFirehoseFixes
Allow IrcFirehoseFactory to shutdown cleanly
2015-08-18 21:06:34 -07:00
Xavier Léauté 3b2e41e42a update for next release 2015-08-18 17:16:46 -07:00
Fangjin Yang 9ff6a637bb Merge pull request #1635 from druid-io/fix-versions
update version numbers in docs
2015-08-17 16:54:50 -07:00
Xavier Léauté 0cbda0c01d update version numbers in docs 2015-08-17 16:41:21 -07:00
Charles Allen b9792b57bc Merge pull request #1374 from himanshug/batch_delta_ingestion3
Feature for hadoop batch re-ingesion and delta ingestion
2015-08-17 15:52:49 -07:00
Charles Allen cd2c3776f8 Allow IrcFirehoseFactory to shutdown cleanly 2015-08-17 13:24:41 -07:00
Fangjin Yang f9e3f922e6 Merge pull request #1633 from pjain1/edit_metrics
swap description and dimension column for some JVM metrics
2015-08-17 13:07:57 -07:00
Parag Jain 41fa9bf994 swap description and dimension for some JVM metrics 2015-08-17 15:03:06 -05:00
Himanshu Gupta cfd81bfac7 updating the docs on how to do hadoop batch re-ingesion and delta ingestion 2015-08-16 14:07:35 -05:00
Himanshu Gupta a3bab5b7d9 IndexGeneratorJobTest type unit test for batch delta ingestion and reindexing 2015-08-16 14:07:35 -05:00
Himanshu Gupta 15fa43dd43 changing DatasourcePathSpec, to get segment list, so that hadoop indexer uses overlord action to get list of segments and passes when running as an overlord task. and, uses metadata store directly when running as standalone hadoop indexer
also, serialized list of segments is passed to DatasourcePathSpec so that hadoop classloader issues do not creep up
2015-08-16 14:07:35 -05:00
Himanshu Gupta 45947a1021 add ability to specify Multiple PathSpecs in batch ingestion, so that we can grab data from multiple places in same ingestion
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.java
	indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java

Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/path/PathSpec.java
2015-08-16 13:15:38 -05:00
Himanshu Gupta 1ae56f139b Druid Hadoop InputFormat and pathSpec
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/path/PathSpec.java
	indexing-service/pom.xml
2015-08-16 13:15:38 -05:00
Himanshu Gupta f1d309a671 do not run parser if value from InputFormat is already an InputRow 2015-08-14 14:44:22 -05:00
Himanshu Gupta 4d4aa8bfc6 refactor IngestSegmentFirehoseFactory so that IngestSegmentFirehose becomes reusable
Conflicts:
	indexing-service/src/main/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactory.java
2015-08-14 14:44:22 -05:00
Fangjin Yang 958dd1a451 Merge pull request #1629 from metamx/fix-1584
Update post-aggregations.md
2015-08-14 11:07:47 -07:00
MarConSchneid 3f15d81f76 Update post-aggregations.md
fix for  the issue: https://github.com/druid-io/druid/issues/1584
2015-08-14 11:03:58 -07:00
Fangjin Yang c1d274faff Merge pull request #1628 from druid-io/revert-1608-guice40
Revert "Update to guice 4.0"
2015-08-14 09:57:20 -07:00
Charles Allen db19d2d547 Revert "Update to guice 4.0" 2015-08-14 09:26:07 -07:00
Fangjin Yang 8d6fe021e3 Merge pull request #1627 from metamx/fix-realtime-tasks
explicitly call lifecycle stop
2015-08-14 08:17:00 -07:00
Nishant 08f50fcc37 explicitly call lifecycle stop 2015-08-14 17:35:17 +05:30
Xavier Léauté 24dc23967f Merge pull request #1607 from druid-io/even-more-docs
Fixes and more docs across many areas
2015-08-13 11:53:53 -07:00
fjy 43978eba99 Fixes and more docs across many areas 2015-08-13 10:35:53 -07:00
Himanshu 901cc22060 Merge pull request #1617 from metamx/increaseNECMETTimeout
Increase timeout in tests for NamespaceExtractionCacheManagerExecutorsTest
2015-08-12 12:38:01 -05:00
Charles Allen 76fbb12959 Increase timeout in tests for NamespaceExtractionCacheManagerExecutorsTest 2015-08-11 13:54:54 -07:00
Charles Allen be89105621 Merge pull request #1602 from metamx/more-code-cleanup
Some perf Improvements in Broker
2015-08-11 13:51:49 -07:00
Xavier Léauté fbdb841928 Merge pull request #1603 from metamx/optimize-lexicographic-topN
Optimizations for LexicographicTopNs
2015-08-11 13:35:34 -07:00
Nishant b8d8a8da9e Optimisations for LexicographicTopNs
initial review for perf optimizations for lexicographic TopNs

fix compilation

create map with proper size

review comment

review comment

review comments
2015-08-12 00:37:48 +05:30
Xavier Léauté 738da3fdb2 Merge pull request #1616 from gianm/fix-1545
Avoid the Hadoop objectMapper in the local IndexTask. Fixes #1545.
2015-08-11 10:54:15 -07:00
Gian Merlino bc0c7dd65d Avoid the Hadoop objectMapper in the local IndexTask. Fixes #1545. 2015-08-11 10:40:53 -07:00
Xavier Léauté fadd8a4342 Merge pull request #1608 from metamx/guice40
Update to guice 4.0
2015-08-10 15:00:26 -07:00
Charles Allen c8c8169c69 Bump druid-api to 0.3.10 to include guice 4.0 update 2015-08-10 13:57:55 -07:00
Charles Allen 7e61216287 Update to guice 4.0
- Mark a lot of `@Provides` methods as final since guice 4.0 disallows overriding them
2015-08-10 13:57:18 -07:00
Fangjin Yang ae1736eeb4 Merge pull request #1612 from metamx/jdk8Jersey1p19
Bumb Jersey to 1.19
2015-08-10 13:42:13 -07:00
Fangjin Yang dd0f0efc70 Merge pull request #1614 from metamx/approxhist-disclaimer
disclaimer + more docs for approximate histograms
2015-08-10 13:37:07 -07:00
Xavier Léauté f583cad2e2 disclaimer + more docs for approximate histograms 2015-08-10 13:13:49 -07:00
Fangjin Yang b6fa1996c0 Merge pull request #1613 from metamx/travis-cache-maven
faster build: cache maven dependencies in travis
2015-08-08 07:53:15 -07:00
Xavier Léauté 07b2b77c29 faster build: cache maven dependencies in travis 2015-08-07 18:05:30 -07:00
Charles Allen 7d5a77b882 Bumb Jersey to 1.19 2015-08-07 17:32:27 -07:00
Fangjin Yang 2d22bcc11b Merge pull request #1611 from metamx/betterTimingTests2789
Better handling of slow stuff in NamespaceExtractionCacheManagerExecutorsTest
2015-08-07 15:39:04 -07:00
Charles Allen 8be82c00bd Better handling of slow stuff in NamespaceExtractionCacheManagerExecutorsTest 2015-08-07 15:11:54 -07:00
Charles Allen e6226968a6 Merge pull request #1589 from druid-io/fix-firehose-doc
Add a lot more docs for firehoses
2015-08-06 12:45:24 -07:00
Fangjin Yang 78263a95c0 Merge pull request #1605 from metamx/friendlierNamespaceTests
Better handle timeouts in namespace tests
2015-08-06 11:54:11 -07:00
cheddar 644253af1c Merge pull request #1601 from metamx/stupidPoolLockless
Remove locks from StupidPool
2015-08-06 11:45:20 -07:00
Charles Allen 0326a7ac69 Merge pull request #1597 from metamx/fix-doc
some docs were missing before, hopfully this is more clear
2015-08-06 11:17:23 -07:00
Charles Allen 8cdcf69714 Better handle timeouts in namespace tests 2015-08-06 10:20:18 -07:00
Nishant 1a46c4c71c avoid creating mergeSeqence when not required 2015-08-06 14:25:13 +05:30
Nishant b33c644da0 avoid unnecessary call to MultipleSpecificSegmentSpec.getIntervals()
avoid unnecessary call to MultipleSpecificSegmentSpec.getIntervals()
profiling shows it took upto 6-12% of cpu time in
JodaUtils.condenseIntervals
2015-08-06 13:51:17 +05:30
Charles Allen 7fe8562980 Remove locks from StupidPool 2015-08-05 19:24:56 -07:00
Charles Allen 9dd18de1a5 Merge pull request #1596 from metamx/console-artifact
make console a maven dependency instead of filedump
2015-08-04 15:28:45 -07:00