[PATCH 0/3] minor updates and cleanups

[PATCH 0/3] minor updates and cleanups

[Eric Wong]

3/3 is an actual bugfix, so I'll likely release 3.10.0 soon
for it.  The rest are stylistic changes.

[PATCH 1/3] admin: simplify utilization conversion

[Eric Wong]

The tracker won't send a utilization field until it has
that data.
---
 lib/mogilefs/admin.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/mogilefs/admin.rb b/lib/mogilefs/admin.rb
index 68574ca..289dea6 100644
--- a/lib/mogilefs/admin.rb
+++ b/lib/mogilefs/admin.rb
@@ -69,8 +69,7 @@ class MogileFS::Admin < MogileFS::Client
     rv = clean('devices', 'dev', rv, true, to_i, want)
 
     rv.each do |row|
-      u = row["utilization"] and
-        row["utilization"] = nil == u ? nil : u.to_f
+      u = row["utilization"] and row["utilization"] = u.to_f
 
       case row["observed_state"]
       when ""
-- 
EW

[PATCH 2/3] more idiomatic comparisons with constants

[Eric Wong]

These generates smaller bytecode than explicitly
comparing to a constant value.
---
 lib/mogilefs/bigfile/filter.rb  | 2 +-
 lib/mogilefs/new_file/stream.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/mogilefs/bigfile/filter.rb b/lib/mogilefs/bigfile/filter.rb
index e95a47e..d831312 100644
--- a/lib/mogilefs/bigfile/filter.rb
+++ b/lib/mogilefs/bigfile/filter.rb
@@ -33,7 +33,7 @@ class MogileFS::Bigfile::Filter
   end
 
   def write(buf)
-    if nil == @zi
+    unless @zi
       if @info[:compressed] &&
          INFLATABLE_TYPES.include?(@info[:type]) &&
          buf.bytesize >= 2 &&
diff --git a/lib/mogilefs/new_file/stream.rb b/lib/mogilefs/new_file/stream.rb
index a71be74..71ac591 100644
--- a/lib/mogilefs/new_file/stream.rb
+++ b/lib/mogilefs/new_file/stream.rb
@@ -42,7 +42,7 @@ class MogileFS::NewFile::Stream
 
   def write(buf)
     buf = String buf
-    return 0 if 0 == buf.size
+    return 0 if buf.empty?
     rv = @writer.write(buf)
     @bytes_uploaded += rv
     rv
-- 
EW

[PATCH 3/3] bigfile/filter: only update MD5 if non-nil

[Eric Wong]

It is possible to disable MD5 verification, so we cannot risk
updating a nil object.

Also, favor explicitly calling "update" instead of using "<<" which
YARV will attempt to optimize for Array/String receivers at the cost
of other objects (such as Digest::MD5)
---
 lib/mogilefs/bigfile/filter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mogilefs/bigfile/filter.rb b/lib/mogilefs/bigfile/filter.rb
index d831312..e3b6874 100644
--- a/lib/mogilefs/bigfile/filter.rb
+++ b/lib/mogilefs/bigfile/filter.rb
@@ -51,7 +51,7 @@ class MogileFS::Bigfile::Filter
     if @zi
       buf = @zi.inflate(buf)
     else
-      @md5 << buf
+      @md5.update(buf) if @md5
     end
     @io.write(buf)
   end
-- 
EW