From c6ba44468e88a3b5b716133f2b7ee8fa3a131138 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Mon, 23 Jan 2012 00:45:32 +0100 Subject: [PATCH] timeout = 5000 instead 3000 --- .../yacy/kelondro/rwi/ReferenceContainerArray.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java b/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java index ce3f77a6e..174b02cf2 100644 --- a/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java +++ b/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java @@ -44,6 +44,8 @@ import net.yacy.kelondro.logging.Log; public final class ReferenceContainerArray { + private final static long METHOD_MAXRUNTIME = 5000L; + protected final ReferenceFactory factory; protected final ArrayStack array; @@ -295,21 +297,21 @@ public final class ReferenceContainerArray { * @throws RowSpaceExceededException */ public ReferenceContainer get(final byte[] termHash) throws IOException, RowSpaceExceededException { - final long timeout = System.currentTimeMillis() + 3000; + final long timeout = System.currentTimeMillis() + METHOD_MAXRUNTIME; final Iterator entries = this.array.getAll(termHash).iterator(); if (entries == null || !entries.hasNext()) return null; final byte[] a = entries.next(); int k = 1; ReferenceContainer c = new ReferenceContainer(this.factory, termHash, RowSet.importRowSet(a, this.factory.getRow())); if (System.currentTimeMillis() > timeout) { - Log.logWarning("ReferenceContainerArray", "timout in index retrieval (1): " + k + " tables searched. timeout = 3000"); + Log.logWarning("ReferenceContainerArray", "timout in get() (1): " + k + " tables searched. timeout = " + METHOD_MAXRUNTIME); return c; } while (entries.hasNext()) { c = c.merge(new ReferenceContainer(this.factory, termHash, RowSet.importRowSet(entries.next(), this.factory.getRow()))); k++; if (System.currentTimeMillis() > timeout) { - Log.logWarning("ReferenceContainerArray", "timout in index retrieval (2): " + k + " tables searched. timeout = 3000"); + Log.logWarning("ReferenceContainerArray", "timout in get() (2): " + k + " tables searched. timeout = " + METHOD_MAXRUNTIME); return c; } } @@ -317,7 +319,7 @@ public final class ReferenceContainerArray { } public int count(final byte[] termHash) throws IOException { - final long timeout = System.currentTimeMillis() + 3000; + final long timeout = System.currentTimeMillis() + METHOD_MAXRUNTIME; final Iterator entries = this.array.lengthAll(termHash).iterator(); if (entries == null || !entries.hasNext()) return 0; final Long a = entries.next(); @@ -325,7 +327,7 @@ public final class ReferenceContainerArray { int c = RowSet.importRowCount(a, this.factory.getRow()); assert c >= 0; if (System.currentTimeMillis() > timeout) { - Log.logWarning("ReferenceContainerArray", "timout in index retrieval (1): " + k + " tables searched. timeout = 3000"); + Log.logWarning("ReferenceContainerArray", "timout in count() (1): " + k + " tables searched. timeout = " + METHOD_MAXRUNTIME); return c; } while (entries.hasNext()) { @@ -333,7 +335,7 @@ public final class ReferenceContainerArray { assert c >= 0; k++; if (System.currentTimeMillis() > timeout) { - Log.logWarning("ReferenceContainerArray", "timout in index retrieval (2): " + k + " tables searched. timeout = 3000"); + Log.logWarning("ReferenceContainerArray", "timout in count() (2): " + k + " tables searched. timeout = " + METHOD_MAXRUNTIME); return c; } }