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

1882 Commits

Author SHA1 Message Date
fjy a15d32da9b Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-18 17:11:12 -07:00
Xavier Léauté 78054d7f05 fix test initialization 2014-08-18 13:37:47 -07:00
fjy 77e514688a Merge branch 'druid-0.7.x' into offheap-incremental-index 2014-08-18 11:14:19 -07:00
Xavier Léauté 1fd30ab588 default service/host/port for all nodes 2014-08-15 17:14:05 -07:00
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 4f0f198a00 add more logging 2014-08-14 14:43:54 -07:00
fjy c36ffd1e55 address cr 2014-08-14 14:39:08 -07:00
fjy 6ba0a0df8b address cr 2014-08-14 13:56:36 -07:00
fjy 96d5d4a59a fix some rt cleanup and failure edge cases 2014-08-14 13:38:32 -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
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
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 0e1a8f6f02 concurrency my old foe, we meet again 2014-08-09 19:33:07 -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 e5896f4863 fix yet another bug with LQP 2014-08-08 15:50:57 -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
fjy 9a371f3490 Merge pull request #674 from metamx/fix-arbitrary-granularity 
fix missing queryGranularity in ArbitraryGranularitySpec
 2014-08-08 16:12:24 -06:00
Xavier Léauté 3826b1d976 fix missing queryGranularity in ArbitraryGranularitySpec 2014-08-08 15:11:35 -07:00
fjy 68827ff88b fix another bug in LQP with concurrency 2014-08-08 15:06:03 -07:00
fjy 48b99e43fc fix LQP register callback 2014-08-08 14:34:54 -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 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
xvrl 038f2de496 Merge pull request #672 from metamx/router-strat 
Add more config to router strategies; fix bad test
 2014-08-08 11:37:35 -07:00
fjy 9803be7529 Merge pull request #673 from metamx/rt-plumber-merge-behavior 
Change merged-segment-removing behavior in RealtimePlumber.
 2014-08-08 12:24:23 -06:00
Gian Merlino 179170224d Fix conditional. 2014-08-08 11:20:36 -07:00
Gian Merlino f547049929 Change merged-segment-removing behavior in RealtimePlumber. 
Old: Merged segments are deleted upon successful push, or on IOException.
New: Merged segments are deleted on any Exception, but NOT successful push.

Deleting a merged segment means that the next merge-and-push run will try to
push it again. So we want that to happen if there was any sort of Exception.
We *don't* want it to happen if the merge-and-push was successful, since in
that case, we are just waiting for historical nodes to load the segment. It
might take a while, but there's no reason to re-push while waiting.
 2014-08-08 10:59:16 -07:00
fjy a855db2170 make things immutable 2014-08-08 10:53:10 -07:00
fjy d2c7a67a0c clean up some redundant code 2014-08-08 10:52:05 -07:00
fjy f1409f751a fix bad defaults 2014-08-08 10:46:36 -07:00
fjy d4cf2763ac fix test again 2014-08-08 10:45:59 -07:00
fjy 8877ee9714 fix test 2014-08-08 10:43:50 -07:00
fjy b3eb4cc5da fix defaults 2014-08-08 10:42:58 -07:00
fjy 627447c6f8 add more config to router strategies; fix bad test 2014-08-08 10:41:11 -07:00
fjy 08c7aabb34 fix deadlock condition that can exist in the coordinator 2014-08-07 15:55:25 -07:00
fjy 91ebe45b4e support both rejectionPolicy and rejectionPolicyFactory in serde 2014-08-07 10:06:27 -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
Xavier Léauté 87fc354237 rename CleanupAvailable -> CleanupUnneeded 2014-08-06 14:29:00 -07:00
Xavier Léauté 70660ad295 separate cleanup of overshadowed vs. unavailable segments 2014-08-06 14:06:52 -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 8b6f030ad5 Merge pull request #661 from metamx/drop-remove-stuff 
Coordinator drop/remove related stuff.
 2014-08-06 14:28:23 -06:00
Gian Merlino 6e33cd4e0a Coordinator drop/remove related stuff. 
- DruidCoordinatorCleanup should wait for availableSegments to populate
  before dropping any segments.
- Clarify that millisToWaitBeforeDeleting applies to "removing" rather than
  "dropping" segments.
- LoadRule shouldn't need to wait for the deletionWaitTime before dropping
  excess replicas.
 2014-08-06 12:52:09 -07:00
fjy 4d4c6b891e address cr 2014-08-05 15:58:42 -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
Gian Merlino c58a316437 Need more synchronizing in DruidDataSource. 2014-08-05 13:32:53 -07:00
jisookim0513 6f58cd1156 fix merge conflcts; change test files 2014-08-04 17:45:56 -07:00
fjy 290982433b Merge pull request #657 from metamx/only-uncached-query-metrics 
Only emit query metrics for uncached queries.
 2014-08-04 18:01:18 -06:00
Gian Merlino 6c8222788b Only emit query metrics for uncached queries. 2014-08-04 16:42:38 -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 872a699142 another log fix 2014-07-31 17:23:40 -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
fjy 1c4d8c55dc finally track down and fix the node exists problem with not deleting noop requests 2014-07-31 13:56:29 -07:00
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 ecbc9eda48 revert breakage to chat handlers 2014-07-29 21:55:05 -07:00
fjy 3920300900 fix router bug 2014-07-29 21:44:07 -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 f577e1e74b fix guava version and firehose 2014-07-29 17:23:32 -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 43d4e5418a Merge pull request #653 from metamx/override-static-resource 
allow overriding coordinator static resource
 2014-07-29 17:15:01 -06:00
fjy 1586d60ec2 fix bugs in log printing 2014-07-29 16:14:29 -07:00
Xavier Léauté 05a09d2550 allow overriding coordinator static resource 2014-07-29 15:13:57 -07:00
fjy dc38677454 remove unneeded dependency 2014-07-29 14:23:50 -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
fjy 1ac84fcd00 some more logging cleanup for zk coordination 2014-07-29 14:07:19 -07:00
xvrl d21e377a20 Merge pull request #651 from metamx/rewrite-async 
rewrite router async logic
 2014-07-29 13:56:01 -07:00
Xavier Léauté 25a5a0fd33 fix unnecessary error messages 2014-07-29 13:54:36 -07:00
fjy 088e2c5af3 address cr 2014-07-29 13:36:28 -07:00
fjy b09517319d remove debug code 2014-07-29 13:23:12 -07:00
fjy 4a417cbcfc clean up some logging in Zk coordinator 2014-07-29 11:49:06 -07:00
fjy 41db4b1063 actually use the metrics emitting listener 2014-07-29 10:28:51 -07:00
fjy 2ad1bd3f44 add back metrics 2014-07-29 10:22:55 -07:00
fjy 382cde9cf2 less verbose logging for LQP 2014-07-29 09:51:53 -07:00
fjy 088c2386dc rewrite router async logic 2014-07-28 16:32:15 -07:00
fjy 82d623ada7 fix compilation error 2014-07-25 16:35:55 -07:00
Xavier Léauté 863929d550 unnecessary arguments 2014-07-25 16:26:44 -07:00
Xavier Léauté df59d2acb4 remove debug code 2014-07-25 16:25:47 -07:00
Xavier Léauté 2d4f1889e8 completely async request proxying + jetty update 2014-07-25 16:22:43 -07:00
fjy fc95a79abd add query priorities to metric emission 2014-07-25 16:10:55 -07:00
fjy 45e443bedb a few slight tweaks and bumping up curator version 2014-07-25 16:07:40 -07:00
fjy bb5c5b3ce7 fix config with broker select and add docs 2014-07-25 10:50:41 -07:00
Xavier Léauté 85f739797f remove debug println 2014-07-24 16:49:09 -07:00
Xavier Léauté 03efbb0e02 default query timeout to server idle timeout 2014-07-22 16:59:27 -07:00
Xavier Léauté 00f086665c default async timeout to server idle timeout 2014-07-22 16:55:21 -07:00
fjy 09e2f13ffc adding missing header 2014-07-22 10:12:47 -07:00
fjy 8f2fc595ee allow router to override selection based on config 2014-07-22 10:12:02 -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
nishantmonu51 4ce12470a1 Add way to skip determine partitions for index task 
Add a way to skip determinePartitions for IndexTask by manually
specifying numShards.
 2014-07-18 18:52:15 +05:30
fjy d8b8826c2e Merge branch 'cleanup-ingest' of github.com:metamx/druid into cleanup-ingest 
Conflicts:
	server/src/test/java/io/druid/realtime/firehose/CombiningFirehoseFactoryTest.java
 2014-07-17 20:26:11 -07:00
fjy 291f4c00ae Merge branch 'master' of github.com:metamx/druid into cleanup-ingest 2014-07-17 20:24:59 -07:00
nishantmonu51 0e0454a34c switch reingest task to noop & fix compilation 
switch back to noop task, its confusing to have a reinvest task that
does nothing.
fix compilation
 2014-07-18 06:50:58 +05:30
Xavier Léauté 95a09c04bf log errors in asyncForwardingServlet 2014-07-17 16:22:30 -07:00
fjy 465ac77b82 fix broken UT 2014-07-17 14:39:52 -07:00
fjy 76f096e667 Merge branch 'master' of github.com:metamx/druid into cleanup-ingest 2014-07-17 14:38:54 -07:00
fjy 8ef380b3f9 Merge pull request #638 from metamx/rejigger-cache 
Rejiggering the cache
 2014-07-17 15:19:23 -06:00
fjy ef325f15ff update pom and fix broken UT 2014-07-17 13:47:59 -07:00
fjy ba978d8b79 some minor cleanups to ingest firehose 2014-07-17 13:05:59 -07: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
fjy b70a6b1061 address code review comments 2014-07-16 13:52:06 -07:00
fjy de8cb55260 Merge branch 'master' into rejigger-cache 
Conflicts:
	pom.xml
 2014-07-16 13:37:20 -07:00
nishantmonu51 b74845e942 fix test 
committed it by mistake.
 2014-07-16 09:39:51 +05:30
fjy 27c4750780 fix infinite loop in test 2014-07-15 16:00:56 -07:00
fjy bdfeccd092 doc and timeout fix 2014-07-15 15:57:58 -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
nishantmonu51 a12688bc8b fix partitionNum calculation & remove extra sorting 2014-07-10 12:21:27 +05:30
nishantmonu51 fa43049240 review comments & pom changes 2014-07-10 11:48:46 +05:30
nishantmonu51 a1a5e4254f CombiningFirehoseFactory 
can be used to ingest data from multiple sources.
 2014-07-08 21:14:48 +05:30
nishantmonu51 36fc85736c Add ShardSpec Lookup 
Optimize choosing shardSpec for Hash Partitions
 2014-07-08 18:01:31 +05:30
jisookim0513 c4397bd65a fixed merge conflicts 2014-07-07 11:26:11 -07:00
fjy c1cd9ff2ce fix broken rename of rejection policies 2014-07-02 23:41:37 -06:00
fjy 255504727a Merge pull request #615 from metamx/push-bootstrapped-sinks 
push sinks after bootstrap. fix #570
 2014-06-20 11:45:19 -06:00
fjy b978eb33f1 minor fix for cleanup of historical cache file 2014-06-20 10:42:03 -07:00
nishantmonu51 a4003966b2 push sinks after bootstrap. fix #570 2014-06-20 21:45:30 +05:30
xvrl 12ee17c4d2 Merge pull request #614 from metamx/delay-drop 
add an optional delay for how long it takes to drop a segment, fixes all...
 2014-06-19 22:38:26 -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
fjy fc36bfbc6d remove pointless exception 2014-06-19 16:49:50 -07:00
fjy 2aab2a0cd9 address cr 2014-06-19 16:48:43 -07:00
fjy b313601a3b add an optional delay for how long it takes to drop a segment, fixes all manners of inconsistent issues 2014-06-19 16:32:38 -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