Repository: ignite Updated Branches: refs/heads/vozerov-perf-experimental ee363b9fc -> e8045382e
IGNITE-2836: IGFS: Ensured that metadata can be serialized through BinaryMarshaller in the most efficient way. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19b4da3d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19b4da3d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19b4da3d Branch: refs/heads/vozerov-perf-experimental Commit: 19b4da3d7ddb637c6d6440ec797e3e83d24f56b7 Parents: 865e376 Author: vozerov-gridgain <[email protected]> Authored: Mon Mar 21 10:29:20 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Mar 21 10:29:20 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/igfs/IgfsPath.java | 23 ++++++++++- .../ignite/internal/binary/BinaryContext.java | 43 ++++++++++++++++++++ .../ignite/internal/binary/BinaryUtils.java | 37 +++++++++++++++++ .../processors/igfs/IgfsDirectoryInfo.java | 27 +++++++++++- .../internal/processors/igfs/IgfsEntryInfo.java | 35 ++++++++++++++++ .../processors/igfs/IgfsFileAffinityRange.java | 32 +++++++++++++-- .../internal/processors/igfs/IgfsFileInfo.java | 37 ++++++++++++++++- .../internal/processors/igfs/IgfsFileMap.java | 41 +++++++++++++++++-- .../processors/igfs/IgfsListingEntry.java | 25 +++++++++++- .../meta/IgfsMetaDirectoryCreateProcessor.java | 38 ++++++++++++++++- .../IgfsMetaDirectoryListingAddProcessor.java | 24 ++++++++++- ...IgfsMetaDirectoryListingRemoveProcessor.java | 32 ++++++++++++++- ...gfsMetaDirectoryListingReplaceProcessor.java | 31 +++++++++++++- .../igfs/meta/IgfsMetaFileCreateProcessor.java | 39 +++++++++++++++++- .../igfs/meta/IgfsMetaFileLockProcessor.java | 29 ++++++++++++- .../meta/IgfsMetaFileRangeDeleteProcessor.java | 22 +++++++++- .../meta/IgfsMetaFileRangeUpdateProcessor.java | 24 ++++++++++- .../meta/IgfsMetaFileReserveSpaceProcessor.java | 32 ++++++++++++++- .../igfs/meta/IgfsMetaFileUnlockProcessor.java | 28 ++++++++++++- .../igfs/meta/IgfsMetaUpdatePathProcessor.java | 23 ++++++++++- .../meta/IgfsMetaUpdatePropertiesProcessor.java | 28 ++++++++++++- .../igfs/meta/IgfsMetaUpdateTimesProcessor.java | 30 +++++++++++++- 22 files changed, 653 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java index bbb4efb..f1ceb2e 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java @@ -25,6 +25,13 @@ import java.net.URI; import java.util.Arrays; import java.util.Collections; import java.util.List; + +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.util.io.GridFilenameUtils; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.A; @@ -42,7 +49,7 @@ import org.jetbrains.annotations.Nullable; * IgfsFile file = igfs.info(filePath); * </pre> */ -public final class IgfsPath implements Comparable<IgfsPath>, Externalizable { +public final class IgfsPath implements Comparable<IgfsPath>, Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -260,6 +267,20 @@ public final class IgfsPath implements Comparable<IgfsPath>, Externalizable { } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeString(path); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + path = in.readString(); + } + + /** {@inheritDoc} */ @Override public int hashCode() { return path.hashCode(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index b9b633f..c9ad1e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -60,10 +60,29 @@ import org.apache.ignite.cache.affinity.AffinityKey; import org.apache.ignite.cache.affinity.AffinityKeyMapped; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.igfs.IgfsPath; import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey; import org.apache.ignite.internal.processors.closure.GridClosureProcessor; import org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemKey; import org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey; +import org.apache.ignite.internal.processors.igfs.IgfsDirectoryInfo; +import org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange; +import org.apache.ignite.internal.processors.igfs.IgfsFileInfo; +import org.apache.ignite.internal.processors.igfs.IgfsFileMap; +import org.apache.ignite.internal.processors.igfs.IgfsListingEntry; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryCreateProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingAddProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingRemoveProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaDirectoryListingReplaceProcessor; +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.IgfsMetaFileRangeDeleteProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileRangeUpdateProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileReserveSpaceProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaFileUnlockProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaUpdatePathProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaUpdatePropertiesProcessor; +import org.apache.ignite.internal.processors.igfs.meta.IgfsMetaUpdateTimesProcessor; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.lang.GridMapEntry; import org.apache.ignite.internal.util.typedef.F; @@ -97,6 +116,30 @@ public class BinaryContext { static { Set<String> sysClss = new HashSet<>(); + // IGFS classes. + sysClss.add(IgfsPath.class.getName()); + + sysClss.add(IgfsDirectoryInfo.class.getName()); + sysClss.add(IgfsFileAffinityRange.class.getName()); + sysClss.add(IgfsFileInfo.class.getName()); + sysClss.add(IgfsFileMap.class.getName()); + sysClss.add(IgfsListingEntry.class.getName()); + + sysClss.add(IgfsMetaDirectoryCreateProcessor.class.getName()); + sysClss.add(IgfsMetaDirectoryListingAddProcessor.class.getName()); + sysClss.add(IgfsMetaDirectoryListingRemoveProcessor.class.getName()); + sysClss.add(IgfsMetaDirectoryListingReplaceProcessor.class.getName()); + sysClss.add(IgfsMetaFileCreateProcessor.class.getName()); + sysClss.add(IgfsMetaFileLockProcessor.class.getName()); + sysClss.add(IgfsMetaFileRangeDeleteProcessor.class.getName()); + sysClss.add(IgfsMetaFileRangeUpdateProcessor.class.getName()); + sysClss.add(IgfsMetaFileReserveSpaceProcessor.class.getName()); + sysClss.add(IgfsMetaFileUnlockProcessor.class.getName()); + sysClss.add(IgfsMetaUpdatePathProcessor.class.getName()); + sysClss.add(IgfsMetaUpdatePropertiesProcessor.class.getName()); + sysClss.add(IgfsMetaUpdateTimesProcessor.class.getName()); + + // Closure processor classes. sysClss.add(GridClosureProcessor.C1V2.class.getName()); sysClss.add(GridClosureProcessor.C1MLAV2.class.getName()); sysClss.add(GridClosureProcessor.C2V2.class.getName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java index 4a79f22..727501a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java @@ -51,12 +51,15 @@ import org.apache.ignite.binary.BinaryInvalidTypeException; import org.apache.ignite.binary.BinaryMapFactory; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryRawReader; +import org.apache.ignite.binary.BinaryRawWriter; import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.internal.binary.builder.BinaryLazyValue; import org.apache.ignite.internal.binary.streams.BinaryInputStream; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; @@ -1992,6 +1995,40 @@ public class BinaryUtils { } /** + * Write {@code IgniteUuid} instance. + * + * @param out Writer. + * @param val Value. + */ + public static void writeIgniteUuid(BinaryRawWriter out, @Nullable IgniteUuid val) { + if (val != null) { + out.writeBoolean(true); + + out.writeLong(val.globalId().getMostSignificantBits()); + out.writeLong(val.globalId().getLeastSignificantBits()); + out.writeLong(val.localId()); + } + else + out.writeBoolean(false); + } + + /** + * Read {@code IgniteUuid} instance. + * + * @param in Reader. + * @return Value. + */ + @Nullable public static IgniteUuid readIgniteUuid(BinaryRawReader in) { + if (in.readBoolean()) { + UUID globalId = new UUID(in.readLong(), in.readLong()); + + return new IgniteUuid(globalId, in.readLong()); + } + else + return null; + } + + /** * Enum type. */ private static class EnumType { http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java index 01c8ff9..233c8ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java @@ -17,6 +17,13 @@ package org.apache.ignite.internal.processors.igfs; +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.binary.BinaryUtils; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; @@ -33,7 +40,7 @@ import java.util.Map; /** * IGFS directory info. */ -public class IgfsDirectoryInfo extends IgfsEntryInfo { +public class IgfsDirectoryInfo extends IgfsEntryInfo implements Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -186,6 +193,24 @@ public class IgfsDirectoryInfo extends IgfsEntryInfo { } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + writeBinary(out); + + out.writeMap(listing); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + readBinary(in); + + listing = in.readMap(); + } + + /** {@inheritDoc} */ @Override public int hashCode() { return id.hashCode() ^ (props == null ? 0 : props.hashCode()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java index c5b1111..d31ef72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java @@ -17,7 +17,11 @@ package org.apache.ignite.internal.processors.igfs; +import org.apache.ignite.binary.BinaryRawReader; +import org.apache.ignite.binary.BinaryRawWriter; import org.apache.ignite.igfs.IgfsPath; +import org.apache.ignite.internal.binary.BinaryUtils; +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 org.jetbrains.annotations.Nullable; @@ -302,4 +306,35 @@ public abstract class IgfsEntryInfo implements Externalizable { modificationTime = in.readLong(); path = (IgfsPath)in.readObject(); } + + /** + * Write binary content. + * + * @param out Writer. + */ + protected void writeBinary(BinaryRawWriter out) { + BinaryUtils.writeIgniteUuid(out, id); + out.writeMap(props); + out.writeLong(accessTime); + out.writeLong(modificationTime); + out.writeObject(path); + } + + /** + * Read binary content. + * + * @param in Reader. + */ + protected void readBinary(BinaryRawReader in) { + id = BinaryUtils.readIgniteUuid(in); + props = in.readMap(); + accessTime = in.readLong(); + modificationTime = in.readLong(); + path = in.readObject(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsEntryInfo.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java index 9ac914f..953461c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java @@ -25,6 +25,14 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; + +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.binary.BinaryUtils; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; @@ -37,7 +45,7 @@ import org.jetbrains.annotations.Nullable; /** * Affinity range. */ -public class IgfsFileAffinityRange implements Message, Externalizable { +public class IgfsFileAffinityRange implements Message, Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -243,9 +251,7 @@ public class IgfsFileAffinityRange implements Message, Externalizable { /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { U.writeGridUuid(out, affKey); - out.writeInt(status); - out.writeLong(startOff); out.writeLong(endOff); } @@ -253,9 +259,27 @@ public class IgfsFileAffinityRange implements Message, Externalizable { /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { affKey = U.readGridUuid(in); - status = in.readInt(); + startOff = in.readLong(); + endOff = in.readLong(); + } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + BinaryUtils.writeIgniteUuid(out, affKey); + out.writeInt(status); + out.writeLong(startOff); + out.writeLong(endOff); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + affKey = BinaryUtils.readIgniteUuid(in); + status = in.readInt(); startOff = in.readLong(); endOff = in.readLong(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java index 30f505e..337f281 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java @@ -17,6 +17,13 @@ package org.apache.ignite.internal.processors.igfs; +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.binary.BinaryUtils; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; @@ -33,7 +40,7 @@ import java.util.Map; /** * IGFS file info. */ -public final class IgfsFileInfo extends IgfsEntryInfo { +public final class IgfsFileInfo extends IgfsEntryInfo implements Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -230,6 +237,34 @@ public final class IgfsFileInfo extends IgfsEntryInfo { } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + writeBinary(out); + + out.writeInt(blockSize); + out.writeLong(len); + BinaryUtils.writeIgniteUuid(out, lockId); + BinaryUtils.writeIgniteUuid(out, affKey); + out.writeObject(fileMap); + out.writeBoolean(evictExclude); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + readBinary(in); + + blockSize = in.readInt(); + len = in.readLong(); + lockId = BinaryUtils.readIgniteUuid(in); + affKey = BinaryUtils.readIgniteUuid(in); + fileMap = in.readObject(); + evictExclude = in.readBoolean(); + } + + /** {@inheritDoc} */ @Override public int hashCode() { return id.hashCode() ^ blockSize ^ (int)(len ^ (len >>> 32)) ^ (props == null ? 0 : props.hashCode()) ^ (lockId == null ? 0 : lockId.hashCode()); http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java index 9ea69ea..2890e2a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileMap.java @@ -24,7 +24,12 @@ import java.io.ObjectOutput; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.ignite.IgniteCheckedException; +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.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; @@ -36,12 +41,12 @@ import static org.apache.ignite.internal.processors.igfs.IgfsFileAffinityRange.R /** * Auxiliary class that is responsible for managing file affinity keys allocation by ranges. */ -public class IgfsFileMap implements Externalizable { +public class IgfsFileMap implements Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; - @GridToStringInclude /** Sorted list of ranges in ascending order. */ + @GridToStringInclude private List<IgfsFileAffinityRange> ranges; /** @@ -358,6 +363,36 @@ public class IgfsFileMap implements Externalizable { } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + if (ranges == null) + out.writeInt(-1); + else { + assert !ranges.isEmpty(); + + out.writeInt(ranges.size()); + + for (IgfsFileAffinityRange range : ranges) + out.writeObject(range); + } + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + int size = in.readInt(); + + if (size > 0) { + ranges = new ArrayList<>(size); + + for (int i = 0; i < size; i++) + ranges.add((IgfsFileAffinityRange)in.readObject()); + } + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(IgfsFileMap.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java index ea05ca3..2401656 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java @@ -17,6 +17,13 @@ package org.apache.ignite.internal.processors.igfs; +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.binary.BinaryUtils; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; @@ -30,7 +37,7 @@ import java.io.ObjectOutput; /** * Directory listing entry. */ -public class IgfsListingEntry implements Externalizable { +public class IgfsListingEntry implements Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -102,6 +109,22 @@ public class IgfsListingEntry implements Externalizable { } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + BinaryUtils.writeIgniteUuid(out, id); + out.writeBoolean(dir); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + id = BinaryUtils.readIgniteUuid(in); + dir = in.readBoolean(); + } + + /** {@inheritDoc} */ @Override public boolean equals(Object other) { return this == other || other instanceof IgfsListingEntry && F.eq(id, ((IgfsListingEntry)other).id); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryCreateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryCreateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryCreateProcessor.java index ffba042..ded66bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryCreateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryCreateProcessor.java @@ -1,8 +1,15 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.processors.igfs.IgfsUtils; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -20,7 +27,7 @@ import java.util.Map; * Directory create processor. */ public class IgfsMetaDirectoryCreateProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -114,4 +121,33 @@ public class IgfsMetaDirectoryCreateProcessor implements EntryProcessor<IgniteUu childEntry = (IgfsListingEntry)in.readObject(); } } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeLong(createTime); + out.writeMap(props); + out.writeString(childName); + + if (childName != null) + out.writeObject(childEntry); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + createTime = in.readLong(); + props = in.readMap(); + childName = in.readString(); + + if (childName != null) + childEntry = in.readObject(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaDirectoryCreateProcessor.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingAddProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingAddProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingAddProcessor.java index ab5cd5d..d45dea1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingAddProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingAddProcessor.java @@ -1,6 +1,12 @@ 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; @@ -20,7 +26,7 @@ import java.util.Map; * Update directory listing closure. */ public final class IgfsMetaDirectoryListingAddProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -86,6 +92,22 @@ public final class IgfsMetaDirectoryListingAddProcessor implements EntryProcesso } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeString(fileName); + out.writeObject(entry); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + fileName = in.readString(); + entry = in.readObject(); + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(IgfsMetaDirectoryListingAddProcessor.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java index 181a73e..d5da117 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingRemoveProcessor.java @@ -1,9 +1,16 @@ 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.binary.BinaryUtils; import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo; import org.apache.ignite.internal.processors.igfs.IgfsListingEntry; -import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -21,7 +28,7 @@ import java.util.Map; * Remove entry from directory listing. */ public class IgfsMetaDirectoryListingRemoveProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -86,4 +93,25 @@ public class IgfsMetaDirectoryListingRemoveProcessor implements EntryProcessor<I fileName = U.readString(in); fileId = U.readGridUuid(in); } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeString(fileName); + BinaryUtils.writeIgniteUuid(out, fileId); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + fileName = in.readString(); + fileId = BinaryUtils.readIgniteUuid(in); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaDirectoryListingRemoveProcessor.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java index 4c4888c..bf3c288 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaDirectoryListingReplaceProcessor.java @@ -1,8 +1,16 @@ 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.binary.BinaryUtils; 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; @@ -20,7 +28,7 @@ import java.util.Map; * Listing replace processor. */ public final class IgfsMetaDirectoryListingReplaceProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -81,4 +89,25 @@ public final class IgfsMetaDirectoryListingReplaceProcessor implements EntryProc name = U.readString(in); id = (IgniteUuid)in.readObject(); } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeString(name); + BinaryUtils.writeIgniteUuid(out, id); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + name = in.readString(); + id = BinaryUtils.readIgniteUuid(in); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaDirectoryListingReplaceProcessor.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java index a07d764..418227a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileCreateProcessor.java @@ -1,7 +1,15 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.binary.BinaryUtils; import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo; import org.apache.ignite.internal.processors.igfs.IgfsUtils; +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 org.jetbrains.annotations.Nullable; @@ -19,7 +27,7 @@ import java.util.Map; * File create processor. */ public class IgfsMetaFileCreateProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -107,4 +115,33 @@ public class IgfsMetaFileCreateProcessor implements EntryProcessor<IgniteUuid, I lockId = (IgniteUuid)in.readObject(); evictExclude = in.readBoolean(); } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeLong(createTime); + out.writeMap(props); + out.writeInt(blockSize); + BinaryUtils.writeIgniteUuid(out, affKey); + BinaryUtils.writeIgniteUuid(out, lockId); + out.writeBoolean(evictExclude); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + createTime = in.readLong(); + props = in.readMap(); + blockSize = in.readInt(); + affKey = BinaryUtils.readIgniteUuid(in); + lockId = BinaryUtils.readIgniteUuid(in); + evictExclude = in.readBoolean(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaFileCreateProcessor.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java index 43a5d7d..ff71f13 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileLockProcessor.java @@ -1,6 +1,14 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.binary.BinaryUtils; import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -16,7 +24,7 @@ import java.io.ObjectOutput; * File lock entry processor. */ public class IgfsMetaFileLockProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -60,4 +68,23 @@ public class IgfsMetaFileLockProcessor implements EntryProcessor<IgniteUuid, Igf @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { lockId = U.readGridUuid(in); } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + BinaryUtils.writeIgniteUuid(out, lockId); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + lockId = BinaryUtils.readIgniteUuid(in); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaFileLockProcessor.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeDeleteProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeDeleteProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeDeleteProcessor.java index 5af09e5..cdf07d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeDeleteProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeDeleteProcessor.java @@ -1,5 +1,11 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.IgfsFileAffinityRange; import org.apache.ignite.internal.processors.igfs.IgfsFileMap; @@ -18,7 +24,7 @@ import java.io.ObjectOutput; * Delete range processor. */ public class IgfsMetaFileRangeDeleteProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -68,6 +74,20 @@ public class IgfsMetaFileRangeDeleteProcessor implements EntryProcessor<IgniteUu } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeObject(range); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + range = in.readObject(); + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(IgfsMetaFileRangeDeleteProcessor.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeUpdateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeUpdateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeUpdateProcessor.java index ae886c8..e1224de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeUpdateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileRangeUpdateProcessor.java @@ -1,5 +1,11 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.IgfsFileAffinityRange; import org.apache.ignite.internal.processors.igfs.IgfsFileMap; @@ -18,7 +24,7 @@ import java.io.ObjectOutput; * Update range processor. */ public class IgfsMetaFileRangeUpdateProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -75,6 +81,22 @@ public class IgfsMetaFileRangeUpdateProcessor implements EntryProcessor<IgniteUu } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeObject(range); + out.writeInt(status); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + range = in.readObject(); + status = in.readInt(); + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(IgfsMetaFileRangeUpdateProcessor.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileReserveSpaceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileReserveSpaceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileReserveSpaceProcessor.java index 30f8e22..a54ddcc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileReserveSpaceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileReserveSpaceProcessor.java @@ -1,8 +1,15 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.IgfsFileAffinityRange; import org.apache.ignite.internal.processors.igfs.IgfsFileMap; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import javax.cache.processor.EntryProcessor; @@ -17,7 +24,7 @@ import java.io.ObjectOutput; * File reserve space entry processor. */ public class IgfsMetaFileReserveSpaceProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -38,7 +45,7 @@ public class IgfsMetaFileReserveSpaceProcessor implements EntryProcessor<IgniteU * Constructor. * * @param space Space. - * @param affRange + * @param affRange Affinity range. */ public IgfsMetaFileReserveSpaceProcessor(long space, IgfsFileAffinityRange affRange) { this.space = space; @@ -72,4 +79,25 @@ public class IgfsMetaFileReserveSpaceProcessor implements EntryProcessor<IgniteU space = in.readLong(); affRange = (IgfsFileAffinityRange)in.readObject(); } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeLong(space); + out.writeObject(affRange); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + space = in.readLong(); + affRange = in.readObject(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaFileReserveSpaceProcessor.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileUnlockProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileUnlockProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileUnlockProcessor.java index d535a1d..0d06c92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileUnlockProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaFileUnlockProcessor.java @@ -1,6 +1,13 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import javax.cache.processor.EntryProcessor; @@ -15,7 +22,7 @@ import java.io.ObjectOutput; * File unlock entry processor. */ public class IgfsMetaFileUnlockProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -57,4 +64,23 @@ public class IgfsMetaFileUnlockProcessor implements EntryProcessor<IgniteUuid, I @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { modificationTime = in.readLong(); } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeLong(modificationTime); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + modificationTime = in.readLong(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaFileUnlockProcessor.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePathProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePathProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePathProcessor.java index 32e5512..81c1806 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePathProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePathProcessor.java @@ -1,8 +1,13 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.igfs.IgfsPath; import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo; -import org.apache.ignite.internal.processors.igfs.IgfsMetaManager; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; @@ -17,7 +22,7 @@ import java.io.ObjectOutput; * Update path closure. */ public final class IgfsMetaUpdatePathProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -60,6 +65,20 @@ public final class IgfsMetaUpdatePathProcessor implements EntryProcessor<IgniteU } /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeObject(path); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + path = in.readObject(); + } + + /** {@inheritDoc} */ @Override public String toString() { return S.toString(IgfsMetaUpdatePathProcessor.class, this); } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePropertiesProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePropertiesProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePropertiesProcessor.java index a97c186..a9751c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePropertiesProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdatePropertiesProcessor.java @@ -1,7 +1,14 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.util.GridLeanMap; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; @@ -18,7 +25,7 @@ import java.util.Map; * Update properties processor. */ public class IgfsMetaUpdatePropertiesProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -75,4 +82,23 @@ public class IgfsMetaUpdatePropertiesProcessor implements EntryProcessor<IgniteU @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { props = U.readStringMap(in); } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeMap(props); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + props = in.readMap(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaUpdatePropertiesProcessor.class, this); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4da3d/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdateTimesProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdateTimesProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdateTimesProcessor.java index 8acd289..b754f19 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdateTimesProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/meta/IgfsMetaUpdateTimesProcessor.java @@ -1,6 +1,13 @@ package org.apache.ignite.internal.processors.igfs.meta; +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.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import javax.cache.processor.EntryProcessor; @@ -15,7 +22,7 @@ import java.io.ObjectOutput; * Update times entry processor. */ public class IgfsMetaUpdateTimesProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>, - Externalizable { + Externalizable, Binarylizable { /** */ private static final long serialVersionUID = 0L; @@ -65,4 +72,25 @@ public class IgfsMetaUpdateTimesProcessor implements EntryProcessor<IgniteUuid, accessTime = in.readLong(); modificationTime = in.readLong(); } + + /** {@inheritDoc} */ + @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException { + BinaryRawWriter out = writer.rawWriter(); + + out.writeLong(accessTime); + out.writeLong(modificationTime); + } + + /** {@inheritDoc} */ + @Override public void readBinary(BinaryReader reader) throws BinaryObjectException { + BinaryRawReader in = reader.rawReader(); + + accessTime = in.readLong(); + modificationTime = in.readLong(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgfsMetaUpdateTimesProcessor.class, this); + } }
