Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-9679: Fix inconsistencies with libhdfs C API. Contributed by James Clampffer

This commit is contained in:
Bob Hansen 2016-02-01 07:49:41 -05:00 committed by James Clampffer
parent 166b3d49df
commit ad23cf1490
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/bindings/c/hdfs.cc
View File

@ -121,6 +121,9 @@ static int Error(const Status &stat) {
case Status::Code::kException:
ReportError(EINTR, "Exception raised");
break;
case Status::Code::kOperationCanceled:
ReportError(EINTR, "Operation canceled");
break;
default:
ReportError(ENOSYS, "Error: unrecognised code");
}
@ -147,9 +150,9 @@ bool CheckSystemAndHandle(hdfsFS fs, hdfsFile file) {
int hdfsFileIsOpenForRead(hdfsFile file) {
/* files can only be open for reads at the moment, do a quick check */
if (file) {
return true; // Update implementation when we get file writing
return 1; // Update implementation when we get file writing
}
return false;
return 0;
}
hdfsFS hdfsConnect(const char *nn, tPort port) {
@ -239,6 +242,7 @@ tSize hdfsRead(hdfsFS fs, hdfsFile file, void *buffer, tSize length) {
return (tSize)len;
}
/* 0 on success, -1 on error*/
int hdfsSeek(hdfsFS fs, hdfsFile file, tOffset desiredPos) {
if (!CheckSystemAndHandle(fs, file)) {
return -1;
@ -250,7 +254,7 @@ int hdfsSeek(hdfsFS fs, hdfsFile file, tOffset desiredPos) {
return Error(stat);
}
return (int)desired;
return 0;
}
tOffset hdfsTell(hdfsFS fs, hdfsFile file) {
@ -267,6 +271,7 @@ tOffset hdfsTell(hdfsFS fs, hdfsFile file) {
return offset;
}
/* extended API */
int hdfsCancel(hdfsFS fs, hdfsFile file) {
if (!CheckSystemAndHandle(fs, file)) {
return -1;
@ -340,10 +345,7 @@ int hdfsBuilderConfSetStr(struct hdfsBuilder *bld, const char *key,
void hdfsConfStrFree(char *val)
{
if (val)
{
free(val);
}
free(val);
}
hdfsFS hdfsBuilderConnect(struct hdfsBuilder *bld) {