Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD8BF18656 for ; Wed, 21 Oct 2015 15:58:56 +0000 (UTC) Received: (qmail 68517 invoked by uid 500); 21 Oct 2015 15:58:56 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 68488 invoked by uid 500); 21 Oct 2015 15:58:56 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 68479 invoked by uid 99); 21 Oct 2015 15:58:56 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Oct 2015 15:58:56 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 52A79C42B6 for ; Wed, 21 Oct 2015 15:58:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.781 X-Spam-Level: * X-Spam-Status: No, score=1.781 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id BmtDehvtVPlK for ; Wed, 21 Oct 2015 15:58:50 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id D78A742B60 for ; Wed, 21 Oct 2015 15:58:49 +0000 (UTC) Received: (qmail 68179 invoked by uid 99); 21 Oct 2015 15:58:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Oct 2015 15:58:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 49565E0A02; Wed, 21 Oct 2015 15:58:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ashvin@apache.org To: commits@geode.incubator.apache.org Date: Wed, 21 Oct 2015 15:58:54 -0000 Message-Id: <3a97e79d43cf46ac99786af16e229a74@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/15] incubator-geode git commit: GEODE-429: Remove api for setting HdfsStore in Attributes GEODE-429: Remove api for setting HdfsStore in Attributes Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/07d55bda Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/07d55bda Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/07d55bda Branch: refs/heads/feature/GEODE-409 Commit: 07d55bda1c1c9d641ca16b3b6804994ecb53bf9d Parents: 8fb5edd Author: Ashvin Agrawal Authored: Tue Oct 20 09:28:06 2015 -0700 Committer: Ashvin Agrawal Committed: Wed Oct 21 08:55:23 2015 -0700 ---------------------------------------------------------------------- .../gemfire/cache/AttributesFactory.java | 31 -------------------- .../java/com/gemstone/gemfire/cache/Cache.java | 2 -- .../gemstone/gemfire/cache/GemFireCache.java | 10 ------- .../admin/remote/RemoteRegionAttributes.java | 2 +- .../internal/cache/xmlcache/CacheCreation.java | 6 ---- 5 files changed, 1 insertion(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/07d55bda/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java index 7acd72a..406e596 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java @@ -20,7 +20,6 @@ import com.gemstone.gemfire.GemFireIOException; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.hdfs.HDFSStore; import com.gemstone.gemfire.compression.Compressor; import com.gemstone.gemfire.internal.cache.AbstractRegion; import com.gemstone.gemfire.internal.cache.CustomEvictionAttributesImpl; @@ -456,7 +455,6 @@ public class AttributesFactory { this.regionAttributes.multicastEnabled = regionAttributes.getMulticastEnabled(); this.regionAttributes.gatewaySenderIds = new CopyOnWriteArraySet(regionAttributes.getGatewaySenderIds()); this.regionAttributes.asyncEventQueueIds = new CopyOnWriteArraySet(regionAttributes.getAsyncEventQueueIds()); - this.regionAttributes.hdfsStoreName = regionAttributes.getHDFSStoreName(); this.regionAttributes.isLockGrantor = regionAttributes.isLockGrantor(); // fix for bug 47067 if (regionAttributes instanceof UserSpecifiedRegionAttributes) { this.regionAttributes.setIndexes(((UserSpecifiedRegionAttributes) regionAttributes).getIndexes()); @@ -483,10 +481,6 @@ public class AttributesFactory { } this.regionAttributes.compressor = regionAttributes.getCompressor(); - this.regionAttributes.hdfsWriteOnly = regionAttributes.getHDFSWriteOnly(); - if (regionAttributes instanceof UserSpecifiedRegionAttributes) { - this.regionAttributes.setHasHDFSWriteOnly(((UserSpecifiedRegionAttributes) regionAttributes).hasHDFSWriteOnly()); - } this.regionAttributes.offHeap = regionAttributes.getOffHeap(); } @@ -1288,31 +1282,6 @@ public class AttributesFactory { } /** - * Sets the HDFSStore name attribute. - * This causes the region to use the {@link HDFSStore}. - * @param name the name of the HDFSstore - */ - public void setHDFSStoreName(String name) { - //TODO:HDFS throw an exception if the region is already configured for a disk store and - // vice versa - this.regionAttributes.hdfsStoreName = name; - this.regionAttributes.setHasHDFSStoreName(true); - } - - /** - * Sets the HDFS write only attribute. if the region - * is configured to be write only to HDFS, events that have - * been evicted from memory cannot be read back from HDFS. - * Events are written to HDFS in the order in which they occurred. - */ - public void setHDFSWriteOnly(boolean writeOnly) { - //TODO:HDFS throw an exception if the region is already configured for a disk store and - // vice versa - this.regionAttributes.hdfsWriteOnly = writeOnly; - this.regionAttributes.setHasHDFSWriteOnly(true); - } - - /** * Sets this region's compressor for compressing entry values. * @since 8.0 * @param compressor a compressor. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/07d55bda/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java index c6495d0..63e8041 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java @@ -16,7 +16,6 @@ import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.hdfs.HDFSStoreFactory; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.snapshot.CacheSnapshotService; import com.gemstone.gemfire.cache.util.GatewayConflictResolver; @@ -27,7 +26,6 @@ import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.cache.hdfs.HDFSStore; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/07d55bda/gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java index b948c5d..18455c7 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java @@ -18,8 +18,6 @@ import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.control.ResourceManager; -import com.gemstone.gemfire.cache.hdfs.HDFSStore; -import com.gemstone.gemfire.cache.hdfs.HDFSStoreFactory; import com.gemstone.gemfire.cache.lucene.LuceneService; import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; import com.gemstone.gemfire.distributed.DistributedSystem; @@ -259,12 +257,4 @@ public interface GemFireCache extends RegionService { * @since 8.5 */ public LuceneService getLuceneService(); - - /** - * Returns the HDFSStore by name or null if no HDFSStore is - * found. - * - * @param name the name of the HDFSStore to find. - */ - public HDFSStore findHDFSStore(String name); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/07d55bda/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteRegionAttributes.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteRegionAttributes.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteRegionAttributes.java index 0aa40a7..5c08516 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteRegionAttributes.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteRegionAttributes.java @@ -152,7 +152,7 @@ public class RemoteRegionAttributes implements RegionAttributes, this.isDiskSynchronous = attr.isDiskSynchronous(); this.gatewaySendersDescs = getDescs(attr.getGatewaySenderIds().toArray()); this.asyncEventQueueDescs = getDescs(attr.getAsyncEventQueueIds().toArray()); - this.hdfsStoreName = attr.getHDFSStoreName(); + this.hdfsStoreName = attr.getHDFSStoreName(); this.hdfsWriteOnly = attr.getHDFSWriteOnly(); this.compressorDesc = getDesc(attr.getCompressor()); this.offHeap = attr.getOffHeap(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/07d55bda/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java index e4bea7f..13eea93 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java @@ -83,7 +83,6 @@ import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.cache.hdfs.HDFSStore; import com.gemstone.gemfire.cache.hdfs.HDFSStoreFactory; import com.gemstone.gemfire.cache.hdfs.internal.HDFSIntegrationUtil; import com.gemstone.gemfire.cache.hdfs.internal.HDFSStoreCreation; @@ -1378,11 +1377,6 @@ public class CacheCreation implements InternalCache, Extensible { } @Override - public HDFSStore findHDFSStore(String storeName) { - return (HDFSStore)this.hdfsStores.get(storeName); - } - - @Override public Collection getHDFSStores() { return this.hdfsStores.values(); }