GEODE-10: Rename Write only method Absorb review comment, rename WriteOnlyFileSizeLimit to WriteOnlyFileRolloverSize to make it consistent with WriteOnlyFileRolloverInterval
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/220eb234 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/220eb234 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/220eb234 Branch: refs/heads/feature/GEODE-77 Commit: 220eb234d77de1f04585de7b82f6538f5399e1a4 Parents: 5a90bf1 Author: Ashvin Agrawal <ash...@apache.org> Authored: Wed Jul 15 15:49:30 2015 -0700 Committer: Ashvin Agrawal <ash...@apache.org> Committed: Wed Jul 15 15:49:30 2015 -0700 ---------------------------------------------------------------------- .../java/com/gemstone/gemfire/cache/hdfs/HDFSStore.java | 2 +- .../gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java | 4 ++-- .../gemstone/gemfire/cache/hdfs/HDFSStoreMutator.java | 8 ++++---- .../cache/hdfs/internal/HDFSStoreConfigHolder.java | 10 +++++----- .../gemfire/cache/hdfs/internal/HDFSStoreCreation.java | 4 ++-- .../gemfire/cache/hdfs/internal/HDFSStoreImpl.java | 4 ++-- .../cache/hdfs/internal/HDFSStoreMutatorImpl.java | 8 ++++---- .../internal/hoplog/HDFSUnsortedHoplogOrganizer.java | 4 ++-- .../gemfire/internal/cache/xmlcache/CacheXmlParser.java | 2 +- .../internal/cli/commands/HDFSStoreCommands.java | 4 ++-- .../internal/cli/functions/AlterHDFSStoreFunction.java | 2 +- .../internal/cli/functions/CreateHDFSStoreFunction.java | 2 +- .../cache/hdfs/internal/HDFSConfigJUnitTest.java | 10 +++++----- .../cache/hdfs/internal/HdfsStoreMutatorJUnitTest.java | 12 ++++++------ .../cli/commands/HDFSStoreCommandsJUnitTest.java | 2 +- .../functions/DescribeHDFSStoreFunctionJUnitTest.java | 4 ++-- 16 files changed, 41 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStore.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStore.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStore.java index 0458721..029b0e3 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStore.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStore.java @@ -195,7 +195,7 @@ public interface HDFSStore { * * @return max file size in MB. */ - public int getWriteOnlyFileSizeLimit(); + public int getWriteOnlyFileRolloverSize(); /** * For HDFS write-only regions, this defines the number of seconds that can http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java index 2684de5..c2e52af 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java @@ -55,11 +55,11 @@ public interface HDFSStoreFactory { /** * Default value {@link HDFSStore#DEFAULT_WRITE_ONLY_FILE_SIZE_LIMIT} - * @see HDFSStore#getWriteOnlyFileSizeLimit() + * @see HDFSStore#getWriteOnlyFileRolloverSize() * @exception IllegalArgumentException * if the {@code value} is less than 0 */ - public HDFSStoreFactory setWriteOnlyFileSizeLimit(int maxFileSize); + public HDFSStoreFactory setWriteOnlyFileRolloverSize(int maxFileSize); /** * Default value {@link HDFSStore#DEFAULT_WRITE_ONLY_FILE_ROLLOVER_INTERVAL} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreMutator.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreMutator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreMutator.java index ba2dc18..0c97f22 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreMutator.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreMutator.java @@ -18,17 +18,17 @@ package com.gemstone.gemfire.cache.hdfs; */ public interface HDFSStoreMutator { /** - * {@link HDFSStoreFactory#setWriteOnlyFileSizeLimit(int)} + * {@link HDFSStoreFactory#setWriteOnlyFileRolloverSize(int)} */ - public HDFSStoreMutator setWriteOnlyFileSizeLimit(int maxFileSize); + public HDFSStoreMutator setWriteOnlyFileRolloverSize(int maxFileSize); /** - * {@link HDFSStore#getWriteOnlyFileSizeLimit()} + * {@link HDFSStore#getWriteOnlyFileRolloverSize()} * * @return value to be used when mutator is executed on hdfsStore. -1 if not * set */ - public int getWriteOnlyFileSizeLimit(); + public int getWriteOnlyFileRolloverSize(); /** * {@link HDFSStoreFactory#setWriteOnlyFileRolloverInterval(int)} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreConfigHolder.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreConfigHolder.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreConfigHolder.java index 3fe37dc..019b601 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreConfigHolder.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreConfigHolder.java @@ -78,7 +78,7 @@ public class HDFSStoreConfigHolder implements HDFSStore, HDFSStoreFactory ,Seria this.homeDir = config.getHomeDir(); this.clientConfigFile = config.getHDFSClientConfigFile(); this.blockCacheSize = config.getBlockCacheSize(); - this.maxFileSize = config.getWriteOnlyFileSizeLimit(); + this.maxFileSize = config.getWriteOnlyFileRolloverSize(); this.fileRolloverInterval = config.getWriteOnlyFileRolloverInterval(); isAutoCompact = config.getMinorCompaction(); maxConcurrency = config.getMinorCompactionThreads(); @@ -133,9 +133,9 @@ public class HDFSStoreConfigHolder implements HDFSStore, HDFSStoreFactory ,Seria logAttrMutation("fileRolloverInterval", mutator.getWriteOnlyFileRolloverInterval()); setWriteOnlyFileRolloverInterval(mutator.getWriteOnlyFileRolloverInterval()); } - if (mutator.getWriteOnlyFileSizeLimit() >= 0) { + if (mutator.getWriteOnlyFileRolloverSize() >= 0) { logAttrMutation("MaxFileSize", mutator.getWriteOnlyFileRolloverInterval()); - setWriteOnlyFileSizeLimit(mutator.getWriteOnlyFileSizeLimit()); + setWriteOnlyFileRolloverSize(mutator.getWriteOnlyFileRolloverSize()); } if (mutator.getMinorCompaction() != null) { @@ -248,13 +248,13 @@ public class HDFSStoreConfigHolder implements HDFSStore, HDFSStoreFactory ,Seria } @Override - public HDFSStoreFactory setWriteOnlyFileSizeLimit(int maxFileSize) { + public HDFSStoreFactory setWriteOnlyFileRolloverSize(int maxFileSize) { assertIsPositive(CacheXml.HDFS_WRITE_ONLY_FILE_ROLLOVER_INTERVAL, maxFileSize); this.maxFileSize = maxFileSize; return this; } @Override - public int getWriteOnlyFileSizeLimit() { + public int getWriteOnlyFileRolloverSize() { return maxFileSize; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreCreation.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreCreation.java index 1d4bed8..6151982 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreCreation.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreCreation.java @@ -63,8 +63,8 @@ public class HDFSStoreCreation implements HDFSStoreFactory { } @Override - public HDFSStoreFactory setWriteOnlyFileSizeLimit(int maxFileSize) { - configHolder.setWriteOnlyFileSizeLimit(maxFileSize); + public HDFSStoreFactory setWriteOnlyFileRolloverSize(int maxFileSize) { + configHolder.setWriteOnlyFileRolloverSize(maxFileSize); return this; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreImpl.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreImpl.java index 0393118..6dca509 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreImpl.java @@ -494,8 +494,8 @@ public class HDFSStoreImpl implements HDFSStore { } @Override - public int getWriteOnlyFileSizeLimit() { - return configHolder.getWriteOnlyFileSizeLimit(); + public int getWriteOnlyFileRolloverSize() { + return configHolder.getWriteOnlyFileRolloverSize(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreMutatorImpl.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreMutatorImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreMutatorImpl.java index 074da57..3cd0006 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreMutatorImpl.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSStoreMutatorImpl.java @@ -26,13 +26,13 @@ public class HDFSStoreMutatorImpl implements HDFSStoreMutator { configHolder = new HDFSStoreConfigHolder(store); } - public HDFSStoreMutator setWriteOnlyFileSizeLimit(int maxFileSize) { - configHolder.setWriteOnlyFileSizeLimit(maxFileSize); + public HDFSStoreMutator setWriteOnlyFileRolloverSize(int maxFileSize) { + configHolder.setWriteOnlyFileRolloverSize(maxFileSize); return this; } @Override - public int getWriteOnlyFileSizeLimit() { - return configHolder.getWriteOnlyFileSizeLimit(); + public int getWriteOnlyFileRolloverSize() { + return configHolder.getWriteOnlyFileRolloverSize(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSUnsortedHoplogOrganizer.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSUnsortedHoplogOrganizer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSUnsortedHoplogOrganizer.java index bc6bda0..86f577c 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSUnsortedHoplogOrganizer.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/hoplog/HDFSUnsortedHoplogOrganizer.java @@ -159,7 +159,7 @@ public class HDFSUnsortedHoplogOrganizer extends AbstractHoplogOrganizer<Unsorte // append completed. If the file is to be rolled over, // close writer and rename the file to a legitimate name. // Else, sync the already written data with HDFS nodes. - int maxFileSize = this.store.getWriteOnlyFileSizeLimit() * 1024 * 1024; + int maxFileSize = this.store.getWriteOnlyFileRolloverSize() * 1024 * 1024; int fileRolloverInterval = this.store.getWriteOnlyFileRolloverInterval(); if (writer.getCurrentSize() >= maxFileSize || timeSinceLastFlush >= fileRolloverInterval) { @@ -196,7 +196,7 @@ public class HDFSUnsortedHoplogOrganizer extends AbstractHoplogOrganizer<Unsorte if (writerSize < (minsizeforrollover * 1024L)) return; - int maxFileSize = this.store.getWriteOnlyFileSizeLimit() * 1024 * 1024; + int maxFileSize = this.store.getWriteOnlyFileRolloverSize() * 1024 * 1024; int fileRolloverInterval = this.store.getWriteOnlyFileRolloverInterval(); if (writerSize >= maxFileSize || timeSinceLastFlush >= fileRolloverInterval || forceClose) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java index 7dd949a..9f2cbc0 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java @@ -1124,7 +1124,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler { String maxFileSize = atts.getValue(HDFS_MAX_WRITE_ONLY_FILE_SIZE); if (maxFileSize != null) { - attrs.setWriteOnlyFileSizeLimit(parseInt(maxFileSize)); + attrs.setWriteOnlyFileRolloverSize(parseInt(maxFileSize)); } String fileRolloverInterval = atts.getValue(HDFS_WRITE_ONLY_FILE_ROLLOVER_INTERVAL); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java index dc3c0c3..6e573f1 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommands.java @@ -211,7 +211,7 @@ public class HDFSStoreCommands extends AbstractCommandsSupport { if (homeDir != null) configHolder.setHomeDir(homeDir); if (maxWriteonlyFileSize != null) - configHolder.setWriteOnlyFileSizeLimit(maxWriteonlyFileSize); + configHolder.setWriteOnlyFileRolloverSize(maxWriteonlyFileSize); if (namenode != null) configHolder.setNameNodeURL(namenode); @@ -356,7 +356,7 @@ public class HDFSStoreCommands extends AbstractCommandsSupport { hdfsStoreSection.addData("Home Dir", storePrms.getHomeDir()); hdfsStoreSection.addData("Block Cache", storePrms.getBlockCacheSize()); hdfsStoreSection.addData("File RollOver Interval", storePrms.getWriteOnlyFileRolloverInterval()); - hdfsStoreSection.addData("Max WriteOnly File Size", storePrms.getWriteOnlyFileSizeLimit()); + hdfsStoreSection.addData("Max WriteOnly File Size", storePrms.getWriteOnlyFileRolloverSize()); hdfsStoreSection.addData("Client Configuration File", storePrms.getHDFSClientConfigFile()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterHDFSStoreFunction.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterHDFSStoreFunction.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterHDFSStoreFunction.java index 6b5f66c..b5b5341 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterHDFSStoreFunction.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterHDFSStoreFunction.java @@ -109,7 +109,7 @@ public class AlterHDFSStoreFunction extends FunctionAdapter implements InternalE .getFileRolloverInterval()); if (alterAttributes.getMaxWriteonlyFileSize() != null) - storeMutator.setWriteOnlyFileSizeLimit(alterAttributes.getMaxWriteonlyFileSize()); + storeMutator.setWriteOnlyFileRolloverSize(alterAttributes.getMaxWriteonlyFileSize()); if (alterAttributes.getMinorCompact() != null) storeMutator.setMinorCompaction(alterAttributes.getMinorCompact()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateHDFSStoreFunction.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateHDFSStoreFunction.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateHDFSStoreFunction.java index e079a27..0667020 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateHDFSStoreFunction.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateHDFSStoreFunction.java @@ -91,7 +91,7 @@ public class CreateHDFSStoreFunction extends FunctionAdapter implements Internal hdfsStoreFactory.setWriteOnlyFileRolloverInterval(configHolder.getWriteOnlyFileRolloverInterval()); hdfsStoreFactory.setHomeDir(configHolder.getHomeDir()); hdfsStoreFactory.setHDFSClientConfigFile(configHolder.getHDFSClientConfigFile()); - hdfsStoreFactory.setWriteOnlyFileSizeLimit(configHolder.getWriteOnlyFileSizeLimit()); + hdfsStoreFactory.setWriteOnlyFileRolloverSize(configHolder.getWriteOnlyFileRolloverSize()); hdfsStoreFactory.setMajorCompaction(configHolder.getMajorCompaction()); hdfsStoreFactory.setMajorCompactionInterval(configHolder.getMajorCompactionInterval()); hdfsStoreFactory.setMajorCompactionThreads(configHolder.getMajorCompactionThreads()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSConfigJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSConfigJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSConfigJUnitTest.java index f127afa..a1c9eb1 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSConfigJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HDFSConfigJUnitTest.java @@ -81,7 +81,7 @@ public class HDFSConfigJUnitTest extends TestCase { assertEquals(false, r1.getAttributes().getHDFSWriteOnly()); assertTrue("Mismatch in attributes, actual.getDiskStoreName: " + store.getDiskStoreName() + " and expected getDiskStoreName: null", store.getDiskStoreName()== null); assertTrue("Mismatch in attributes, actual.getFileRolloverInterval: " + store.getWriteOnlyFileRolloverInterval() + " and expected getFileRolloverInterval: 3600", store.getWriteOnlyFileRolloverInterval() == 3600); - assertTrue("Mismatch in attributes, actual.getMaxFileSize: " + store.getWriteOnlyFileSizeLimit() + " and expected getMaxFileSize: 256MB", store.getWriteOnlyFileSizeLimit() == 256); + assertTrue("Mismatch in attributes, actual.getMaxFileSize: " + store.getWriteOnlyFileRolloverSize() + " and expected getMaxFileSize: 256MB", store.getWriteOnlyFileRolloverSize() == 256); this.c.close(); @@ -121,7 +121,7 @@ public class HDFSConfigJUnitTest extends TestCase { hsf.setSynchronousDiskWrite(false); hsf.setHomeDir("/home/hemant"); hsf.setNameNodeURL("mymachine"); - hsf.setWriteOnlyFileSizeLimit(1); + hsf.setWriteOnlyFileRolloverSize(1); hsf.setWriteOnlyFileRolloverInterval(10); hsf.create("myHDFSStore"); @@ -142,7 +142,7 @@ public class HDFSConfigJUnitTest extends TestCase { assertTrue("Mismatch in attributes, actual.batchInterval: " + store.getBatchInterval() + " and expected batchsize: 50 ", store.getBatchSize()== 50); assertTrue("Mismatch in attributes, actual.isDiskSynchronous: " + store.getSynchronousDiskWrite() + " and expected isPersistent: false", store.getSynchronousDiskWrite()== false); assertTrue("Mismatch in attributes, actual.getFileRolloverInterval: " + store.getWriteOnlyFileRolloverInterval() + " and expected getFileRolloverInterval: 10", store.getWriteOnlyFileRolloverInterval() == 10); - assertTrue("Mismatch in attributes, actual.getMaxFileSize: " + store.getWriteOnlyFileSizeLimit() + " and expected getMaxFileSize: 1MB", store.getWriteOnlyFileSizeLimit() == 1); + assertTrue("Mismatch in attributes, actual.getMaxFileSize: " + store.getWriteOnlyFileRolloverSize() + " and expected getMaxFileSize: 1MB", store.getWriteOnlyFileRolloverSize() == 1); this.c.close(); } finally { this.c.close(); @@ -187,7 +187,7 @@ public class HDFSConfigJUnitTest extends TestCase { assertEquals(false, r1.getAttributes().getHDFSWriteOnly()); assertTrue("Mismatch in attributes, actual.getDiskStoreName: " + store.getDiskStoreName() + " and expected getDiskStoreName: null", store.getDiskStoreName()== null); assertTrue("Mismatch in attributes, actual.getFileRolloverInterval: " + store.getWriteOnlyFileRolloverInterval() + " and expected getFileRolloverInterval: 3600", store.getWriteOnlyFileRolloverInterval() == 3600); - assertTrue("Mismatch in attributes, actual.getMaxFileSize: " + store.getWriteOnlyFileSizeLimit() + " and expected getMaxFileSize: 256MB", store.getWriteOnlyFileSizeLimit() == 256); + assertTrue("Mismatch in attributes, actual.getMaxFileSize: " + store.getWriteOnlyFileRolloverSize() + " and expected getMaxFileSize: 256MB", store.getWriteOnlyFileRolloverSize() == 256); this.c.close(); @@ -265,7 +265,7 @@ public class HDFSConfigJUnitTest extends TestCase { assertTrue("Mismatch in attributes, actual.batchInterval: " + store.getBatchInterval() + " and expected batchsize: 50", store.getBatchInterval()== 50); assertTrue("Mismatch in attributes, actual.isDiskSynchronous: " + store.getSynchronousDiskWrite() + " and expected isDiskSynchronous: false", store.getSynchronousDiskWrite()== false); assertTrue("Mismatch in attributes, actual.getFileRolloverInterval: " + store.getWriteOnlyFileRolloverInterval() + " and expected getFileRolloverInterval: 10", store.getWriteOnlyFileRolloverInterval() == 10); - assertTrue("Mismatch in attributes, actual.getMaxFileSize: " + store.getWriteOnlyFileSizeLimit() + " and expected getMaxFileSize: 1MB", store.getWriteOnlyFileSizeLimit() == 1); + assertTrue("Mismatch in attributes, actual.getMaxFileSize: " + store.getWriteOnlyFileRolloverSize() + " and expected getMaxFileSize: 1MB", store.getWriteOnlyFileRolloverSize() == 1); this.c.close(); } finally { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HdfsStoreMutatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HdfsStoreMutatorJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HdfsStoreMutatorJUnitTest.java index 1b50345..b8cbb0d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HdfsStoreMutatorJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/hdfs/internal/HdfsStoreMutatorJUnitTest.java @@ -19,7 +19,7 @@ public class HdfsStoreMutatorJUnitTest extends BaseHoplogTestCase { public void testMutatorInitialState() { HDFSStoreMutator mutator = hdfsStore.createHdfsStoreMutator(); assertEquals(-1, mutator.getWriteOnlyFileRolloverInterval()); - assertEquals(-1, mutator.getWriteOnlyFileSizeLimit()); + assertEquals(-1, mutator.getWriteOnlyFileRolloverSize()); assertEquals(-1, mutator.getInputFileCountMax()); assertEquals(-1, mutator.getInputFileSizeMax()); @@ -47,7 +47,7 @@ public class HdfsStoreMutatorJUnitTest extends BaseHoplogTestCase { // expected } try { - mutator.setWriteOnlyFileSizeLimit(-5); + mutator.setWriteOnlyFileRolloverSize(-5); fail(); } catch (IllegalArgumentException e) { // expected @@ -122,7 +122,7 @@ public class HdfsStoreMutatorJUnitTest extends BaseHoplogTestCase { HDFSStoreMutator mutator = hdfsStore.createHdfsStoreMutator(); mutator.setWriteOnlyFileRolloverInterval(121); - mutator.setWriteOnlyFileSizeLimit(234); + mutator.setWriteOnlyFileRolloverSize(234); mutator.setInputFileCountMax(87); mutator.setInputFileSizeMax(45); @@ -140,7 +140,7 @@ public class HdfsStoreMutatorJUnitTest extends BaseHoplogTestCase { mutator.setBatchInterval(695); assertEquals(121, mutator.getWriteOnlyFileRolloverInterval()); - assertEquals(234, mutator.getWriteOnlyFileSizeLimit()); + assertEquals(234, mutator.getWriteOnlyFileRolloverSize()); assertEquals(87, mutator.getInputFileCountMax()); assertEquals(45, mutator.getInputFileSizeMax()); @@ -159,7 +159,7 @@ public class HdfsStoreMutatorJUnitTest extends BaseHoplogTestCase { // repeat the cycle once more mutator.setWriteOnlyFileRolloverInterval(14); - mutator.setWriteOnlyFileSizeLimit(56); + mutator.setWriteOnlyFileRolloverSize(56); mutator.setInputFileCountMax(93); mutator.setInputFileSizeMax(85); @@ -174,7 +174,7 @@ public class HdfsStoreMutatorJUnitTest extends BaseHoplogTestCase { mutator.setPurgeInterval(328); assertEquals(14, mutator.getWriteOnlyFileRolloverInterval()); - assertEquals(56, mutator.getWriteOnlyFileSizeLimit()); + assertEquals(56, mutator.getWriteOnlyFileRolloverSize()); assertEquals(93, mutator.getInputFileCountMax()); assertEquals(85, mutator.getInputFileSizeMax()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommandsJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommandsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommandsJUnitTest.java index 6594311..af47138 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommandsJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HDFSStoreCommandsJUnitTest.java @@ -742,7 +742,7 @@ public class HDFSStoreCommandsJUnitTest { will(returnValue(namenode)); allowing(mockStore).getHomeDir(); will(returnValue(homeDir)); - allowing(mockStore).getWriteOnlyFileSizeLimit(); + allowing(mockStore).getWriteOnlyFileRolloverSize(); will(returnValue(maxFileSize)); allowing(mockStore).getWriteOnlyFileRolloverInterval(); will(returnValue(fileRolloverInterval)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/220eb234/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeHDFSStoreFunctionJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeHDFSStoreFunctionJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeHDFSStoreFunctionJUnitTest.java index 8d7b953..f3c66b0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeHDFSStoreFunctionJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeHDFSStoreFunctionJUnitTest.java @@ -121,7 +121,7 @@ public class DescribeHDFSStoreFunctionJUnitTest { assertEquals(hdfsStoreName, hdfsStoreDetails.getName()); assertEquals("hdfs://localhost:9000", hdfsStoreDetails.getNameNodeURL()); assertEquals("testDir", hdfsStoreDetails.getHomeDir()); - assertEquals(1024, hdfsStoreDetails.getWriteOnlyFileSizeLimit()); + assertEquals(1024, hdfsStoreDetails.getWriteOnlyFileRolloverSize()); assertEquals(20, hdfsStoreDetails.getWriteOnlyFileRolloverInterval()); assertFalse(hdfsStoreDetails.getMinorCompaction()); assertEquals("0.25", Float.toString(hdfsStoreDetails.getBlockCacheSize())); @@ -293,7 +293,7 @@ public class DescribeHDFSStoreFunctionJUnitTest { will(returnValue(namenode)); oneOf(mockHdfsStore).getHomeDir(); will(returnValue(homeDir)); - oneOf(mockHdfsStore).getWriteOnlyFileSizeLimit(); + oneOf(mockHdfsStore).getWriteOnlyFileRolloverSize(); will(returnValue(maxFileSize)); oneOf(mockHdfsStore).getWriteOnlyFileRolloverInterval(); will(returnValue(fileRolloverInterval));
