From 6a6f27eaf350dedec97245334c898441ddc917c5 Mon Sep 17 00:00:00 2001 From: orbiter Date: Sat, 16 Jul 2011 19:21:39 +0000 Subject: [PATCH] do not sort arrays again if arrays are already sorted git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7845 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- source/net/yacy/cora/storage/Array.java | 4 ++-- source/net/yacy/kelondro/index/RowCollection.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/net/yacy/cora/storage/Array.java b/source/net/yacy/cora/storage/Array.java index e9c6a4415..15a03dc2e 100644 --- a/source/net/yacy/cora/storage/Array.java +++ b/source/net/yacy/cora/storage/Array.java @@ -146,7 +146,7 @@ public class Array { job.latch.countUp(); } catch (final InterruptedException e) { } else { - sort(nextJob, threaded); + sort(nextJob, false); } } if ((s = d - c) > 1) { @@ -156,7 +156,7 @@ public class Array { job.latch.countUp(); } catch (final InterruptedException e) { } else { - sort(nextJob, threaded); + sort(nextJob, false); } } } diff --git a/source/net/yacy/kelondro/index/RowCollection.java b/source/net/yacy/kelondro/index/RowCollection.java index 417f21cc6..b766d734e 100644 --- a/source/net/yacy/kelondro/index/RowCollection.java +++ b/source/net/yacy/kelondro/index/RowCollection.java @@ -613,8 +613,9 @@ public class RowCollection implements Sortable, Iterable, } public final void sort() { + if (this.sortBound == this.chunkcount) return; // this is sorted net.yacy.cora.storage.Array.sort(this); - this.sortBound = size(); + this.sortBound = this.chunkcount; } public static class partitionthread implements Callable {