Author: vinayakumarb
Date: Thu Apr 17 14:07:42 2014
New Revision: 1588262
URL: http://svn.apache.org/r1588262
Log:
Merge r1588258 from trunk, HDFS-6153. Document "fileId" and "childrenNum"
fields in the FileStatus Json schema
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project:r1588258
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1588258
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1588262&r1=1588261&r2=1588262&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Apr 17 14:07:42 2014
@@ -109,6 +109,9 @@ Release 2.5.0 - UNRELEASED
HDFS-4909. Avoid protocol buffer RPC namespace clashes. (cmccabe)
+ HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus
Json schema
+ (Akira Ajisaka via vinayakumarb)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm?rev=1588262&r1=1588261&r2=1588262&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
Thu Apr 17 14:07:42 2014
@@ -482,6 +482,8 @@ Transfer-Encoding: chunked
{
"accessTime" : 0,
"blockSize" : 0,
+ "childrenNum" : 1,
+ "fileId" : 16386,
"group" : "supergroup",
"length" : 0, //in bytes, zero for directories
"modificationTime": 1320173277227,
@@ -523,6 +525,8 @@ Content-Length: 427
{
"accessTime" : 1320171722771,
"blockSize" : 33554432,
+ "childrenNum" : 0,
+ "fileId" : 16387,
"group" : "supergroup",
"length" : 24930,
"modificationTime": 1320171722771,
@@ -535,6 +539,8 @@ Content-Length: 427
{
"accessTime" : 0,
"blockSize" : 0,
+ "childrenNum" : 2,
+ "fileId" : 16388,
"group" : "supergroup",
"length" : 0,
"modificationTime": 1320895981256,
@@ -1331,6 +1337,18 @@ var fileStatusProperties =
"type" : "integer",
"required" : true
},
+ "childrenNum":
+ {
+ "description": "The number of children.",
+ "type" : "integer",
+ "required" : true
+ },
+ "fileId":
+ {
+ "description": "The inode ID.",
+ "type" : "integer",
+ "required" : true
+ },
"group":
{
"description": "The group owner.",
