svn commit: r642551 - in /incubator/pig/trunk: CHANGES.txt src/org/apache/pig/impl/util/SpillableMemoryManager.java

[olga]

Author: olga
Date: Sat Mar 29 08:52:39 2008
New Revision: 642551

URL: http://svn.apache.org/viewvc?rev=642551&view=rev
Log:
PIG-170: sort of spillable bags

Modified:
    incubator/pig/trunk/CHANGES.txt
    incubator/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java

Modified: incubator/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=642551&r1=642550&r2=642551&view=diff
==============================================================================
--- incubator/pig/trunk/CHANGES.txt (original)
+++ incubator/pig/trunk/CHANGES.txt Sat Mar 29 08:52:39 2008
@@ -189,4 +189,6 @@
        reduce, but instead only do it once in the call to configure.  (joa23 
via
        gates).
 
-    PIG-172: dealing with NULL error messages in exceptions
+    PIG-172: dealing with NULL error messages in exceptions (olgan)
+
+    PIG-170: sort bags so that largest ones are released first

Modified: 
incubator/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java?rev=642551&r1=642550&r2=642551&view=diff
==============================================================================
--- 
incubator/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java 
(original)
+++ 
incubator/pig/trunk/src/org/apache/pig/impl/util/SpillableMemoryManager.java 
Sat Mar 29 08:52:39 2008
@@ -96,10 +96,10 @@
                         return 0;
                     }
                     if (o1 == null) {
-                        return -1;
+                        return 1;
                     }
                     if (o2 == null) {
-                        return 1;
+                        return -1;
                     }
                     long o1Size = o1.getMemorySize();
                     long o2Size = o2.getMemorySize();
@@ -108,9 +108,9 @@
                         return 0;
                     }
                     if (o1Size < o2Size) {
-                        return -1;
+                        return 1;
                     }
-                    return 1;
+                    return -1;
                 }
             });
             long estimatedFreed = 0;