Backport of druid-io/druid#3693

src/main/java/com/metamx/common/guava/BaseSequence.java

@@ -16,9 +16,6 @@
 
 package com.metamx.common.guava;
 
-import com.google.common.base.Throwables;
-import com.metamx.common.logger.Logger;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Iterator;
@@ -27,30 +24,9 @@
  */
 public class BaseSequence<T, IterType extends Iterator<T>> implements Sequence<T>
 {
-  private static final Logger log = new Logger(BaseSequence.class);
 
   private final IteratorMaker<T, IterType> maker;
 
-  public static <T> Sequence<T> simple(final Iterable<T> iterable)
-  {
-    return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
-        {
-          @Override
-          public Iterator<T> make()
-          {
-            return iterable.iterator();
-          }
-
-          @Override
-          public void cleanup(Iterator<T> iterFromMake)
-          {
-
-          }
-        }
-    );
-  }
-
   public BaseSequence(
       IteratorMaker<T, IterType> maker
   )
@@ -66,11 +42,18 @@ public <OutType> OutType accumulate(OutType initValue, final Accumulator<OutType
       while (iterator.hasNext()) {
         initValue = fn.accumulate(initValue, iterator.next());
       }
-      return initValue;
     }
-    finally {
-      maker.cleanup(iterator);
+    catch (Throwable t) {
+      try {
+        maker.cleanup(iterator);
+      }
+      catch (Exception e) {
+        t.addSuppressed(e);
+      }
+      throw t;
     }
+    maker.cleanup(iterator);
+    return initValue;
   }
 
   @Override
@@ -81,16 +64,14 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
     try {
       return makeYielder(initValue, accumulator, iterator);
     }
-    catch (Exception e) {
-      // We caught an Exception instead of returning a really, real, live, real boy, errr, iterator
-      // So we better try to close our stuff, 'cause the exception is what is making it out of here.
+    catch (Throwable t) {
       try {
         maker.cleanup(iterator);
       }
-      catch (RuntimeException e1) {
-        log.error(e1, "Exception thrown when closing maker.  Logging and ignoring.");
+      catch (Exception e) {
+        t.addSuppressed(e);
       }
-      throw Throwables.propagate(e);
+      throw t;
     }
   }
 
@@ -135,16 +116,14 @@ public Yielder<OutType> next(OutType initValue)
         try {
           return makeYielder(initValue, accumulator, iter);
         }
-        catch (Exception e) {
-          // We caught an Exception instead of returning a really, real, live, real boy, errr, iterator
-          // So we better try to close our stuff, 'cause the exception is what is making it out of here.
+        catch (Throwable t) {
           try {
             maker.cleanup(iter);
           }
-          catch (RuntimeException e1) {
-            log.error(e1, "Exception thrown when closing maker.  Logging and ignoring.");
+          catch (Exception e) {
+            t.addSuppressed(e);
           }
-          throw Throwables.propagate(e);
+          throw t;
         }
       }
 
@@ -162,10 +141,10 @@ public void close() throws IOException
     };
   }
 
-  public static interface IteratorMaker<T, IterType extends Iterator<T>>
+  public interface IteratorMaker<T, IterType extends Iterator<T>>
   {
-    public IterType make();
+    IterType make();
 
-    public void cleanup(IterType iterFromMake);
+    void cleanup(IterType iterFromMake);
   }
 }

src/main/java/com/metamx/common/guava/Comparators.java

@@ -16,6 +16,7 @@
 
 package com.metamx.common.guava;
 
+import com.google.common.primitives.Longs;
 import org.joda.time.DateTimeComparator;
 import org.joda.time.Interval;
 
@@ -71,6 +72,13 @@ public int compare(T t, T t1)
     @Override
     public int compare(Interval lhs, Interval rhs)
     {
+      if (lhs.getChronology().equals(rhs.getChronology())) {
+        int compare = Longs.compare(lhs.getStartMillis(), rhs.getStartMillis());
+        if (compare == 0) {
+          return Longs.compare(lhs.getEndMillis(), rhs.getEndMillis());
+        }
+        return compare;
+      }
       int retVal = dateTimeComp.compare(lhs.getStart(), rhs.getStart());
       if (retVal == 0) {
         retVal = dateTimeComp.compare(lhs.getEnd(), rhs.getEnd());
@@ -86,6 +94,13 @@ public int compare(Interval lhs, Interval rhs)
     @Override
     public int compare(Interval lhs, Interval rhs)
     {
+      if (lhs.getChronology().equals(rhs.getChronology())) {
+        int compare = Longs.compare(lhs.getEndMillis(), rhs.getEndMillis());
+        if (compare == 0) {
+          return Longs.compare(lhs.getStartMillis(), rhs.getStartMillis());
+        }
+        return compare;
+      }
       int retVal = dateTimeComp.compare(lhs.getEnd(), rhs.getEnd());
       if (retVal == 0) {
         retVal = dateTimeComp.compare(lhs.getStart(), rhs.getStart());

src/main/java/com/metamx/common/guava/ConcatSequence.java

@@ -17,8 +17,8 @@
 package com.metamx.common.guava;
 
 import com.google.common.base.Throwables;
-import com.google.common.io.Closeables;
 
+import java.io.Closeable;
 import java.io.IOException;
 
 /**
@@ -71,11 +71,14 @@ public Sequence<T> accumulate(Sequence<T> accumulated, Sequence<T> in)
     try {
       return makeYielder(yielderYielder, initValue, accumulator);
     }
-    catch (RuntimeException e) {
-      // We caught a RuntimeException instead of returning a really, real, live, real boy, errr, iterator
-      // So we better try to close our stuff, 'cause the exception is what is making it out of here.
-      CloseQuietly.close(yielderYielder);
-      throw e;
+    catch (Throwable t) {
+      try {
+        yielderYielder.close();
+      }
+      catch (Exception e) {
+        t.addSuppressed(e);
+      }
+      throw t;
     }
   }
 
@@ -85,10 +88,6 @@ public <OutType> Yielder<OutType> makeYielder(
       YieldingAccumulator<OutType, T> accumulator
   )
   {
-    if (yielderYielder.isDone()) {
-      return Yielders.done(initValue, yielderYielder);
-    }
-
     while (!yielderYielder.isDone()) {
       Yielder<OutType> yielder = yielderYielder.get().toYielder(initValue, accumulator);
       if (accumulator.yielded()) {
@@ -150,8 +149,9 @@ public boolean isDone()
       @Override
       public void close() throws IOException
       {
-        yielder.close();
-        yielderYielder.close();
+        try (Closeable toClose = yielderYielder) {
+          yielder.close();
+        }
       }
     };
   }

src/main/java/com/metamx/common/guava/ExecuteWhenDoneYielder.java

@@ -54,9 +54,10 @@ public boolean isDone()
   @Override
   public void close() throws IOException
   {
-    if (isDone()) {
+    boolean done = isDone();
+    baseYielder.close();
+    if (done) {
       executor.execute(runnable);
     }
-    baseYielder.close();
   }
 }