drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jacq...@apache.org
Subject [3/4] incubator-drill git commit: DRILL-1700: Removed incorrect assertion in memory allocation code
Date Fri, 14 Nov 2014 03:15:31 GMT
DRILL-1700: Removed incorrect assertion in memory allocation code


Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/d072f5a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/d072f5a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/d072f5a7

Branch: refs/heads/master
Commit: d072f5a7d7c1cbf5f53ddd977d2706e89062da3b
Parents: 31f2d47
Author: Parth Chandra <pchandra@maprtech.com>
Authored: Thu Nov 13 16:44:42 2014 -0800
Committer: Jacques Nadeau <jacques@apache.org>
Committed: Thu Nov 13 18:27:40 2014 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/drill/exec/memory/AtomicRemainder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d072f5a7/exec/java-exec/src/main/java/org/apache/drill/exec/memory/AtomicRemainder.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/memory/AtomicRemainder.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/memory/AtomicRemainder.java
index 56ec9ae..057cfa6 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/memory/AtomicRemainder.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/memory/AtomicRemainder.java
@@ -123,7 +123,7 @@ public class AtomicRemainder {
 //      assert outcome <= initShared;
       if (outcome < 0) {
         long newAvailableShared = availableShared.addAndGet(size);
-        assert newAvailableShared <= initShared;
+        // assert newAvailableShared <= initShared;
         if (parent != null) {
           parent.returnAllocation(size);
         }


Mime
View raw message