ruby-hdfs-cdh4 0.0.7 → 0.0.8

data/ext/hdfs/hdfs.c

@@ -763,9 +763,15 @@ VALUE HDFS_File_System_open(int argc, VALUE* argv, VALUE self) {
  * returning the bytes read as a String.  If this fails, raises a
  * FileError.
  */ 
-VALUE HDFS_File_read(VALUE self, VALUE length) {
+VALUE HDFS_File_read(int argc, VALUE* argv, VALUE self) {
+  VALUE length;
+  rb_scan_args(argc, argv, "01", &length);
+  unsigned int hdfsLength = HDFS_DEFAULT_BUFFER_SIZE;
+  if (!NIL_P(length)) {
+    hdfsLength = NUM2UINT(length);
+  }
   // Checks whether we're reading more data than HDFS client can support.
-  if (NUM2UINT(length) > HDFS_DEFAULT_BUFFER_SIZE) {
+  if (hdfsLength > HDFS_DEFAULT_BUFFER_SIZE) {
     rb_raise(e_file_error, "Can only read a max of %u bytes from HDFS",
         HDFS_DEFAULT_BUFFER_SIZE);
     return Qnil;
@@ -775,11 +781,13 @@ VALUE HDFS_File_read(VALUE self, VALUE length) {
   ensure_file_open(data);
   char* buffer = ALLOC_N(char, length);
   MEMZERO(buffer, char, length);
-  tSize bytes_read = hdfsRead(data->fs, data->file, buffer, NUM2UINT(length));
+  tSize bytes_read = hdfsRead(data->fs, data->file, buffer, hdfsLength);
   if (bytes_read == -1) {
     rb_raise(e_file_error, "Failed to read data");
   }
-  return rb_tainted_str_new(buffer, bytes_read);
+  VALUE string_output = rb_tainted_str_new(buffer, bytes_read);
+  xfree(buffer);
+  return string_output;
 }
 
 /**
@@ -1138,7 +1146,7 @@ void Init_hdfs() {
   rb_define_method(c_file_system, "utime", HDFS_File_System_utime, -1);
 
   c_file = rb_define_class_under(m_dfs, "File", rb_cObject);
-  rb_define_method(c_file, "read", HDFS_File_read, 1);
+  rb_define_method(c_file, "read", HDFS_File_read, -1);
   rb_define_method(c_file, "write", HDFS_File_write, 1);
   rb_define_method(c_file, "<<", HDFS_File_write, 1);
   rb_define_method(c_file, "seek", HDFS_File_seek, 1);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-hdfs-cdh4
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies: []
 description: ruby hadoop libhdfs client with support for cdh4
 email:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.10
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ruby hadoop libhdfs client with support for cdh4