You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/04/11 17:43:14 UTC
[1/4] hadoop git commit: HDFS-13428. RBF: Remove LinkedList From
StateStoreFileImpl.java. Contributed by BELUGA BEHR.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 c65ac673a -> 9af5823db
refs/heads/branch-2.9 0c955fe22 -> 4574bf9ed
refs/heads/branch-3.0 8433f6256 -> 670abc412
refs/heads/branch-3.1 32efc7779 -> d032112e6
HDFS-13428. RBF: Remove LinkedList From StateStoreFileImpl.java. Contributed by BELUGA BEHR.
(cherry picked from commit 6a881cd842fb4eab596a386b39670ea03536891a)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d032112e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d032112e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d032112e
Branch: refs/heads/branch-3.1
Commit: d032112e6b5f8b8eda4d113141bfb0d30d480fba
Parents: 32efc77
Author: Inigo Goiri <in...@apache.org>
Authored: Wed Apr 11 10:40:30 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed Apr 11 10:41:13 2018 -0700
----------------------------------------------------------------------
.../federation/store/driver/impl/StateStoreFileImpl.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d032112e/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
index 7d9ddc6..6b288b3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
@@ -26,9 +26,11 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys;
import org.apache.hadoop.hdfs.server.federation.store.records.BaseRecord;
import org.slf4j.Logger;
@@ -134,15 +136,16 @@ public class StateStoreFileImpl extends StateStoreFileBaseImpl {
@Override
protected List<String> getChildren(String path) {
- List<String> ret = new LinkedList<>();
File dir = new File(path);
File[] files = dir.listFiles();
- if (files != null) {
+ if (ArrayUtils.isNotEmpty(files)) {
+ List<String> ret = new ArrayList<>(files.length);
for (File file : files) {
String filename = file.getName();
ret.add(filename);
}
+ return ret;
}
- return ret;
+ return Collections.emptyList();
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/4] hadoop git commit: HDFS-13428. RBF: Remove LinkedList From
StateStoreFileImpl.java. Contributed by BELUGA BEHR.
Posted by in...@apache.org.
HDFS-13428. RBF: Remove LinkedList From StateStoreFileImpl.java. Contributed by BELUGA BEHR.
(cherry picked from commit 6a881cd842fb4eab596a386b39670ea03536891a)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/670abc41
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/670abc41
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/670abc41
Branch: refs/heads/branch-3.0
Commit: 670abc4121cfe4b92f832e6ebde515a72a49d24d
Parents: 8433f62
Author: Inigo Goiri <in...@apache.org>
Authored: Wed Apr 11 10:40:30 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed Apr 11 10:41:40 2018 -0700
----------------------------------------------------------------------
.../federation/store/driver/impl/StateStoreFileImpl.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/670abc41/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
index 7d9ddc6..6b288b3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
@@ -26,9 +26,11 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys;
import org.apache.hadoop.hdfs.server.federation.store.records.BaseRecord;
import org.slf4j.Logger;
@@ -134,15 +136,16 @@ public class StateStoreFileImpl extends StateStoreFileBaseImpl {
@Override
protected List<String> getChildren(String path) {
- List<String> ret = new LinkedList<>();
File dir = new File(path);
File[] files = dir.listFiles();
- if (files != null) {
+ if (ArrayUtils.isNotEmpty(files)) {
+ List<String> ret = new ArrayList<>(files.length);
for (File file : files) {
String filename = file.getName();
ret.add(filename);
}
+ return ret;
}
- return ret;
+ return Collections.emptyList();
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/4] hadoop git commit: HDFS-13428. RBF: Remove LinkedList From
StateStoreFileImpl.java. Contributed by BELUGA BEHR.
Posted by in...@apache.org.
HDFS-13428. RBF: Remove LinkedList From StateStoreFileImpl.java. Contributed by BELUGA BEHR.
(cherry picked from commit 6a881cd842fb4eab596a386b39670ea03536891a)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4574bf9e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4574bf9e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4574bf9e
Branch: refs/heads/branch-2.9
Commit: 4574bf9ed268e23321a4142b3407e035828f58d3
Parents: 0c955fe
Author: Inigo Goiri <in...@apache.org>
Authored: Wed Apr 11 10:40:30 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed Apr 11 10:42:36 2018 -0700
----------------------------------------------------------------------
.../federation/store/driver/impl/StateStoreFileImpl.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4574bf9e/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
index 7d9ddc6..6b288b3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
@@ -26,9 +26,11 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys;
import org.apache.hadoop.hdfs.server.federation.store.records.BaseRecord;
import org.slf4j.Logger;
@@ -134,15 +136,16 @@ public class StateStoreFileImpl extends StateStoreFileBaseImpl {
@Override
protected List<String> getChildren(String path) {
- List<String> ret = new LinkedList<>();
File dir = new File(path);
File[] files = dir.listFiles();
- if (files != null) {
+ if (ArrayUtils.isNotEmpty(files)) {
+ List<String> ret = new ArrayList<>(files.length);
for (File file : files) {
String filename = file.getName();
ret.add(filename);
}
+ return ret;
}
- return ret;
+ return Collections.emptyList();
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/4] hadoop git commit: HDFS-13428. RBF: Remove LinkedList From
StateStoreFileImpl.java. Contributed by BELUGA BEHR.
Posted by in...@apache.org.
HDFS-13428. RBF: Remove LinkedList From StateStoreFileImpl.java. Contributed by BELUGA BEHR.
(cherry picked from commit 6a881cd842fb4eab596a386b39670ea03536891a)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9af5823d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9af5823d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9af5823d
Branch: refs/heads/branch-2
Commit: 9af5823dbb3fdf5ed4fee07317740feb6df05338
Parents: c65ac67
Author: Inigo Goiri <in...@apache.org>
Authored: Wed Apr 11 10:40:30 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed Apr 11 10:42:17 2018 -0700
----------------------------------------------------------------------
.../federation/store/driver/impl/StateStoreFileImpl.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9af5823d/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
index 7d9ddc6..6b288b3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/store/driver/impl/StateStoreFileImpl.java
@@ -26,9 +26,11 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys;
import org.apache.hadoop.hdfs.server.federation.store.records.BaseRecord;
import org.slf4j.Logger;
@@ -134,15 +136,16 @@ public class StateStoreFileImpl extends StateStoreFileBaseImpl {
@Override
protected List<String> getChildren(String path) {
- List<String> ret = new LinkedList<>();
File dir = new File(path);
File[] files = dir.listFiles();
- if (files != null) {
+ if (ArrayUtils.isNotEmpty(files)) {
+ List<String> ret = new ArrayList<>(files.length);
for (File file : files) {
String filename = file.getName();
ret.add(filename);
}
+ return ret;
}
- return ret;
+ return Collections.emptyList();
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org