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

1399 Commits

Author SHA1 Message Date
Fangjin Yang 3cfa081c6c Merge branch 'master' of github.com:metamx/druid 2013-04-15 15:42:19 -07:00
Fangjin Yang 2cf1cf9c1f druid paper 2013-04-15 15:42:10 -07:00
Gian Merlino beff15f8d4 [maven-release-plugin] prepare for next development iteration 2013-04-15 15:03:26 -07:00
Gian Merlino b71ae8ade3 [maven-release-plugin] prepare release druid-0.3.35 2013-04-15 15:03:20 -07:00
gianm 7a21ef9fd6 Merge pull request #122 from metamx/config-master 
Slightly better configuration when talking to indexing service
 2013-04-15 14:58:44 -07:00
Fangjin Yang cc929b2a07 slightly better configuration when talking to indexing service 2013-04-15 11:09:04 -07:00
cheddar cb1b69dadd Merge pull request #110 from metamx/stop_task 
Indexing service: workers run tasks in their own JVMs and graceful shutdown of tasks
 2013-04-12 22:14:10 -07:00
Fangjin Yang 6ed0308c59 Merge branch 'master' into stop_task 2013-04-12 22:13:45 -07:00
Fangjin Yang 8a4ec1cd17 Merge branch 'stop_task' of github.com:metamx/druid into stop_task 2013-04-12 22:13:22 -07:00
Fangjin Yang bacb1e5520 update fix 2013-04-12 22:12:22 -07:00
Gian Merlino a0b2a34845 Merge branch 'master' into stop_task 
Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/actions/LockListAction.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/ExecutorServiceTaskRunner.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
	merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java
 2013-04-12 14:10:27 -07:00
Gian Merlino c21d7f6ee2 ForkingTaskRunner: Slight tweaks to setup and teardown 2013-04-12 14:06:51 -07:00
cheddar e9f6c7267d Merge pull request #120 from metamx/kafka-0.7.2 
Realtime: Update to kafka-0.7.2
 2013-04-12 11:55:11 -07:00
Fangjin Yang a24274029f change shutdown logic for firehose 2013-04-12 11:49:01 -07:00
Fangjin Yang 465b78b4bc more changes 2013-04-10 20:21:26 -07:00
Gian Merlino eaea8ae163 - Ability to cancel pending tasks in the ForkingTaskRunner. 
- Other various changes from code review.
 2013-04-10 19:54:22 -07:00
Gian Merlino 4d7dace033 Realtime: Update to kafka-0.7.2 
Firehose configs will need to have their "kafka-0.6.3" type changed to
"kafka-0.7.2", and "/kafka" added to the zk.connect string in consumerProps
(kafka-0.6-mmx11 hardcoded this path).
 2013-04-10 10:34:09 -07:00
Eric Tschetter 55648c47a7 1) Adjust the GroupByQuery to also be able to merge results on the local node. Fixes #116 
2) Make the GroupByQuery operate in a multi-threaded fashion by default (this is configurable via druid.query.groupBy.singleThreaded).  Fixes #96
3) Fix up some post aggregation computation stuff.  I believe #72 is fixed
4) Fix case sensitivity issue with post aggregations on GroupBy queries
 2013-04-09 19:13:08 -07:00
cheddar a678f08b67 Merge pull request #118 from darxriggs/master 
cleanup & refactoring
 2013-04-09 18:56:59 -07:00
Gian Merlino fce3b8c20f Merge branch 'master' into stop_task 2013-04-09 10:34:53 -07:00
Gian Merlino f90304d07b Merger: Task logging system 2013-04-09 10:34:15 -07:00
Gian Merlino 33434f2c82 Executor: Move most logic out of main 2013-04-09 10:34:14 -07:00
Nelson Ray 092fe70a35 use reservoir sampling in pickSegmentToMove to avoid IndexOutOfBoundsException when a segment gets dropped mid-run 2013-04-09 10:34:14 -07:00
René Scheibe 3937a77665 fix cut-n-paste mistake in error message (issue #81) 2013-04-09 10:34:14 -07:00
Fangjin Yang e125a58f0e [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:14 -07:00
Fangjin Yang 27cef03724 [maven-release-plugin] prepare release druid-0.3.33 2013-04-09 10:34:14 -07:00
Fangjin Yang 272265b33d fix broken UT 2013-04-09 10:34:14 -07:00
Fangjin Yang 917cb20494 nodes will not try and download segments during startup 2013-04-09 10:34:14 -07:00
Fangjin Yang 2fcf7e018b [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:14 -07:00
Fangjin Yang 4f232fe430 [maven-release-plugin] prepare release druid-0.3.32 2013-04-09 10:34:14 -07:00
Fangjin Yang e1366aa4c4 fix segment partition deletion bug 2013-04-09 10:34:14 -07:00
xvrl 2a199fd61d remove accidentally comitted files 2013-04-09 10:34:13 -07:00
Eric Tschetter 847790f784 1) A few minor edits to the paper 2013-04-09 10:34:13 -07:00
Fangjin Yang bf2f2df22c [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:13 -07:00
Fangjin Yang d4dc593ecc [maven-release-plugin] prepare release druid-0.3.31 2013-04-09 10:34:13 -07:00
Fangjin Yang dd80fded1d fix query problem 2013-04-09 10:34:13 -07:00
Fangjin Yang 185d367153 [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:12 -07:00
Fangjin Yang ff0fdc15c2 [maven-release-plugin] prepare release druid-0.3.30 2013-04-09 10:34:12 -07:00
Fangjin Yang ef2a7c7a0c fix broker datasources path 2013-04-09 10:34:12 -07:00
Fangjin Yang dbb03deb26 [maven-release-plugin] prepare for next development iteration 2013-04-09 10:34:12 -07:00
Fangjin Yang ef50da3b9b [maven-release-plugin] prepare release druid-0.3.29 2013-04-09 10:34:12 -07:00
Fangjin Yang fb5b1b441e remove conflicting dependencies on ZK 2013-04-09 10:34:12 -07:00
Fangjin Yang 741a13fcac fix inconsistent druid http paths + fix master console bugs 2013-04-09 10:34:12 -07:00
Fangjin Yang 6fe9707f96 [maven-release-plugin] prepare for next development iteration 2013-04-08 11:26:37 -07:00
Fangjin Yang f0ab28be90 [maven-release-plugin] prepare release druid-0.3.34 2013-04-08 11:26:32 -07:00
Fangjin Yang 120b822c18 Merge branch 'master' of github.com:metamx/druid 
Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java
 2013-04-08 11:24:17 -07:00
Fangjin Yang 925c104dd2 update emitter version and fix some NPEs 2013-04-08 11:23:08 -07:00
cheddar be47c2003f Merge pull request #117 from darxriggs/a6dc29cf85fe617a96b70ca3cf84150b9e2e86f4 
cleanup - removed extra empty lines
 2013-04-08 08:36:55 -07:00
René Scheibe 6c27cd2e8e cleanup - removed unused imports 2013-04-07 23:31:22 +02:00
René Scheibe a6dc29cf85 cleanup - removed extra empty lines 
- there should not be any adjacent empty lines
 2013-04-07 14:32:09 +02:00