From 178c26f9f7db704515e544910a0a123927796791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Mon, 16 Dec 2013 16:50:31 -0800 Subject: [PATCH] fix naming and docs --- docs/content/Configuration.md | 5 +++-- .../java/io/druid/storage/s3/S3DataSegmentArchiver.java | 3 +-- .../io/druid/storage/s3/S3DataSegmentArchiverConfig.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/content/Configuration.md b/docs/content/Configuration.md index 13a1a67a741..e317ac0ecd4 100644 --- a/docs/content/Configuration.md +++ b/docs/content/Configuration.md @@ -285,9 +285,10 @@ This deep storage is used to interface with Amazon's S3. |Property|Description|Default| |--------|-----------|-------| |`druid.storage.bucket`|S3 bucket name.|none| -|`druid.storage.basekey`|S3 base key.|none| +|`druid.storage.basekey`|S3 object key prefix for storage.|none| |`druid.storage.disableAcl`|Boolean flag for ACL.|false| -|`druid.storage.archiveBucket`|S3 bucket name where segments get archived to when running the indexing service *archive task*|none| +|`druid.storage.archiveBucket`|S3 bucket name for archiving when running the indexing-service *archive task*.|none| +|`druid.storage.archiveBasekey`|S3 object key prefix for archiving.|none| #### HDFS Deep Storage diff --git a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiver.java b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiver.java index b7c04ec0c00..1c642f110bd 100644 --- a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiver.java +++ b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiver.java @@ -21,7 +21,6 @@ package io.druid.storage.s3; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; -import com.metamx.common.MapUtils; import io.druid.segment.loading.DataSegmentArchiver; import io.druid.segment.loading.SegmentLoadingException; import io.druid.timeline.DataSegment; @@ -46,7 +45,7 @@ public class S3DataSegmentArchiver extends S3DataSegmentMover implements DataSeg public DataSegment archive(DataSegment segment) throws SegmentLoadingException { String targetS3Bucket = config.getArchiveBucket(); - String targetS3BaseKey = config.getArchiveBaseKey(); + String targetS3BaseKey = config.getArchiveBasekey(); return move( segment, diff --git a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiverConfig.java b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiverConfig.java index 5eb33eb1b5d..9aeccb74afe 100644 --- a/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiverConfig.java +++ b/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiverConfig.java @@ -27,15 +27,15 @@ public class S3DataSegmentArchiverConfig public String archiveBucket = ""; @JsonProperty - public String archiveBaseKey = ""; + public String archiveBasekey = ""; public String getArchiveBucket() { return archiveBucket; } - public String getArchiveBaseKey() + public String getArchiveBasekey() { - return archiveBaseKey; + return archiveBasekey; } }