You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/19 13:16:48 UTC
incubator-ignite git commit: # IG-980: cleanup unnecessary code.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-980 396bc28a4 -> 890742434
# IG-980: cleanup unnecessary code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/89074243
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/89074243
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/89074243
Branch: refs/heads/ignite-980
Commit: 8907424347fc9ede9ec70d2b857954b4b80be133
Parents: 396bc28
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 19 14:16:21 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 19 14:16:21 2015 +0300
----------------------------------------------------------------------
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 3 ---
.../fs/IgniteHadoopFileSystemCounterWriter.java | 1 -
.../internal/processors/hadoop/HadoopUtils.java | 14 --------------
.../processors/hadoop/fs/HadoopLazyConcurrentMap.java | 7 -------
.../ignite/igfs/HadoopIgfsDualAbstractSelfTest.java | 12 ++++++------
.../ignite/testsuites/IgniteHadoopTestSuite.java | 1 -
6 files changed, 6 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89074243/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
index 3bdd7e5..07cd1e6 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
@@ -174,9 +174,6 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
stopGrid(1);
-
- if (igfs != null)
- igfs.stop(false);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89074243/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
index cb4c445..b8a2cb5 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopFileSystemCounterWriter.java
@@ -72,7 +72,6 @@ public class IgniteHadoopFileSystemCounterWriter implements HadoopCounterWriter
try {
hadoopCfg.set(MRJobConfig.USER_NAME, user);
- // This uses Hadoop job class loader:
final FileSystem fs = HadoopUtils.fileSystemForMrUser(jobStatPath.toUri(), hadoopCfg, jobId.toString(), null);
fs.mkdirs(jobStatPath);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89074243/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java
index bf63591..9f76f55 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopUtils.java
@@ -617,20 +617,6 @@ public class HadoopUtils {
}
}
-// /**
-// * Diagnostic method.
-// */
-// public static synchronized void dump() {
-// System.out.println("DUMP: ##################### main map: " + fileSysLazyMap);
-// if (!jobFsMap.isEmpty()) {
-// System.out.println("##################### job map: " + jobFsMap.size());
-// for (Map.Entry<String, T2<HadoopLazyConcurrentMap<FsCacheKey, FileSystem>, Set<String>>> e : jobFsMap.entrySet()) {
-// T2<HadoopLazyConcurrentMap<FsCacheKey, FileSystem>, Set<String>> t2 = e.getValue();
-// System.out.println("###### job = " + e.getKey() + ", cnt = " + t2.get2() + ", map = " + t2.get1());
-// }
-// }
-// }
-
/**
* Gets the property name to disable file system cache.
* @param scheme The file system URI scheme.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89074243/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
index e693c91..d29a601 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
@@ -233,13 +233,6 @@ public class HadoopLazyConcurrentMap<K, V extends Closeable> {
public V createValue(K key);
}
-// @Override protected void finalize() throws Throwable {
-// super.finalize();
-//
-// X.print("### FINALIZE: ");
-// close();
-// }
-
@Override public String toString() {
return S.toString((Class)getClass(), this)
+ "\n, FsCount = " + createdFsCount.get()
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89074243/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java
index ed8e36d..1d5a374 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java
@@ -204,12 +204,12 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
G.stopAll(true);
-
- if (igfs != null)
- igfs.stop(false);
-
- if (igfsSecondary != null)
- igfsSecondary.stop(false);
+//
+// if (igfs != null)
+// igfs.stop(false);
+//
+// if (igfsSecondary != null)
+// igfsSecondary.stop(false);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89074243/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
index 6b69d8b..007bf5f 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java
@@ -77,7 +77,6 @@ public class IgniteHadoopTestSuite extends TestSuite {
suite.addTest(new TestSuite(ldr.loadClass(HadoopIgfsDualSyncSelfTest.class.getName())));
suite.addTest(new TestSuite(ldr.loadClass(HadoopIgfsDualAsyncSelfTest.class.getName())));
-
suite.addTest(IgfsEventsTestSuite.suiteNoarchOnly());
suite.addTest(new TestSuite(ldr.loadClass(HadoopFileSystemsTest.class.getName())));