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

370 Commits

Author SHA1 Message Date
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
jisookim0513 3bf39cc9f8 attempted to fix merge-conflicts 2014-09-24 15:55:42 -07:00
jisookim0513 273205f217 initial attempt for abstraction; druid cluster works with Derby as a default 2014-09-19 17:39:59 -07:00
Xavier Léauté f1e3518f37 initialize segment view before announcing broker 2014-09-16 00:07:31 -07:00
Xavier Léauté 0209b7e440 fix bridge port 2014-09-15 15:57:08 -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é 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
Gian Merlino 5888275206 Repeat less repeatedly. 2014-08-26 13:39:09 -07:00
Gian Merlino 890ba5a4ca Better usage messages for CliHadoopIndexer. 2014-08-26 13:29:11 -07:00
Gian Merlino 953c855410 CliHadoopIndexer: Modify maven arguments to be consistent with pull-deps. 2014-08-26 12:04:59 -07:00
Xavier Léauté 1fd30ab588 default service/host/port for all nodes 2014-08-15 17:14:05 -07:00
Xavier Léauté 17a3e65dc4 add missing tables 2014-08-15 12:50:30 -07:00
Xavier Léauté 6f0e768d82 add tools comand to create metadata storage tables 2014-08-14 17:13:55 -07:00
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 d082718ed2 fix assembly file 2014-08-11 14:28:44 -07:00
fjy 08c7aabb34 fix deadlock condition that can exist in the coordinator 2014-08-07 15:55:25 -07:00
jisookim0513 6f58cd1156 fix merge conflcts; change test files 2014-08-04 17:45:56 -07:00
fjy 7803ca07e7 fix broken chat handler 2014-07-29 17:58:21 -07:00
fjy 89149b5fcb prepare for next release 2014-07-29 17:38:19 -07:00
Xavier Léauté 05a09d2550 allow overriding coordinator static resource 2014-07-29 15:13:57 -07:00
fjy 2ad1bd3f44 add back metrics 2014-07-29 10:22:55 -07:00
fjy 088c2386dc rewrite router async logic 2014-07-28 16:32:15 -07:00
Xavier Léauté 2d4f1889e8 completely async request proxying + jetty update 2014-07-25 16:22:43 -07:00
fjy bb5c5b3ce7 fix config with broker select and add docs 2014-07-25 10:50:41 -07:00
fjy fec788f33f Merge branch 'master' into smarter-router 
Conflicts:
	services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java
 2014-07-22 17:06:45 -07:00
Xavier Léauté e76561e400 use async gzip filter for async servlet 2014-07-22 16:55:43 -07:00
Xavier Léauté 00f086665c default async timeout to server idle timeout 2014-07-22 16:55:21 -07:00
Xavier Léauté f847a46ccf fix typo 2014-07-22 15:53:50 -07:00
fjy 8f2fc595ee allow router to override selection based on config 2014-07-22 10:12:02 -07:00
fjy bf71d079f3 fix #636 2014-07-16 15:20:20 -07:00
fjy 534acc9eab fix mm 2014-07-15 22:50:38 -07:00
fjy 935b642b2c fix overlord binding problems 2014-07-15 16:13:11 -07:00
jisookim0513 c4397bd65a fixed merge conflicts 2014-07-07 11:26:11 -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
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
fjy 5227b43050 fix more test breakage 2014-06-17 10:35:01 -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é c506d014bf fix link to docs 2014-06-04 12:55:48 -07:00
fjy bb4105ed1a fix broken standalone hadoop ingestion 2014-06-04 09:23:46 -07:00
fjy c97768b27d Merge branch 'master' of github.com:metamx/druid into new-guava 2014-06-04 09:12:59 -07:00
nishantmonu51 d8338fc51d fix backwards compatibility 2014-06-04 16:40:06 +05:30
fjy 77ec4df797 update guava, java-util, and druid-api 2014-06-03 13:43:38 -07:00
fjy 49a8dc9e3e fix backwards incompatiable change with broker.balancer config 2014-05-28 13:27:43 -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 544c0f08f6 Merge pull request #459 from metamx/move-firehose 
Move the event receiver firehose such that standalone realtime nodes can use it
 2014-05-05 17:09:43 -06:00
fjy e90eb4b83a add custom tier selector 2014-04-28 15:31:15 -07:00
fjy 9de170540b fix bug with selection in cli 2014-04-28 14:00:53 -07:00
fjy 3c3daf452e Smarter server selection at the router level 2014-04-28 13:58:10 -07:00
fjy 171d20d52d Merge branch 'move-firehose' of github.com:metamx/druid into move-firehose 2014-04-25 14:13:19 -07:00
fjy eef034ca7e Merge branch 'master' of github.com:metamx/druid into move-firehose 2014-04-25 14:13:08 -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
Gian Merlino 8d650ae131 PullDependencies changes. 
- Pull default Hadoop version by default.
- Allow additional coordinates on the command line.
 2014-04-22 14:33:53 -07:00
fjy c00fb1d08e Merge pull request #445 from metamx/hadoop-version-update 
Hadoop version update
 2014-04-17 19:16:44 -06:00
fjy a87213e15f point code docs to latest instead of a version 2014-04-16 10:50:39 -07:00
fjy 51e2da9d8d use a separate annotation for the router, less confusing 2014-04-16 10:08:58 -07:00
fjy 24a0268036 cleanup code in router and add forwarding for get requests 2014-04-16 09:36:18 -07:00
fjy 508cf6a4f7 Merge branch 'master' of github.com:metamx/druid 2014-04-15 14:23:58 -07:00
fjy 9b06b6aa58 misc fixes for router 2014-04-15 14:23:54 -07:00
Xavier Léauté 077dd7c589 enable cache monitor on computes by default 2014-04-14 16:11:12 -07:00
fjy 88c592ccaa add more meaningful request logging 2014-04-10 10:37:25 -07:00
nishantmonu51 ea8b2dffd5 Add chatHandlerResource 2014-04-09 14:25:18 +05:30
fjy 7db756f819 prepare for next release 2014-04-08 16:25:59 -07:00
fjy a4df23f092 prepare for next release 2014-04-08 11:42:59 -07:00
nishantmonu51 c6f4b344cb add bindings for chat handler provider 2014-04-08 11:56:23 +05:30
fjy 4ef2bbbfc1 prepare for next release 2014-04-07 14:37:02 -07:00
fjy 2e9579a146 prepare for next release 2014-04-07 12:43:30 -07:00
fjy 1843316db6 commonalize event receiver firehose 2014-04-03 20:46:36 -07:00
fjy 5d8d506fe8 fix commented out filters 2014-04-03 17:06:28 -07:00
fjy d9062d91fa fix endpoint bugs and more docs 2014-04-03 17:01:33 -07:00
fjy b0bf08554a fix broken build 2014-04-02 22:22:42 -07:00
fjy e53d107472 revert broken cache 2014-04-02 22:12:22 -07:00
fjy ea9f31bbe0 learn to math and prepare for next release 2014-04-02 21:31:17 -07:00
fjy f185d215e1 fix jetty default thread pool size for jetty 9 and prepare for next release 2014-04-02 21:01:07 -07:00
fjy fc94b847c3 prepare for next release 2014-04-02 17:31:19 -07:00
fjy 7547e989f0 Merge pull request #456 from metamx/processing-threads-default 
more sensible defaults
 2014-04-02 18:25:43 -06:00
Xavier Léauté 2eb9493010 fix documentation link 2014-04-02 15:27:49 -07:00
fjy 1866cbad1b remove unneeded comment 2014-04-01 18:15:51 -07:00
fjy eaec0e3ab2 cleanup 2014-04-01 17:56:25 -07:00
fjy 6952eb7878 asynch servlet for query forwarding 2014-04-01 17:51:28 -07:00
nishantmonu51 06b53f02a8 upgrade default version in CluHadoopIndexer and merge from master 2014-03-27 03:37:45 +05:30
fjy 5169249ed5 Merge pull request #429 from metamx/compute-populate-cache 
Enable historical node to populate cache
 2014-03-25 12:03:26 -06:00
fjy eec07ad45f Merge branch 'master' of github.com:metamx/druid 
Conflicts:
	services/src/main/java/io/druid/cli/CliHadoopIndexer.java
 2014-03-25 10:04:14 -07:00
fjy b6dd2fae64 update some comments on standalone hadoop indexer 2014-03-25 10:03:40 -07:00
nishantmonu51 fe7a184096 review comments 2014-03-25 17:02:36 +05:30
nishantmonu51 0ba72ffb2b merge from master 2014-03-25 15:43:05 +05:30
nishantmonu51 6a34c09e05 Merge branch 'master' into compute-populate-cache 2014-03-25 13:23:00 +05:30
fjy 5ebb2d27e3 fix hadoop 2014-03-24 18:43:31 -07:00
fjy 75ec8bed9a address code review comments 2014-03-24 14:53:30 -07:00
fjy fcd7522596 Merge branch 'master' into router-node 2014-03-24 13:43:52 -07:00
fjy 55169175de prepare for next release 2014-03-21 11:05:54 -07:00
nishantmonu51 69e9b7a6c5 merge changes from master 2014-03-20 20:23:58 +05:30
fjy ab2524ba0a add router node 2014-03-18 13:44:29 -07:00
fjy 804a4051fa prepare for next rel 2014-03-18 08:10:59 -07:00
fjy 1d1ec1d855 clean up some defaults and prepare for next release 2014-03-17 21:41:34 -07:00
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
nishantmonu51 468e8e0b31 Memcache changes 2014-03-17 18:54:30 +05:30
fjy f1da044cfa fix another breaking endpoint in druid coordinator 2014-03-14 15:15:08 -07:00
fjy f525361c3d fix broken tests and prepare for next release 2014-03-14 15:05:07 -07:00
fjy f0fdfbb2f7 fix broken constant post agg 2014-03-14 14:54:52 -07:00
fjy b3fb2fea9c prepare for next release 2014-03-14 10:57:43 -07:00
nishantmonu51 04f3d0a13a fix cli hadoop indexer 
* run determine partitions job using CLI
 2014-03-11 16:36:19 +05:30
fjy ae2dc6506c fix broken granularity 2014-03-10 15:03:43 -07:00
fjy 243af486cf prepare for next release 2014-03-10 13:24:53 -07:00
fjy e1fac64298 prepare for next release 2014-03-06 12:53:05 -08:00
fjy 7b0b90a860 Merge branch 'master' of github.com:metamx/druid into new-schema 2014-02-20 16:12:31 -08:00
fjy 5d2367f0fd unit tests pass at this point 2014-02-20 15:52:12 -08:00
fjy ab83cba790 Merge pull request #393 from metamx/group-by-improvements 
Group by memory usage improvements
 2014-02-19 19:52:37 -07:00
fjy fb93448e9d prepare for next release because my last one failzored out of bad internetz 2014-02-14 15:22:27 -08:00
fjy 1a8f9f2e12 prepare for next release 2014-02-14 15:07:44 -08:00
fjy a986166b9c prepare for next release 2014-02-12 20:01:05 -08:00
nishantmonu51 3302cff6db groupBy improvements 2014-02-12 00:51:10 +05:30
fjy 2497bd2e85 prepare for next release 2014-02-07 13:04:34 -08:00
fjy c8b350270f prepare for next release 2014-02-07 11:54:56 -08:00
fjy 8edf0cf136 more backwards compatability fix 2014-01-26 21:27:34 +08:00
fjy 158a725985 fix backwards compat issues 2014-01-26 20:07:09 +08:00
fjy f3e1cbc423 fix according to code review 2014-01-21 16:26:28 -08:00
fjy e2ea2ec7fd Merge branch 'master' into az 
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
	server/src/main/java/io/druid/server/http/CoordinatorResource.java
	server/src/test/java/io/druid/client/DirectDruidClientTest.java
 2014-01-20 15:10:13 -08:00
fjy 215584891e Merge branch 'master' into moar-endpoints 2014-01-20 13:06:45 -08:00
fjy 6404967994 fixes 2014-01-20 13:05:05 -08:00
fjy 8d01a46d02 actually register resources 2014-01-17 18:01:09 -08:00
fjy f898c29e20 fix batch indexing and prepare for next release 2014-01-17 15:52:04 -08:00
fjy 0ceda034cd fix dependency issue and prepare for next release 2014-01-14 17:34:02 -08:00
fjy 187bb84b45 prepare for next release 2014-01-14 16:07:05 -08:00
fjy 9184906c39 prepare for next release 2014-01-14 09:54:42 -08:00
fjy e8d61ffe99 prepare for next release 2014-01-13 18:02:24 -08:00
fjy f123a14373 Merge branch 'master' into az 
Conflicts:
	docs/content/Realtime.md
	server/src/main/java/io/druid/client/selector/ServerSelector.java
 2014-01-09 19:09:38 -08:00
Xavier Léauté 632d6b0a78 make server selection configurable, add back random server selection 2014-01-09 14:37:33 -08:00
fjy f44509b530 queries working at this point, tests pass, still need more tests and fix rules interface 2014-01-07 16:24:53 -08:00
fjy e11952f3b6 bridge is kinda working for mastery stuff right now, tests pass 2014-01-06 17:01:50 -08:00
Xavier Léauté 95d92915bf more tests for Initialization + dependency cleanup 2013-12-30 16:31:10 -08:00
Gian Merlino bbe1b82347 Update versions 2013-12-20 12:26:27 -08:00
Gian Merlino 4bc8ff4d6a Update versions 2013-12-20 11:19:36 -08:00
fjy fba6caf7fd Merge pull request #326 from metamx/versions 
StatusResource
 2013-12-18 22:44:50 -08:00
Gian Merlino fc4dd51194 Update versions 2013-12-18 15:33:25 -08:00
fjy d112b2d211 prepare for next release 2013-12-17 17:47:04 -08:00
fjy 0051877f84 fix status endpoint 2013-12-17 17:46:16 -08:00
fjy 07875dd30b prepare for next release 2013-12-17 16:28:11 -08:00
fjy 69f33b0acd remove commented line 2013-12-17 16:24:15 -08:00
fjy bbb2754a7c fix redirects in druid 2013-12-17 16:22:36 -08:00
fjy f2241c8885 prepare for next release 2013-12-16 16:16:00 -08:00
Xavier Léauté ac2ca0e46c separate move and archive tasks 2013-12-16 14:00:55 -08:00
Xavier Léauté a417cd5df2 add archive task 2013-12-16 13:59:15 -08:00
fjy 84233238b1 Merge branch 'master' of github.com:metamx/druid 2013-12-16 12:01:55 -08:00
fjy 0998d835b0 fix redirection issues with master and overlord 2013-12-16 12:01:52 -08:00
Gian Merlino 7759ed4517 Coordinator: Link service announcement to leadership 2013-12-16 11:28:28 -08:00
Himadri Singh 3752122a7b implementing comments from review 2013-12-16 15:16:28 +05:30
fjy 87b83bceb1 fix task storage config serde and prepare for next release 2013-12-13 16:55:22 -08:00