Minor styling fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/417e2435 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/417e2435 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/417e2435 Branch: refs/heads/ignite-1.9 Commit: 417e243542d6902cb8279d87fc5aeb23f8d0764c Parents: ee7ae1b Author: devozerov <[email protected]> Authored: Fri Feb 17 12:54:53 2017 +0300 Committer: devozerov <[email protected]> Committed: Fri Feb 17 12:54:53 2017 +0300 ---------------------------------------------------------------------- .../processors/query/GridQueryProcessor.java | 1 - .../processors/cache/GridCacheTestEntryEx.java | 102 +++++++++---------- .../hadoop/impl/v2/HadoopV2TaskContext.java | 1 - .../hadoop/shuffle/HadoopShuffleJob.java | 1 - 4 files changed, 51 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/417e2435/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index f87db43..ee9224b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -44,7 +44,6 @@ import javax.cache.Cache; import javax.cache.CacheException; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; -import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.binary.BinaryField; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryObjectBuilder; http://git-wip-us.apache.org/repos/asf/ignite/blob/417e2435/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index a631a96..1ecc2d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -279,7 +279,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return true; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public KeyCacheObject key() { return key; } @@ -289,7 +289,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return new IgniteTxKey(key, 0); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public CacheObject rawGet() { return val; } @@ -304,7 +304,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return val != null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public CacheObject rawPut(CacheObject val, long ttl) { CacheObject old = this.val; @@ -314,14 +314,14 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return old; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public Cache.Entry wrap() { assert false; return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public Cache.Entry wrapLazyValue(boolean keepBinary) { assert false; @@ -335,19 +335,19 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Nullable @Override public CacheObject peekVisibleValue() { assert false; return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public GridCacheVersion obsoleteVersion() { return obsoleteVer; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean obsolete() { return obsoleteVer != null; } @@ -357,7 +357,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return obsoleteVer != null && !obsoleteVer.equals(exclude); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean invalidate(@Nullable GridCacheVersion curVer, GridCacheVersion newVer) throws IgniteCheckedException { assert false; @@ -365,7 +365,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean invalidate(@Nullable CacheEntryPredicate[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { assert false; @@ -373,7 +373,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer, @Nullable CacheEntryPredicate[] filter) { assert false; @@ -389,7 +389,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean isNew() { assert false; return false; } @@ -399,7 +399,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr assert false; return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public CacheObject innerGet( @Nullable GridCacheVersion ver, @Nullable IgniteInternalTx tx, @@ -416,12 +416,12 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return val; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public void clearReserveForLoad(GridCacheVersion ver) { assert false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public EntryGetResult innerGetAndReserveForLoad( boolean readSwap, boolean updateMetrics, @@ -436,7 +436,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Nullable @Override public EntryGetResult innerGetVersioned( @Nullable GridCacheVersion ver, IgniteInternalTx tx, @@ -455,12 +455,12 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public CacheObject innerReload() { return val; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public GridCacheUpdateTxResult innerSet(@Nullable IgniteInternalTx tx, UUID evtNodeId, UUID affNodeId, @@ -543,7 +543,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public GridCacheUpdateTxResult innerRemove( @Nullable IgniteInternalTx tx, UUID evtNodeId, @@ -572,7 +572,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return new GridCacheUpdateTxResult(true, old); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean clear(GridCacheVersion ver, boolean readers) throws IgniteCheckedException { if (ver == null || ver.equals(this.ver)) { val = null; @@ -583,7 +583,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, @@ -593,12 +593,12 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public void txUnlock(IgniteInternalTx tx) { assert false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean removeLock(GridCacheVersion ver) { GridCacheMvccCandidate doomed = mvcc.candidate(ver); @@ -607,7 +607,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return doomed != null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean markObsolete(GridCacheVersion ver) { if (ver == null || ver.equals(obsoleteVer)) { obsoleteVer = ver; @@ -644,19 +644,19 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public GridCacheVersion version() { return ver; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean checkSerializableReadVersion(GridCacheVersion ver) { assert false; return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean initialValue( CacheObject val, GridCacheVersion ver, @@ -672,19 +672,19 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean initialValue(KeyCacheObject key, GridCacheSwapEntry unswapped) { assert false; return false; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public GridCacheVersionedEntryEx versionedEntry(final boolean keepBinary) throws IgniteCheckedException { return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public EntryGetResult versionedValue(CacheObject val, GridCacheVersion curVer, GridCacheVersion newVer, @@ -695,22 +695,22 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean hasLockCandidate(GridCacheVersion ver) { return mvcc.hasCandidate(ver); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedByAny(GridCacheVersion... exclude) { return !mvcc.isEmpty(exclude); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedByThread() { return lockedByThread(Thread.currentThread().getId()); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedLocally(GridCacheVersion lockVer) { return mvcc.isLocallyOwned(lockVer); } @@ -721,52 +721,52 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return lockedLocally(lockVer) || lockedByThread(threadId); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedByThread(long threadId, GridCacheVersion exclude) { return mvcc.isLocallyOwnedByThread(threadId, false, exclude); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedByThread(long threadId) { return mvcc.isLocallyOwnedByThread(threadId, true); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedBy(GridCacheVersion ver) { return mvcc.isOwnedBy(ver); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedByThreadUnsafe(long threadId) { return mvcc.isLocallyOwnedByThread(threadId, true); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedByUnsafe(GridCacheVersion ver) { return mvcc.isOwnedBy(ver); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean lockedLocallyUnsafe(GridCacheVersion lockVer) { return mvcc.isLocallyOwned(lockVer); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public boolean hasLockCandidateUnsafe(GridCacheVersion ver) { return mvcc.hasCandidate(ver); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public Collection<GridCacheMvccCandidate> localCandidates(GridCacheVersion... exclude) { return mvcc.localCandidates(exclude); } - /** {@inheritDoc} */ + /** @inheritDoc */ Collection<GridCacheMvccCandidate> localCandidates(boolean reentries, GridCacheVersion... exclude) { return mvcc.localCandidates(reentries, exclude); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public Collection<GridCacheMvccCandidate> remoteMvccSnapshot(GridCacheVersion... exclude) { return mvcc.remoteCandidates(exclude); } @@ -776,7 +776,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return mvcc.localCandidate(threadId); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public GridCacheMvccCandidate candidate(GridCacheVersion ver) { return mvcc.candidate(ver); } @@ -794,19 +794,19 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return mvcc.anyOwner(); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public GridCacheMvccCandidate localOwner() { return mvcc.localOwner(); } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public CacheObject valueBytes() { assert false; return null; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public CacheObject valueBytes(GridCacheVersion ver) { assert false; @@ -818,7 +818,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return 0; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public long expireTime() { return 0; } @@ -838,12 +838,12 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr return ttl; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public long ttl() { return ttl; } - /** {@inheritDoc} */ + /** @inheritDoc */ @Override public void updateTtl(GridCacheVersion ver, long ttl) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/417e2435/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java index c23fab6..b8d4cac 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java @@ -44,7 +44,6 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.hadoop.io.BytesWritablePartiallyRawComparator; import org.apache.ignite.hadoop.io.PartiallyRawComparator; import org.apache.ignite.hadoop.io.TextPartiallyRawComparator; -import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader; import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils; import org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit; import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit; http://git-wip-us.apache.org/repos/asf/ignite/blob/417e2435/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java index 4bcc398..83dbd73 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java @@ -178,7 +178,6 @@ public class HadoopShuffleJob<T> implements AutoCloseable { this.log = log.getLogger(HadoopShuffleJob.class); this.embedded = embedded; - // No stripes for combiner. boolean stripeMappers0 = get(job.info(), SHUFFLE_MAPPER_STRIPED_OUTPUT, true); if (stripeMappers0) {
