IGNITE-3294: Deletes are also use only single invoke.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/14cbd122 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/14cbd122 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/14cbd122 Branch: refs/heads/ignite-3294 Commit: 14cbd12298e1b40e6e369e60a24f17355a4bf010 Parents: 4cff170 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Jun 10 18:53:49 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Jun 10 18:53:49 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/igfs/IgfsMetaManager.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/14cbd122/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 7439c28..61713c3 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 @@ -1201,8 +1201,8 @@ public class IgfsMetaManager extends IgfsManager { * @return ID of an entry located directly under the trash directory. * @throws IgniteCheckedException If failed. */ - IgfsDeleteResult softDelete(final IgfsPath path, final boolean recursive, @Nullable IgfsSecondaryFileSystem secondaryFs) - throws IgniteCheckedException { + IgfsDeleteResult softDelete(final IgfsPath path, final boolean recursive, + @Nullable IgfsSecondaryFileSystem secondaryFs) throws IgniteCheckedException { while (true) { if (busyLock.enterBusy()) { try { @@ -1740,8 +1740,12 @@ public class IgfsMetaManager extends IgfsManager { IgniteUuid destId, String destName) throws IgniteCheckedException { validTxState(true); - id2InfoPrj.invoke(srcId, new IgfsMetaDirectoryListingRemoveProcessor(srcName, entry.fileId())); - id2InfoPrj.invoke(destId, new IgfsMetaDirectoryListingAddProcessor(destName, entry)); + Map<IgniteUuid, EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>> procMap = new HashMap<>(); + + procMap.put(srcId, new IgfsMetaDirectoryListingRemoveProcessor(srcName, entry.fileId())); + procMap.put(destId, new IgfsMetaDirectoryListingAddProcessor(destName, entry)); + + id2InfoPrj.invokeAll(procMap); } /**
