You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/18 11:00:22 UTC
[2/2] ignite git commit: Implemented append (2).
Implemented append (2).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3fe235eb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3fe235eb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3fe235eb
Branch: refs/heads/ignite-igfs-refactoring
Commit: 3fe235ebb14cc802caed286ea11ceeb0dc7f2e24
Parents: 88e4472
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Mar 18 13:00:08 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Mar 18 13:00:08 2016 +0300
----------------------------------------------------------------------
.../internal/processors/igfs/IgfsImpl.java | 1 -
.../processors/igfs/IgfsMetaManager.java | 25 +++-----------------
.../igfs/IgfsMetaManagerSelfTest.java | 4 ++--
3 files changed, 5 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fe235eb/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 68d3293..33260db 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
@@ -1024,7 +1024,6 @@ public final class IgfsImpl implements IgfsEx {
IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = meta.create(
path,
dirProps,
- false/*append*/,
overwrite,
cfg.getBlockSize(),
affKey,
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fe235eb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 26c008e..80fe68a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -3490,7 +3490,6 @@ public class IgfsMetaManager extends IgfsManager {
IgniteBiTuple<IgfsFileInfo, IgniteUuid> create(
final IgfsPath path,
Map<String, String> dirProps,
- final boolean append,
final boolean overwrite,
final int blockSize,
final @Nullable IgniteUuid affKey,
@@ -3538,8 +3537,7 @@ public class IgfsMetaManager extends IgfsManager {
(overwrite ? b.existingIdCnt + 1/*TRASH*/ : b.existingIdCnt);
if (lowermostExistingInfo.isDirectory()) {
- throw new IgfsPathAlreadyExistsException("Failed to "
- + (append ? "open" : "create") + " file (path points to an " +
+ throw new IgfsPathAlreadyExistsException("Failed to create file (path points to an " +
"existing directory): " + path);
}
else {
@@ -3550,24 +3548,7 @@ public class IgfsMetaManager extends IgfsManager {
final IgniteUuid lockId = lowermostExistingInfo.lockId();
- if (append) {
- if (lockId != null)
- throw fsException("Failed to open file (file is opened for writing) "
- + "[fileName=" + name + ", fileId=" + lowermostExistingInfo.id()
- + ", lockId=" + lockId + ']');
-
- IgfsFileInfo lockedInfo = invokeLock(lowermostExistingInfo.id(), false);
-
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = new T2<>(lockedInfo, parentId);
-
- tx.commit();
-
- IgfsUtils.sendEvents(igfsCtx.kernalContext(), path,
- EventType.EVT_IGFS_FILE_OPENED_WRITE);
-
- return t2;
- }
- else if (overwrite) {
+ if (overwrite) {
// Delete existing file, but fail if it is locked:
if (lockId != null)
throw fsException("Failed to overwrite file (file is opened for writing) " +
@@ -3618,7 +3599,7 @@ public class IgfsMetaManager extends IgfsManager {
// Check only the lowermost directory in the existing directory chain
// because others are already checked in #verifyPathIntegrity() above.
if (!lowermostExistingInfo.isDirectory())
- throw new IgfsParentNotDirectoryException("Failed to " + (append ? "open" : "create" )
+ throw new IgfsParentNotDirectoryException("Failed to create"
+ " file (parent element is not a directory)");
final String uppermostFileToBeCreatedName = b.components.get(b.existingIdCnt - 1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3fe235eb/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index da66162..3925150 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -140,7 +140,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
assertEmpty(mgr.directoryListing(ROOT_ID));
assertTrue(mgr.mkdirs(new IgfsPath("/dir"), IgfsImpl.DFLT_DIR_META));
- assertNotNull(mgr.create(new IgfsPath("/file"), null, false, false, 400, null, false, null));
+ assertNotNull(mgr.create(new IgfsPath("/file"), null, false, 400, null, false, null));
IgfsListingEntry dirEntry = mgr.directoryListing(ROOT_ID).get("dir");
assertNotNull(dirEntry);
@@ -212,7 +212,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
private IgfsFileInfo createFileAndGetInfo(String path) throws IgniteCheckedException {
IgfsPath p = path(path);
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = mgr.create(p, null, false, false, 400, null, false, null);
+ IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = mgr.create(p, null, false, 400, null, false, null);
assert t2 != null;
assert !t2.get1().isDirectory();