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/06/05 14:42:49 UTC
[4/7] ignite git commit: WIP.
WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed305c4b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed305c4b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed305c4b
Branch: refs/heads/ignite-3246
Commit: ed305c4bc54f8299409b5ecf4b84a65474eb3021
Parents: 79644c1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Sun Jun 5 17:31:29 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Sun Jun 5 17:31:29 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteKernal.java | 6 +++---
.../internal/processors/igfs/IgfsNodePredicate.java | 15 +++++++++++----
2 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed305c4b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index d257807..d1f3ef5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -862,9 +862,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
startProcessor(new DataStreamProcessor(ctx));
startProcessor((GridProcessor)IGFS.create(ctx, F.isEmpty(cfg.getFileSystemConfiguration())));
startProcessor(new GridContinuousProcessor(ctx));
-// startProcessor((GridProcessor)(cfg.isPeerClassLoadingEnabled() ?
-// IgniteComponentType.HADOOP.create(ctx, true): // No-op when peer class loading is enabled.
-// IgniteComponentType.HADOOP.createIfInClassPath(ctx, cfg.getHadoopConfiguration() != null)));
+ startProcessor((GridProcessor)(cfg.isPeerClassLoadingEnabled() ?
+ IgniteComponentType.HADOOP.create(ctx, true): // No-op when peer class loading is enabled.
+ IgniteComponentType.HADOOP.createIfInClassPath(ctx, cfg.getHadoopConfiguration() != null)));
startProcessor(new DataStructuresProcessor(ctx));
startProcessor(createComponent(PlatformProcessor.class, ctx));
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed305c4b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNodePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNodePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNodePredicate.java
index aa5b2a8..e3a658a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNodePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNodePredicate.java
@@ -18,6 +18,8 @@
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;
@@ -57,16 +59,21 @@ public class IgfsNodePredicate implements IgnitePredicate<ClusterNode>, Binaryli
return IgfsUtils.isIgfsNode(node, igfsName);
}
- @Override
- public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
+ /** {@inheritDoc} */
+ @Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
+ BinaryRawWriter rawWriter = writer.rawWriter();
+ rawWriter.writeString(igfsName);
}
- @Override
- public void readBinary(BinaryReader reader) throws BinaryObjectException {
+ /** {@inheritDoc} */
+ @Override public void readBinary(BinaryReader reader) throws BinaryObjectException {
+ BinaryRawReader rawReader = reader.rawReader();
+ igfsName = rawReader.readString();
}
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgfsNodePredicate.class, this);
}