Gian Merlino
3129e5451b
Merge branch 'master' into task-stuff
2013-02-25 12:33:45 -08:00
Gian Merlino
9964e7dfe4
[maven-release-plugin] prepare for next development iteration
2013-02-25 12:24:24 -08:00
Gian Merlino
99c4f9446c
[maven-release-plugin] prepare release druid-0.3.3
2013-02-25 12:24:15 -08:00
Gian Merlino
49700dffe9
Merge branch 'master' into task-stuff
...
Conflicts:
merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java
merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.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-02-25 12:18:31 -08:00
Eric Tschetter
e0f6df1a5c
[maven-release-plugin] prepare for next development iteration
2013-02-21 20:39:50 -06:00
Eric Tschetter
846bc0e4f0
[maven-release-plugin] prepare release druid-0.3.2
2013-02-21 20:39:45 -06:00
Eric Tschetter
699aadd2b1
[maven-release-plugin] prepare for next development iteration
2013-02-21 15:50:01 -06:00
Eric Tschetter
606a2e4b01
[maven-release-plugin] prepare release druid-0.3.1
2013-02-21 15:49:55 -06:00
Eric Tschetter
f8c54a72c2
1) Changes to allow for local storage
2013-02-21 15:47:01 -06:00
Eric Tschetter
dc3459d3f9
1) Initial commit of refactorings on top of housejester's to simplify the zipping and simplify the creation of other methods of loading data
2013-02-21 15:47:01 -06:00
James Estes
d1626576c0
Working toward making it easier to add new SegmentPullers.
...
1) Move the local cacheFile logic out of the S3 pullers into the SingleSegmentLoader
2) Make the S3SegmentPuller just pull down the file
3) Make the Loader do the unzip, ungzip, or rename
4) 2 and 3 make S3ZippedSegmentPuller not necessary (still there, just deprecated and empty)
4) Tweak the TaskToolbox so that the Pullers returned by getSegmentGetters behave the same as they did before
2013-02-21 15:47:01 -06:00
Deep Ganguli
60da9ffddb
Merge branch 'master' into hadoop-index-task
...
Conflicts:
common/src/main/java/com/metamx/druid/utils/JodaUtils.java
indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java
indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java
indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java
2013-02-15 13:22:31 -08:00
Gian Merlino
824e3c0eb2
[maven-release-plugin] prepare for next development iteration
2013-02-15 13:03:39 -08:00
Gian Merlino
6bbc992101
[maven-release-plugin] prepare release druid-0.3.0
2013-02-15 13:03:32 -08:00
Nelson Ray
728e208f49
merge master
2013-02-15 11:39:22 -08:00
xvrl
05d347c304
Merge remote-tracking branch 'origin/master' into speedup-timeboundary
...
Conflicts:
client/pom.xml
common/pom.xml
druid-services/pom.xml
examples/pom.xml
examples/rand/pom.xml
examples/twitter/pom.xml
index-common/pom.xml
indexer/pom.xml
merger/pom.xml
pom.xml
realtime/pom.xml
server/pom.xml
2013-02-15 11:25:47 -08:00
Eric Tschetter
5ee7c0c264
1) Remove stray import of java.util.List
2013-02-15 12:15:53 -06:00
Gian Merlino
548c901c0b
Additional fix for columns with cardinality 0
2013-02-14 23:45:02 -08:00
Gian Merlino
3fed8ee0ce
[maven-release-plugin] prepare for next development iteration
2013-02-14 21:23:46 -08:00
Gian Merlino
ba7df5b709
[maven-release-plugin] prepare release druid-0.2.9
2013-02-14 21:23:41 -08:00
Gian Merlino
22d1f2a0c0
IndexMergerTest: Empty column test
2013-02-14 21:11:31 -08:00
Gian Merlino
152bf201ec
[maven-release-plugin] prepare for next development iteration
2013-02-14 16:27:20 -08:00
Gian Merlino
e56bc27f93
[maven-release-plugin] prepare release druid-0.2.8
2013-02-14 16:27:12 -08:00
Eric Tschetter
4f11eb5209
1) Fix alert sent from line DruidMasterBalancer:71 to not include all of the segments that a server is holding
2013-02-14 18:24:51 -06:00
Fangjin Yang
bf0d9c601d
Merge branch 'task-stuff' into indexing_refactor
...
Conflicts:
merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java
merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/KillTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
merger/src/main/java/com/metamx/druid/merger/common/task/V8toV9UpgradeTask.java
merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java
merger/src/main/java/com/metamx/druid/merger/coordinator/TaskQueue.java
merger/src/main/java/com/metamx/druid/merger/coordinator/TaskRunner.java
merger/src/main/java/com/metamx/druid/merger/coordinator/TaskRunnerWorkQueue.java
merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java
merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorServletModule.java
merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
2013-02-14 15:42:07 -08:00
Gian Merlino
18daa19fc9
Merge branch 'master' into task-stuff
...
Conflicts:
merger/src/main/java/com/metamx/druid/merger/common/TaskHolder.java
merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
merger/src/main/java/com/metamx/druid/merger/coordinator/TaskContext.java
merger/src/main/java/com/metamx/druid/merger/worker/TaskMonitor.java
merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
merger/src/test/java/com/metamx/druid/merger/coordinator/TaskQueueTest.java
server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-02-14 13:10:29 -08:00
Nelson Ray
a616f86128
add DateTime import back
2013-02-14 09:09:22 -08:00
Nelson Ray
754b065c54
merge master
2013-02-14 09:08:25 -08:00
Eric Tschetter
c5b78e75cf
1) Move up to Jackson 2.1
...
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
2013-02-13 18:51:32 -08:00
Fangjin Yang
82f02a4fe4
Merge branch 'master' into indexing_refactor
...
Conflicts:
merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
merger/src/main/java/com/metamx/druid/merger/common/task/V8toV9UpgradeTask.java
merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
2013-02-13 16:34:14 -08:00
Fangjin Yang
c7b4973700
bug fixes for RTR
2013-02-13 14:19:11 -08:00
Nelson Ray
429e23d3b2
change break to continue in BalancerCostAnalyzer to skip calculating cost when it's not necessary
2013-02-13 08:57:39 -08:00
Eric Tschetter
a0b159fed7
1) Move up to Jackson 2.1
...
2) Some bugs were fixed, but they ended up getting mixed in with the Jackson upgrade :(
2013-02-12 20:58:17 -06:00
Nelson Ray
fcbac96193
revert change to findNewSegmentHome: now return single ServerHolder
2013-02-12 10:47:30 -08:00
xvrl
07b0b4611b
bump up to 0.3.0
2013-02-12 09:52:21 -08:00
Fangjin Yang
b27a459f71
more refactoring and UT passing at this point
2013-02-11 18:13:01 -08:00
xvrl
e9f546c4ca
add default implementations to QueryToolChest methods
2013-02-11 16:51:40 -08:00
Nelson Ray
695b78b19c
make findNewSegmentHome return a priority queue so assignment can assign replicants to other servers
2013-02-11 15:28:17 -08:00
xvrl
e10025c841
filter out unneeded segments for TimeBoundary query
2013-02-11 13:21:37 -08:00
Fangjin Yang
69d0d98df6
t Merge branch 'master' into indexing_refactor
2013-02-11 12:37:20 -08:00
Fangjin Yang
a9176e738a
Merge branch 'master' into indexing_refactor
2013-02-11 12:36:49 -08:00
Nelson Ray
1b9764fffb
add binary version to datasegments for balancer test
2013-02-11 11:36:45 -08:00
Nelson Ray
e12da51057
merge master
2013-02-11 11:28:50 -08:00
cheddar
05168808c2
Merge pull request #77 from metacret/master
...
Adding LinearShardSpec and ACL on S3 object
2013-02-11 11:12:31 -08:00
Fangjin Yang
e519f82e87
[maven-release-plugin] prepare for next development iteration
2013-02-11 10:58:51 -08:00
Fangjin Yang
73f7468a23
[maven-release-plugin] prepare release druid-0.2.7
2013-02-11 10:58:43 -08:00
Fangjin Yang
07c005a0f7
Merge branch 'master' of github.com:metamx/druid
2013-02-11 10:56:39 -08:00
Fangjin Yang
ac93f752b0
fix a case where a segment may get stuck in the terminate queue
2013-02-11 10:56:30 -08:00
Fangjin Yang
111df9a90e
Merge branch 'master' into indexing_refactor
...
Conflicts:
merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java
server/src/main/java/com/metamx/druid/master/DruidMaster.java
2013-02-07 10:35:32 -08:00
xvrl
6ff42f379c
fix cut-n-paste mistake in error message
2013-02-07 10:11:36 -08:00
