IGNITE-3294: IGFS: Created separate processor optimized for entry rename.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6625e013 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6625e013 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6625e013 Branch: refs/heads/ignite-3215 Commit: 6625e0138e4acae557972d8c3cfc49fac4ad7574 Parents: 40e6614 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Jun 14 11:36:33 2016 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Jun 14 11:36:33 2016 +0300 ---------------------------------------------------------------------- .../processors/igfs/IgfsMetaManager.java | 7 +- ...IgfsMetaDirectoryListingRenameProcessor.java | 133 +++++++++++++++++++ 2 files changed, 136 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6625e013/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 c08d6a0..39ec182 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 @@ -51,6 +51,7 @@ import org.apache.ignite.internal.processors.igfs.client.IgfsClientAbstractCalla import org.apache.ignite.internal.processors.igfs.client.meta.IgfsClientMetaIdsForPathCallable; import org.apache.ignite.internal.processors.igfs.client.meta.IgfsClientMetaInfoForPathCallable; import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryCreateProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingRenameProcessor; import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileCreateProcessor; import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileLockProcessor; import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileReserveSpaceProcessor; @@ -1740,10 +1741,8 @@ public class IgfsMetaManager extends IgfsManager { IgniteUuid destId, String destName) throws IgniteCheckedException { validTxState(true); - if (F.eq(srcId, destId)) { - id2InfoPrj.invoke(srcId, new IgfsMetaDirectoryListingRemoveProcessor(srcName, entry.fileId())); - id2InfoPrj.invoke(destId, new IgfsMetaDirectoryListingAddProcessor(destName, entry)); - } + if (F.eq(srcId, destId)) + id2InfoPrj.invoke(srcId, new IgfsMetaDirectoryListingRenameProcessor(srcName, destName)); else { Map<IgniteUuid, EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>> procMap = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/6625e013/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRenameProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRenameProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRenameProcessor.java new file mode 100644 index 0000000..6460adf --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRenameProcessor.java @@ -0,0 +1,133 @@ +/* + * 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.meta; + +import org.apache.ignite.IgniteException; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryRawReader; +import org.apache.ignite.binary.BinaryRawWriter; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.binary.Binarylizable; +import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo; +import org.apache.ignite.internal.processors.igfs.IgfsListingEntry; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteUuid; + +import javax.cache.processor.EntryProcessor; +import javax.cache.processor.EntryProcessorException; +import javax.cache.processor.MutableEntry; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.HashMap; +import java.util.Map; + +/** + * Processor to rename a single entry in a directory listing. + */ +public class IgfsMetaDirectoryListingRenameProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>, + Externalizable, Binarylizable { + /** */ + private static final long serialVersionUID = 0L; + + /** Old name. */ + private String oldName; + + /** New name. */ + private String newName; + + /** + * Constructor. + */ + public IgfsMetaDirectoryListingRenameProcessor() { + // No-op. + } + + /** + * Constructor. + * + * @param oldName Old name. + * @param newName New name. + */ + public IgfsMetaDirectoryListingRenameProcessor(String oldName, String newName) { + this.oldName = oldName; + this.newName = newName; + } + + /** {@inheritDoc} */ + @Override public Void process(MutableEntry<IgniteUuid, IgfsEntryInfo> e, Object... args) + throws EntryProcessorException { + IgfsEntryInfo fileInfo = e.getValue(); + + assert fileInfo.isDirectory(); + + Map<String, IgfsListingEntry> listing = new HashMap<>(fileInfo.listing()); + + // Modify listing in-place. + IgfsListingEntry entry = listing.remove(oldName); + + if (entry == null) + throw new IgniteException("Directory listing doesn't contain expected entry: " + oldName); + + IgfsListingEntry replacedEntry = listing.put(newName, entry); + + if (replacedEntry != null) + throw new IgniteException("Entry with new name already exists [name=" + newName + + ", entry=" + replacedEntry + ']'); + + e.setValue(fileInfo.listing(listing)); + + return null; + } + + /** {@inheritDoc} */ + @Override public void writeExternal(ObjectOutput out) throws IOException { + U.writeString(out, oldName); + U.writeString(out, newName); + } + + /** {@inheritDoc} */ + @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + oldName = U.readString(in); + newName = U.readString(in); + } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeString(oldName); + out.writeString(newName); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + oldName = in.readString(); + newName = in.readString(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaDirectoryListingRenameProcessor.class, this); + } +}