From 892a42bafe6550cb2069850ab7f6bb1daa0969bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Wed, 18 Dec 2013 14:37:27 -0800 Subject: [PATCH 1/2] fix docs config casing --- docs/content/Configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/Configuration.md b/docs/content/Configuration.md index e317ac0ecd4..f01b5d41a0b 100644 --- a/docs/content/Configuration.md +++ b/docs/content/Configuration.md @@ -285,10 +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 object key prefix for storage.|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 for archiving when running the indexing-service *archive task*.|none| -|`druid.storage.archiveBasekey`|S3 object key prefix for archiving.|none| +|`druid.storage.archiveBaseKey`|S3 object key prefix for archiving.|none| #### HDFS Deep Storage From c8be38fe40de5351f4c2e1a2be3e6b076fff94da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Wed, 18 Dec 2013 14:57:14 -0800 Subject: [PATCH 2/2] back to baseKey --- .../java/io/druid/storage/s3/S3DataSegmentArchiver.java | 2 +- .../io/druid/storage/s3/S3DataSegmentArchiverConfig.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 1c642f110bd..0da038352f0 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 @@ -45,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 9aeccb74afe..5eb33eb1b5d 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; } }