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

376 Commits

Author SHA1 Message Date
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
fjy 8e5cbca2ee [maven-release-plugin] prepare for next development iteration 2014-03-14 15:16:55 -07:00
fjy 852d167eaf [maven-release-plugin] prepare release druid-0.6.69 2014-03-14 15:16:50 -07:00
fjy 7a2d0850e3 [maven-release-plugin] prepare for next development iteration 2014-03-14 15:06:54 -07:00
fjy 2646b5421b [maven-release-plugin] prepare release druid-0.6.68 2014-03-14 15:06:50 -07:00
fjy f525361c3d fix broken tests and prepare for next release 2014-03-14 15:05:07 -07:00
fjy 454a240525 [maven-release-plugin] prepare for next development iteration 2014-03-14 10:59:27 -07:00
fjy 6e9bc9acab [maven-release-plugin] prepare release druid-0.6.66 2014-03-14 10:59:23 -07:00
fjy 34957ee471 [maven-release-plugin] prepare for next development iteration 2014-03-10 15:05:48 -07:00
fjy 35297572ed [maven-release-plugin] prepare release druid-0.6.65 2014-03-10 15:05:43 -07:00
fjy 369156fe80 [maven-release-plugin] prepare for next development iteration 2014-03-10 13:26:38 -07:00
fjy ba3806fcc2 [maven-release-plugin] prepare release druid-0.6.64 2014-03-10 13:26:34 -07:00
fjy 00c5a708a2 [maven-release-plugin] prepare for next development iteration 2014-03-06 12:55:11 -08:00
fjy 9599832c58 [maven-release-plugin] prepare release druid-0.6.63 2014-03-06 12:55:06 -08:00
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
fjy 37a79dd4cb [maven-release-plugin] prepare for next development iteration 2014-02-27 11:52:40 -08:00
fjy 8cdd0e3d53 [maven-release-plugin] prepare release druid-0.6.62 2014-02-27 11:52:35 -08:00
Xavier Léauté 2f61035585 add restore task 2014-02-25 13:41:40 -08:00
fjy 4b7c76762d unit tests passingn at this point, finished rt port maybe 2014-02-18 15:14:38 -08:00
fjy c57cf6ab4d [maven-release-plugin] prepare for next development iteration 2014-02-14 15:24:15 -08:00
fjy 44755cc91c [maven-release-plugin] prepare release druid-0.6.61 2014-02-14 15:24:11 -08:00
fjy f5affb6b5a [maven-release-plugin] prepare for next development iteration 2014-02-14 15:09:30 -08:00
fjy 189376f495 [maven-release-plugin] prepare release druid-0.6.60 2014-02-14 15:09:26 -08:00
fjy 82fd35726f [maven-release-plugin] prepare for next development iteration 2014-02-12 20:03:00 -08:00
fjy cc1b91636f [maven-release-plugin] prepare release druid-0.6.59 2014-02-12 20:02:55 -08:00
fjy b7a78680b2 [maven-release-plugin] prepare for next development iteration 2014-02-07 13:06:23 -08:00
fjy cc6886646e [maven-release-plugin] prepare release druid-0.6.58 2014-02-07 13:06:18 -08:00
fjy 555f434fa6 [maven-release-plugin] prepare for next development iteration 2014-02-07 11:56:41 -08:00
fjy 371f2bb941 [maven-release-plugin] prepare release druid-0.6.57 2014-02-07 11:56:34 -08:00
fjy 056e82a516 [maven-release-plugin] prepare for next development iteration 2014-02-04 15:23:34 -08:00
fjy 0ea45b590f [maven-release-plugin] prepare release druid-0.6.56 2014-02-04 15:23:30 -08:00
fjy fc4cd79125 [maven-release-plugin] prepare for next development iteration 2014-02-03 16:47:50 -08:00
fjy 4d52e20fe1 [maven-release-plugin] prepare release druid-0.6.55 2014-02-03 16:47:46 -08:00
fjy 46571ddf69 [maven-release-plugin] prepare for next development iteration 2014-02-03 16:35:02 -08:00
fjy cebb46a259 [maven-release-plugin] prepare release druid-0.6.54 2014-02-03 16:34:57 -08:00
fjy 21d518e15c [maven-release-plugin] prepare for next development iteration 2014-01-31 16:32:25 -08:00
fjy 84f434d9f4 [maven-release-plugin] prepare release druid-0.6.53 2014-01-31 16:32:21 -08:00
fjy 57e022f446 [maven-release-plugin] prepare for next development iteration 2014-01-17 15:53:54 -08:00
fjy 6540b2a58e [maven-release-plugin] prepare release druid-0.6.52 2014-01-17 15:53:50 -08:00
fjy 26a0f862fb [maven-release-plugin] prepare for next development iteration 2014-01-14 17:35:45 -08:00
fjy 3737ac4966 [maven-release-plugin] prepare release druid-0.6.51 2014-01-14 17:35:40 -08:00
fjy 528efedf52 [maven-release-plugin] prepare for next development iteration 2014-01-14 16:08:47 -08:00
fjy b4e4a5df96 [maven-release-plugin] prepare release druid-0.6.50 2014-01-14 16:08:43 -08:00
fjy 4a9c255cde [maven-release-plugin] prepare for next development iteration 2014-01-14 09:56:34 -08:00
fjy d8ac5575bc [maven-release-plugin] prepare release druid-0.6.49 2014-01-14 09:56:30 -08:00
fjy 396311a547 [maven-release-plugin] prepare for next development iteration 2014-01-13 18:04:29 -08:00
fjy 9c9d6287a2 [maven-release-plugin] prepare release druid-0.6.48 2014-01-13 18:04:24 -08:00
fjy 2b46c1d292 [maven-release-plugin] prepare for next development iteration 2014-01-02 19:53:41 -08:00
fjy 7a0f634b02 [maven-release-plugin] prepare release druid-0.6.47 2014-01-02 19:53:35 -08:00
Gian Merlino 668cf009a0 [maven-release-plugin] prepare for next development iteration 2013-12-20 12:28:54 -08:00
Gian Merlino bd58def933 [maven-release-plugin] prepare release druid-0.6.46 2013-12-20 12:28:49 -08:00
Gian Merlino 9043c211b2 [maven-release-plugin] prepare for next development iteration 2013-12-20 11:25:36 -08:00
Gian Merlino 29c0fa1df9 [maven-release-plugin] prepare release druid-0.6.45 2013-12-20 11:25:31 -08:00
Gian Merlino 5711ac4aff [maven-release-plugin] prepare for next development iteration 2013-12-20 11:17:01 -08:00
Gian Merlino 3b15f6a834 [maven-release-plugin] prepare release druid-0.6.44 2013-12-20 11:17:01 -08:00
Gian Merlino c503f5e9c5 [maven-release-plugin] prepare for next development iteration 2013-12-20 11:17:01 -08:00
Gian Merlino 97095ee3db [maven-release-plugin] prepare release druid-0.6.43 2013-12-20 11:17:00 -08:00
Gian Merlino 25c3f28907 [maven-release-plugin] prepare for next development iteration 2013-12-18 18:38:27 -08:00
Gian Merlino 6a740768d6 [maven-release-plugin] prepare release druid-0.6.42 2013-12-18 18:38:22 -08:00
Gian Merlino 6478c9a162 S3DataSegmentMover: No need to move files onto themselves 2013-12-18 18:36:10 -08:00
Gian Merlino 8d8ec51c9c [maven-release-plugin] prepare for next development iteration 2013-12-18 16:05:33 -08:00
Gian Merlino 00d651bf6f [maven-release-plugin] prepare release druid-0.6.41 2013-12-18 16:05:27 -08:00
Gian Merlino b7a184cb06 S3DataSegmentMover: Retries for S3 failures 2013-12-18 16:00:37 -08:00
Gian Merlino d0fd58bbae [maven-release-plugin] prepare for next development iteration 2013-12-18 15:35:55 -08:00
Gian Merlino 231d7a6d1f [maven-release-plugin] prepare release druid-0.6.40 2013-12-18 15:35:50 -08:00
Xavier Léauté c8be38fe40 back to baseKey 2013-12-18 14:57:14 -08:00
fjy 494ec53050 [maven-release-plugin] prepare for next development iteration 2013-12-17 17:48:46 -08:00
fjy 2a98a4d3e0 [maven-release-plugin] prepare release druid-0.6.39 2013-12-17 17:48:42 -08:00
fjy 5932150d24 [maven-release-plugin] prepare for next development iteration 2013-12-17 16:29:53 -08:00
fjy ed9f4b4cf2 [maven-release-plugin] prepare release druid-0.6.38 2013-12-17 16:29:49 -08:00
Xavier Léauté 178c26f9f7 fix naming and docs 2013-12-16 16:50:31 -08:00
fjy 48d677d135 [maven-release-plugin] prepare for next development iteration 2013-12-16 16:17:45 -08:00
fjy 7e0b4d4fd2 [maven-release-plugin] prepare release druid-0.6.37 2013-12-16 16:17:41 -08:00
Xavier Léauté f7f5ffc880 add S3 segment move test and fix bug caught by test 2013-12-16 15:12:15 -08:00
Xavier Léauté f3b8d9c047 safely move files 2013-12-16 14:00:56 -08:00
Xavier Léauté ac2ca0e46c separate move and archive tasks 2013-12-16 14:00:55 -08:00
Xavier Léauté 6b90372002 separate segment mover and segment archiver 2013-12-16 13:59:16 -08:00
Xavier Léauté 3af6e49cd4 throw exception instead of just printing a warning 2013-12-16 13:59:16 -08:00
Xavier Léauté 3ae48a8191 fix cut-n-paste typo 2013-12-16 13:59:16 -08:00
Xavier Léauté cd7a941f83 consolidate path functions 2013-12-16 13:59:15 -08:00
Xavier Léauté a417cd5df2 add archive task 2013-12-16 13:59:15 -08:00
Xavier Léauté e38f2877fb default to archiving segments + docs 2013-12-16 13:59:15 -08:00
Xavier Léauté 1f7a089fa8 S3 storage: enable archiving in addition to deleting unused segments 2013-12-16 13:59:15 -08:00
Gian Merlino 36756e611b S3Utils: Fix retry predicate 2013-12-16 08:27:26 -08:00
fjy 3812bf7215 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:57:07 -08:00
fjy a7ff58f877 [maven-release-plugin] prepare release druid-0.6.36 2013-12-13 16:57:02 -08:00
fjy 41d64f4aa6 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:47:21 -08:00
fjy 1c050a02f8 [maven-release-plugin] prepare release druid-0.6.35 2013-12-13 16:47:17 -08:00
fjy 7891e0a2e2 [maven-release-plugin] prepare for next development iteration 2013-12-13 16:20:23 -08:00
fjy 1d75738f81 [maven-release-plugin] prepare release druid-0.6.34 2013-12-13 16:20:18 -08:00
fjy aef7726c33 [maven-release-plugin] prepare for next development iteration 2013-12-12 18:53:18 -08:00
fjy 1d1baf5976 [maven-release-plugin] prepare release druid-0.6.33 2013-12-12 18:53:14 -08:00
fjy f920dd6fb2 [maven-release-plugin] prepare for next development iteration 2013-12-12 17:28:38 -08:00
fjy 857d24a4ca [maven-release-plugin] prepare release druid-0.6.32 2013-12-12 17:28:34 -08:00
fjy 7c744ffda0 [maven-release-plugin] prepare for next development iteration 2013-12-12 14:53:01 -08:00
fjy 365da245c2 [maven-release-plugin] prepare release druid-0.6.31 2013-12-12 14:52:57 -08:00
Gian Merlino 1ec6d5b0ef S3Utils: Use RetryUtils from java-util 2013-12-11 15:05:16 -08:00
fjy a7cc559623 [maven-release-plugin] prepare for next development iteration 2013-12-09 20:07:38 -08:00
fjy 54755b8864 [maven-release-plugin] prepare release druid-0.6.30 2013-12-09 20:07:34 -08:00
fjy 6cc0860657 fix s3 module problems and prepare for next release 2013-12-09 20:05:55 -08:00
fjy 7a134272b3 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:45:27 -08:00
fjy 829658f171 [maven-release-plugin] prepare release druid-0.6.29 2013-12-09 18:45:23 -08:00
fjy 98a0f40227 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:35:22 -08:00
fjy 939d2313c0 [maven-release-plugin] prepare release druid-0.6.28 2013-12-09 18:35:18 -08:00
fjy c03d573e84 [maven-release-plugin] prepare for next development iteration 2013-12-09 18:30:15 -08:00
fjy 71fe8a43da [maven-release-plugin] prepare release druid-0.6.27 2013-12-09 18:30:11 -08:00
fjy 8aba4ad3d2 Merge pull request #311 from metamx/versions 
Add versions to static page
 2013-12-09 17:18:16 -08:00
fjy 7c7cfdf819 [maven-release-plugin] prepare for next development iteration 2013-12-04 18:57:30 -08:00
fjy 6bfb3b8d41 [maven-release-plugin] prepare release druid-0.6.26 2013-12-04 18:57:25 -08:00
Himadri Singh 47278ad109 Merge relevant changes from 'druid-version-info' 2013-12-04 10:21:19 +05:30
fjy 1a3a1221c2 [maven-release-plugin] prepare for next development iteration 2013-12-02 14:22:54 -08:00
fjy b18b65108a [maven-release-plugin] prepare release druid-0.6.25 2013-12-02 14:22:50 -08:00
Himadri Singh 95fafe02a7 server versions with loaded extensions versions 2013-11-27 12:21:35 +05:30
fjy 730e3a2303 [maven-release-plugin] prepare for next development iteration 2013-11-25 17:55:01 -08:00
fjy c7171e3311 [maven-release-plugin] prepare release druid-0.6.24 2013-11-25 17:54:57 -08:00
fjy 5c6e647148 [maven-release-plugin] prepare for next development iteration 2013-11-20 12:00:15 -08:00
fjy 5b94895a36 [maven-release-plugin] prepare release druid-0.6.23 2013-11-20 12:00:11 -08:00
fjy ea95566cd9 [maven-release-plugin] prepare for next development iteration 2013-11-20 10:45:21 -08:00
fjy fe7122b717 [maven-release-plugin] prepare release druid-0.6.22 2013-11-20 10:45:17 -08:00
fjy 88378eb036 [maven-release-plugin] prepare for next development iteration 2013-11-20 10:28:57 -08:00
fjy 2e6056f537 [maven-release-plugin] prepare release druid-0.6.21 2013-11-20 10:28:52 -08:00
fjy 7fec5e6ff7 [maven-release-plugin] prepare for next development iteration 2013-11-19 09:59:48 -08:00
fjy 265ef23cd5 [maven-release-plugin] prepare release druid-0.6.20 2013-11-19 09:59:44 -08:00
fjy 48d275e5cb [maven-release-plugin] prepare for next development iteration 2013-11-14 18:20:29 -08:00
fjy c31c5ce1ac [maven-release-plugin] prepare release druid-0.6.19 2013-11-14 18:20:25 -08:00
fjy d935e1b47b [maven-release-plugin] prepare for next development iteration 2013-11-14 15:08:12 -08:00
fjy 32dbbe4f63 [maven-release-plugin] prepare release druid-0.6.18 2013-11-14 15:08:09 -08:00
fjy 373251a476 [maven-release-plugin] prepare for next development iteration 2013-11-14 14:31:26 -08:00
fjy 7120db20a4 [maven-release-plugin] prepare release druid-0.6.17 2013-11-14 14:31:22 -08:00
fjy 89e6ce3550 [maven-release-plugin] prepare for next development iteration 2013-11-14 13:18:24 -08:00
fjy 97293b3f04 [maven-release-plugin] prepare release druid-0.6.16 2013-11-14 13:18:20 -08:00
fjy e7118cd9be [maven-release-plugin] prepare for next development iteration 2013-11-14 10:54:37 -08:00
fjy d3f46c826a [maven-release-plugin] prepare release druid-0.6.15 2013-11-14 10:54:32 -08:00
fjy 6e7e2428e8 [maven-release-plugin] prepare for next development iteration 2013-11-13 13:27:47 -08:00
fjy 9c4cecc015 [maven-release-plugin] prepare release druid-0.6.14 2013-11-13 13:27:43 -08:00
Xavier Léauté 7289e5b3b3 forgot httpcore 2013-11-13 13:06:34 -08:00
Xavier Léauté 89f821900c add imports 2013-11-13 11:51:17 -08:00
fjy 6c41cd8682 [maven-release-plugin] prepare for next development iteration 2013-11-13 11:38:44 -08:00
fjy b93550194a [maven-release-plugin] prepare release druid-0.6.13 2013-11-13 11:38:39 -08:00
Xavier Léauté 49a5bbc196 aws-java-sdk requires http-client 4.2, override other libraries that use 4.1 2013-11-13 11:31:54 -08:00
fjy 9bbaade8f9 [maven-release-plugin] prepare for next development iteration 2013-11-13 10:37:12 -08:00
fjy 4dffef698e [maven-release-plugin] prepare release druid-0.6.12 2013-11-13 10:37:08 -08:00
Xavier Léauté fbd2c520ad move jets3t version to main pom 2013-11-13 10:31:19 -08:00
fjy 12a188d8d6 [maven-release-plugin] prepare for next development iteration 2013-11-12 15:20:54 -08:00
fjy 63d9f7362a [maven-release-plugin] prepare release druid-0.6.11 2013-11-12 15:20:47 -08:00
fjy 5c1eac474e fix typo with kafka eight 2013-11-12 14:36:52 -08:00
fjy 51aa7a2284 doesnt work yet 2013-11-11 14:04:03 -08:00
fjy 0681fb614d [maven-release-plugin] prepare for next development iteration 2013-11-08 15:56:10 -08:00
fjy de5984ccea [maven-release-plugin] prepare release druid-0.6.10 2013-11-08 15:56:06 -08:00
fjy d212b3fc43 [maven-release-plugin] prepare for next development iteration 2013-11-08 15:14:46 -08:00
fjy 4cd4578539 [maven-release-plugin] prepare release druid-0.6.9 2013-11-08 15:14:41 -08:00
fjy fd4fb78e1f [maven-release-plugin] prepare for next development iteration 2013-11-08 11:34:12 -08:00
fjy f8d5d127a4 [maven-release-plugin] prepare release druid-0.6.8 2013-11-08 11:34:09 -08:00
fjy 90240e6f1e [maven-release-plugin] prepare for next development iteration 2013-11-07 23:29:02 -08:00
fjy c3d6233bc4 [maven-release-plugin] prepare release druid-0.6.7 2013-11-07 23:28:58 -08:00
fjy d70bcc5657 repair broken pom 2013-11-07 23:27:06 -08:00
fjy fafd9c8d27 [maven-release-plugin] prepare for next development iteration 2013-11-07 18:20:19 -08:00
fjy f945416538 [maven-release-plugin] prepare release druid-0.6.5 2013-11-07 18:20:16 -08:00
fjy ed328aca6e [maven-release-plugin] prepare for next development iteration 2013-11-07 18:03:39 -08:00
fjy e34f1a829b [maven-release-plugin] prepare release druid-0.6.4 2013-11-07 18:03:36 -08:00
fjy 009646ed56 [maven-release-plugin] prepare for next development iteration 2013-11-07 17:40:12 -08:00
fjy 4cde47c9d1 [maven-release-plugin] prepare release druid-0.6.3 2013-11-07 17:40:06 -08:00
fjy e6a83c0339 [maven-release-plugin] prepare for next development iteration 2013-11-07 17:05:52 -08:00
fjy 2ac09b798d [maven-release-plugin] prepare release druid-0.6.2 2013-11-07 17:05:48 -08:00
fjy 6181114acd Merge pull request #288 from metamx/abandon-rt-segments 
Realtime: Abandon segments that fail to push when shutting down
 2013-11-07 15:53:49 -08:00
fjy ee15fd9f85 [maven-release-plugin] prepare for next development iteration 2013-11-05 15:42:37 -08:00
fjy 713015199a [maven-release-plugin] prepare release druid-0.6.1 2013-11-05 15:42:33 -08:00
Gian Merlino 50a8c806c3 S3Utils: Replace S.o.println with log.warn 2013-11-02 15:24:05 -07:00
Gian Merlino f8e564469f S3Utils: More aggressive retries, S3 can be pretty unreliable sometimes 2013-11-02 08:57:58 -07:00
fjy a684885839 [maven-release-plugin] prepare for next development iteration 2013-10-18 15:48:16 -07:00
fjy 88dcfe9a94 [maven-release-plugin] prepare release druid-0.6.0 2013-10-18 15:48:12 -07:00
fjy 1bd1bc98d1 update s3 calls to not use deprecated fns 2013-10-16 13:21:54 -07:00
fjy 2dc716bf7e fix bug and make it actually possible to load extensions 2013-10-16 11:59:01 -07:00
fjy 9796a40b92 port docs over to 0.6 and a bunch of misc fixes 2013-10-11 18:38:53 -07:00
fjy a9a723bd11 clean up poms, add a new loading your own data tutorial, add new validation, clean up logs 2013-10-09 15:42:39 -07: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