You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/09/12 08:26:45 UTC
[31/46] ignite git commit: IGNITE-3851 IGFS: Support direct PROXY
mode invocation in method: exists. This closes #1039.
IGNITE-3851 IGFS: Support direct PROXY mode invocation in method: exists. This closes #1039.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88d027d2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88d027d2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88d027d2
Branch: refs/heads/master
Commit: 88d027d280ba437a69d8100db1e0e6a5f034188c
Parents: 2703648
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Wed Sep 7 17:20:25 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 17:20:25 2016 +0300
----------------------------------------------------------------------
.../internal/processors/igfs/IgfsImpl.java | 25 +++++++++------
.../igfs/IgfsAbstractBaseSelfTest.java | 7 ++---
.../processors/igfs/IgfsProxySelfTest.java | 32 ++++++++++++++++++++
3 files changed, 51 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/88d027d2/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index 3b25c82..642352e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -236,7 +236,17 @@ public final class IgfsImpl implements IgfsEx {
modes = new ArrayList<>(cfgModes.size());
for (Map.Entry<String, IgfsMode> mode : cfgModes.entrySet()) {
- IgfsMode mode0 = secondaryFs == null ? mode.getValue() == PROXY ? PROXY : PRIMARY : mode.getValue();
+ IgfsMode mode0;
+
+ if (mode.getValue() == PROXY) {
+ if (secondaryFs == null)
+ throw new IgniteCheckedException("Mode cannot be PROXY if secondary file system hasn't" +
+ " been defined: " + mode.getKey());
+
+ mode0 = PROXY;
+ }
+ else
+ mode0 = secondaryFs == null ? PRIMARY : mode.getValue();
try {
modes.add(new T2<>(new IgfsPath(mode.getKey()), mode0));
@@ -539,8 +549,10 @@ public final class IgfsImpl implements IgfsEx {
break;
- default:
- assert false : "Unknown mode.";
+ case PROXY:
+ res = secondaryFs.exists(path);
+
+ break;
}
return res;
@@ -1741,12 +1753,7 @@ public final class IgfsImpl implements IgfsEx {
* @return Mode.
*/
private IgfsMode resolveMode(IgfsPath path) {
- IgfsMode mode = modeRslvr.resolveMode(path);
-
- if (mode == PROXY)
- throw new IgfsInvalidPathException("PROXY mode cannot be used in IGFS directly: " + path);
-
- return mode;
+ return modeRslvr.resolveMode(path);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/88d027d2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
index 9575bd0..03f24a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
@@ -64,8 +64,9 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
+import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
-import static org.apache.ignite.igfs.IgfsMode.PROXY;
/**
* Test fo regular igfs operations.
@@ -205,12 +206,10 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
* @param memoryMode Memory mode.
*/
protected IgfsAbstractBaseSelfTest(IgfsMode mode, CacheMemoryMode memoryMode) {
- assert mode != null && mode != PROXY;
-
this.mode = mode;
this.memoryMode = memoryMode;
- dual = mode != PRIMARY;
+ dual = (mode == DUAL_SYNC || mode == DUAL_ASYNC);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/88d027d2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java
new file mode 100644
index 0000000..3b8c606
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProxySelfTest.java
@@ -0,0 +1,32 @@
+/*
+ * 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.igfs;
+
+import static org.apache.ignite.igfs.IgfsMode.PROXY;
+
+/**
+ * Tests for PRIMARY mode.
+ */
+public class IgfsProxySelfTest extends IgfsAbstractSelfTest {
+ /**
+ * Constructor.
+ */
+ public IgfsProxySelfTest() {
+ super(PROXY);
+ }
+}
\ No newline at end of file