You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/04/01 14:57:47 UTC
[11/50] incubator-ignite git commit: #IGNITE-443 Fixed review notes.
#IGNITE-443 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4cf4de6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4cf4de6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4cf4de6c
Branch: refs/heads/sprint-2-ide-settings
Commit: 4cf4de6c359871e9e32f4bf8b1d7341d823f0bce
Parents: da1b89f
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Mar 31 13:04:28 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Mar 31 13:04:28 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridKernalContextImpl.java | 4 +-
.../cache/CacheConflictResolutionManager.java | 30 ++++++++++
.../cache/CacheConflictResolverManager.java | 30 ----------
.../cache/CacheOsConflictResolutionManager.java | 58 ++++++++++++++++++++
.../cache/CacheOsConflictResolverManager.java | 58 --------------------
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 2 +-
.../loadtests/hashmap/GridCacheTestContext.java | 2 +-
8 files changed, 94 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index ee82950..3bee762 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -790,8 +790,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
return (T)new GridOsCacheDrManager();
else if (cls.equals(IgniteCacheObjectProcessor.class))
return (T)new IgniteCacheObjectProcessorImpl(this);
- else if (cls.equals(CacheConflictResolverManager.class))
- return (T)new CacheOsConflictResolverManager<>();
+ else if (cls.equals(CacheConflictResolutionManager.class))
+ return (T)new CacheOsConflictResolutionManager<>();
throw new IgniteException("Unsupported component type: " + cls);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
new file mode 100644
index 0000000..6d65d82
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.internal.processors.cache.version.*;
+
+/**
+ * Conflict resolver manager.
+ */
+public interface CacheConflictResolutionManager<K, V> extends GridCacheManager<K, V> {
+ /**
+ * @return Cache conflict resolver.
+ */
+ public CacheVersionConflictResolver conflictResolver();
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java
deleted file mode 100644
index 73b98eb..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.internal.processors.cache.version.*;
-
-/**
- * Conflict resolver manager.
- */
-public interface CacheConflictResolverManager<K, V> extends GridCacheManager<K, V> {
- /**
- * @return Cache conflict resolver.
- */
- public CacheVersionConflictResolver conflictResolver();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
new file mode 100644
index 0000000..2835753
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolutionManager.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.version.*;
+
+/**
+ * OS conflict resolver manager.
+ */
+public class CacheOsConflictResolutionManager<K ,V> implements CacheConflictResolutionManager<K, V> {
+ /**
+ * @return Cache conflict resolver.
+ */
+ @Override public CacheVersionConflictResolver conflictResolver() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void start(GridCacheContext<K, V> cctx) throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void stop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStart() throws IgniteCheckedException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onKernalStop(boolean cancel) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void printMemoryStats() {
+ // No-op.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
deleted file mode 100644
index 2f6aacd..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOsConflictResolverManager.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.processors.cache.version.*;
-
-/**
- * OS conflict resolver manager.
- */
-public class CacheOsConflictResolverManager<K ,V> implements CacheConflictResolverManager<K, V> {
- /**
- * @return Cache conflict resolver.
- */
- @Override public CacheVersionConflictResolver conflictResolver() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public void start(GridCacheContext<K, V> cctx) throws IgniteCheckedException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void stop(boolean cancel) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void onKernalStop(boolean cancel) {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void printMemoryStats() {
- // No-op.
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 8f202a8..434d9e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -136,7 +136,7 @@ public class GridCacheContext<K, V> implements Externalizable {
private CacheJtaManagerAdapter jtaMgr;
/** Conflict resolver manager. */
- private CacheConflictResolverManager rslvrMgr;
+ private CacheConflictResolutionManager rslvrMgr;
/** Managers. */
private List<GridCacheManager<K, V>> mgrs = new LinkedList<>();
@@ -247,7 +247,7 @@ public class GridCacheContext<K, V> implements Externalizable {
GridCacheTtlManager ttlMgr,
GridCacheDrManager drMgr,
CacheJtaManagerAdapter jtaMgr,
- CacheConflictResolverManager<K, V> rslvrMgr
+ CacheConflictResolutionManager<K, V> rslvrMgr
) {
assert ctx != null;
assert sharedCtx != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 4b0955f..870f0d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1014,7 +1014,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
CacheDataStructuresManager dataStructuresMgr = new CacheDataStructuresManager();
GridCacheTtlManager ttlMgr = new GridCacheTtlManager();
GridCacheDrManager drMgr = ctx.createComponent(GridCacheDrManager.class);
- CacheConflictResolverManager rslvrMgr = ctx.createComponent(CacheConflictResolverManager.class);
+ CacheConflictResolutionManager rslvrMgr = ctx.createComponent(CacheConflictResolutionManager.class);
GridCacheStoreManager storeMgr = new GridCacheStoreManager(ctx, sesHolders, cfgStore, cfg);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4cf4de6c/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
index 187616e..90b6b1f 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
@@ -70,7 +70,7 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> {
new GridCacheTtlManager(),
new GridOsCacheDrManager(),
new CacheNoopJtaManager(),
- new CacheOsConflictResolverManager<K, V>()
+ new CacheOsConflictResolutionManager<K, V>()
);
}
}