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 br...@apache.org on 2013/08/18 23:20:02 UTC
svn commit: r1515218 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response:
READDIR3Response.java READDIRPLUS3Response.java
Author: brandonli
Date: Sun Aug 18 21:20:02 2013
New Revision: 1515218
URL: http://svn.apache.org/r1515218
Log:
HDFS-5107. Merging change r1515166 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java?rev=1515218&r1=1515217&r2=1515218&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIR3Response.java Sun Aug 18 21:20:02 2013
@@ -17,12 +17,14 @@
*/
package org.apache.hadoop.nfs.nfs3.response;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.hadoop.nfs.nfs3.Nfs3FileAttributes;
import org.apache.hadoop.nfs.nfs3.Nfs3Status;
import org.apache.hadoop.oncrpc.XDR;
-import com.google.common.collect.ObjectArrays;
-
/**
* READDIR3 Response
*/
@@ -56,12 +58,11 @@ public class READDIR3Response extends NF
}
public static class DirList3 {
- final Entry3 entries[];
+ final List<Entry3> entries;
final boolean eof;
public DirList3(Entry3[] entries, boolean eof) {
- this.entries = ObjectArrays.newArray(entries, entries.length);
- System.arraycopy(this.entries, 0, entries, 0, entries.length);
+ this.entries = Collections.unmodifiableList(Arrays.asList(entries));
this.eof = eof;
}
}
@@ -102,12 +103,11 @@ public class READDIR3Response extends NF
if (getStatus() == Nfs3Status.NFS3_OK) {
xdr.writeLongAsHyper(cookieVerf);
- Entry3[] f = dirList.entries;
- for (int i = 0; i < f.length; i++) {
+ for (Entry3 e : dirList.entries) {
xdr.writeBoolean(true); // Value follows
- xdr.writeLongAsHyper(f[i].getFileId());
- xdr.writeString(f[i].getName());
- xdr.writeLongAsHyper(f[i].getCookie());
+ xdr.writeLongAsHyper(e.getFileId());
+ xdr.writeString(e.getName());
+ xdr.writeLongAsHyper(e.getCookie());
}
xdr.writeBoolean(false);
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java?rev=1515218&r1=1515217&r2=1515218&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/response/READDIRPLUS3Response.java Sun Aug 18 21:20:02 2013
@@ -17,13 +17,15 @@
*/
package org.apache.hadoop.nfs.nfs3.response;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.hadoop.nfs.nfs3.FileHandle;
import org.apache.hadoop.nfs.nfs3.Nfs3FileAttributes;
import org.apache.hadoop.nfs.nfs3.Nfs3Status;
import org.apache.hadoop.oncrpc.XDR;
-import com.google.common.collect.ObjectArrays;
-
/**
* READDIRPLUS3 Response
*/
@@ -60,16 +62,15 @@ public class READDIRPLUS3Response exten
}
public static class DirListPlus3 {
- EntryPlus3 entries[];
+ List<EntryPlus3> entries;
boolean eof;
public DirListPlus3(EntryPlus3[] entries, boolean eof) {
- this.entries = ObjectArrays.newArray(entries, entries.length);
- System.arraycopy(this.entries, 0, entries, 0, entries.length);
+ this.entries = Collections.unmodifiableList(Arrays.asList(entries));
this.eof = eof;
}
- EntryPlus3[] getEntries() {
+ List<EntryPlus3> getEntries() {
return entries;
}
@@ -101,10 +102,9 @@ public class READDIRPLUS3Response exten
if (getStatus() == Nfs3Status.NFS3_OK) {
out.writeLongAsHyper(cookieVerf);
- EntryPlus3[] f = dirListPlus.getEntries();
- for (int i = 0; i < f.length; i++) {
+ for (EntryPlus3 f : dirListPlus.getEntries()) {
out.writeBoolean(true); // next
- f[i].seralize(out);
+ f.seralize(out);
}
out.writeBoolean(false);