From 563d58442096866f0fe61a76e4136168123dff50 Mon Sep 17 00:00:00 2001 From: orbiter Date: Fri, 21 Sep 2012 11:02:36 +0200 Subject: [PATCH] removed more dependencies in cora from kelondro --- htroot/CrawlResults.java | 2 +- htroot/CrawlStartExpert_p.java | 2 +- htroot/IndexFederated_p.java | 4 +- htroot/api/schema_p.java | 2 +- htroot/gsa/searchresult.java | 2 +- htroot/solr/select.java | 2 +- source/de/anomic/server/serverObjects.java | 2 +- source/net/yacy/cora/lod/JenaTripleStore.java | 3 +- .../federated/solr/AbstractSolrConnector.java | 10 +-- .../federated/solr/GSAResponseWriter.java | 2 +- .../federated/solr/JsonResponseWriter.java | 2 +- .../federated/solr/MirrorSolrConnector.java | 2 +- .../solr/OpensearchResponseWriter.java | 2 +- .../federated/solr/ShardSelection.java | 2 +- .../federated/yacy}/ConfigurationSet.java | 21 +++--- .../services/federated/yacy}/YaCySchema.java | 6 +- .../util/LookAheadIterator.java | 46 ++++++------- source/net/yacy/cora/util/Memory.java | 67 +++++++++++++++++++ .../cora/util/SpaceExceededException.java | 10 ++- source/net/yacy/kelondro/blob/ArrayStack.java | 2 +- source/net/yacy/kelondro/blob/HeapReader.java | 2 +- source/net/yacy/kelondro/blob/MapHeap.java | 2 +- source/net/yacy/kelondro/blob/Tables.java | 2 +- .../kelondro/data/meta/URIMetadataNode.java | 2 +- .../yacy/kelondro/rwi/ReferenceIterator.java | 2 +- .../yacy/kelondro/table/ChunkIterator.java | 2 +- .../kelondro/util/StandardMemoryStrategy.java | 14 ++-- .../peers/graphics/WebStructureGraph.java | 2 +- source/net/yacy/search/index/Fulltext.java | 1 + source/net/yacy/search/index/Segment.java | 3 +- .../yacy/search/index/SolrConfiguration.java | 3 +- source/net/yacy/search/query/QueryParams.java | 2 +- 32 files changed, 144 insertions(+), 84 deletions(-) rename source/net/yacy/cora/{storage => services/federated/yacy}/ConfigurationSet.java (96%) rename source/net/yacy/{search/index => cora/services/federated/yacy}/YaCySchema.java (99%) rename source/net/yacy/{kelondro => cora}/util/LookAheadIterator.java (55%) create mode 100644 source/net/yacy/cora/util/Memory.java diff --git a/htroot/CrawlResults.java b/htroot/CrawlResults.java index 2e09e3c2c..89dc8adf4 100644 --- a/htroot/CrawlResults.java +++ b/htroot/CrawlResults.java @@ -35,12 +35,12 @@ import java.util.Map; import net.yacy.cora.document.ASCII; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadata; import net.yacy.kelondro.logging.Log; import net.yacy.peers.Seed; import net.yacy.search.Switchboard; -import net.yacy.search.index.YaCySchema; import de.anomic.crawler.ResultURLs; import de.anomic.crawler.ResultURLs.EventOrigin; import de.anomic.crawler.ResultURLs.InitExecEntry; diff --git a/htroot/CrawlStartExpert_p.java b/htroot/CrawlStartExpert_p.java index 8bde5e4e7..29194bdf1 100644 --- a/htroot/CrawlStartExpert_p.java +++ b/htroot/CrawlStartExpert_p.java @@ -25,9 +25,9 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; -import net.yacy.search.index.YaCySchema; import de.anomic.crawler.CrawlProfile; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexFederated_p.java b/htroot/IndexFederated_p.java index 5e2c5d04c..9dc97756d 100644 --- a/htroot/IndexFederated_p.java +++ b/htroot/IndexFederated_p.java @@ -34,12 +34,12 @@ import net.yacy.cora.services.federated.solr.ShardSelection; import net.yacy.cora.services.federated.solr.ShardSolrConnector; import net.yacy.cora.services.federated.solr.RemoteSolrConnector; import net.yacy.cora.services.federated.solr.SolrConnector; -import net.yacy.cora.storage.ConfigurationSet; +import net.yacy.cora.services.federated.yacy.ConfigurationSet; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.OS; import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; -import net.yacy.search.index.YaCySchema; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/schema_p.java b/htroot/api/schema_p.java index 5d79a9a5b..2f21ba6f0 100644 --- a/htroot/api/schema_p.java +++ b/htroot/api/schema_p.java @@ -23,9 +23,9 @@ */ import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.search.Switchboard; import net.yacy.search.index.SolrConfiguration; -import net.yacy.search.index.YaCySchema; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/gsa/searchresult.java b/htroot/gsa/searchresult.java index 67474770f..47308771c 100644 --- a/htroot/gsa/searchresult.java +++ b/htroot/gsa/searchresult.java @@ -31,9 +31,9 @@ import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.services.federated.solr.EmbeddedSolrConnector; import net.yacy.cora.services.federated.solr.GSAResponseWriter; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.kelondro.logging.Log; import net.yacy.search.Switchboard; -import net.yacy.search.index.YaCySchema; import net.yacy.search.query.AccessTracker; import net.yacy.search.query.SnippetProcess; diff --git a/htroot/solr/select.java b/htroot/solr/select.java index 0a22aa44b..0c0889402 100644 --- a/htroot/solr/select.java +++ b/htroot/solr/select.java @@ -35,10 +35,10 @@ import net.yacy.cora.services.federated.solr.EnhancedXMLResponseWriter; import net.yacy.cora.services.federated.solr.JsonResponseWriter; import net.yacy.cora.services.federated.solr.OpensearchResponseWriter; import net.yacy.cora.services.federated.solr.SolrServlet; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.kelondro.logging.Log; import net.yacy.search.Switchboard; import net.yacy.search.SwitchboardConstants; -import net.yacy.search.index.YaCySchema; import net.yacy.search.query.AccessTracker; import net.yacy.search.query.SnippetProcess; diff --git a/source/de/anomic/server/serverObjects.java b/source/de/anomic/server/serverObjects.java index bb49715b1..697b075bb 100644 --- a/source/de/anomic/server/serverObjects.java +++ b/source/de/anomic/server/serverObjects.java @@ -59,10 +59,10 @@ import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader.FileType; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.util.Formatter; import net.yacy.search.Switchboard; -import net.yacy.search.index.YaCySchema; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.MultiMapSolrParams; diff --git a/source/net/yacy/cora/lod/JenaTripleStore.java b/source/net/yacy/cora/lod/JenaTripleStore.java index 4e727232c..717839e8d 100644 --- a/source/net/yacy/cora/lod/JenaTripleStore.java +++ b/source/net/yacy/cora/lod/JenaTripleStore.java @@ -23,7 +23,6 @@ import net.yacy.cora.lod.vocabulary.YaCyMetadata; import net.yacy.search.Switchboard; import org.apache.log4j.Logger; -import org.mortbay.log.Log; import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; @@ -306,7 +305,7 @@ public class JenaTripleStore { } } } catch (Exception anyex) { - Log.warn(anyex); + log.warn(anyex); } } diff --git a/source/net/yacy/cora/services/federated/solr/AbstractSolrConnector.java b/source/net/yacy/cora/services/federated/solr/AbstractSolrConnector.java index f38b27fe1..b4face745 100644 --- a/source/net/yacy/cora/services/federated/solr/AbstractSolrConnector.java +++ b/source/net/yacy/cora/services/federated/solr/AbstractSolrConnector.java @@ -26,10 +26,10 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.LookAheadIterator; -import net.yacy.search.index.YaCySchema; +import net.yacy.cora.services.federated.yacy.YaCySchema; +import net.yacy.cora.util.LookAheadIterator; +import org.apache.log4j.Logger; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; @@ -37,6 +37,8 @@ import org.apache.solr.common.SolrException; public abstract class AbstractSolrConnector implements SolrConnector { + private final static Logger log = Logger.getLogger(AbstractSolrConnector.class); + public final SolrDocument POISON_DOCUMENT = new SolrDocument(); public final static String POISON_ID = "POISON_ID"; public final static SolrQuery catchallQuery = new SolrQuery(); @@ -61,7 +63,7 @@ public abstract class AbstractSolrConnector implements SolrConnector { final SolrDocument doc = get(id); return doc != null; } catch (final Throwable e) { - Log.logException(e); + log.warn(e); return false; } } diff --git a/source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java b/source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java index 6735562bf..28e97d0cb 100644 --- a/source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java +++ b/source/net/yacy/cora/services/federated/solr/GSAResponseWriter.java @@ -32,9 +32,9 @@ import java.util.Set; import java.util.regex.Pattern; import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.peers.operation.yacyVersion; import net.yacy.search.Switchboard; -import net.yacy.search.index.YaCySchema; import org.apache.lucene.document.Document; import org.apache.lucene.document.Fieldable; diff --git a/source/net/yacy/cora/services/federated/solr/JsonResponseWriter.java b/source/net/yacy/cora/services/federated/solr/JsonResponseWriter.java index e25e15785..25464d79f 100644 --- a/source/net/yacy/cora/services/federated/solr/JsonResponseWriter.java +++ b/source/net/yacy/cora/services/federated/solr/JsonResponseWriter.java @@ -32,7 +32,7 @@ import java.util.Map; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.services.federated.solr.OpensearchResponseWriter.ResHead; -import net.yacy.search.index.YaCySchema; +import net.yacy.cora.services.federated.yacy.YaCySchema; import org.apache.lucene.document.Document; import org.apache.lucene.document.Fieldable; diff --git a/source/net/yacy/cora/services/federated/solr/MirrorSolrConnector.java b/source/net/yacy/cora/services/federated/solr/MirrorSolrConnector.java index 265217548..55236b0a3 100644 --- a/source/net/yacy/cora/services/federated/solr/MirrorSolrConnector.java +++ b/source/net/yacy/cora/services/federated/solr/MirrorSolrConnector.java @@ -25,10 +25,10 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.cora.storage.ARC; import net.yacy.cora.storage.ConcurrentARC; import net.yacy.kelondro.util.MemoryControl; -import net.yacy.search.index.YaCySchema; import org.apache.solr.client.solrj.util.ClientUtils; import org.apache.solr.common.SolrDocument; diff --git a/source/net/yacy/cora/services/federated/solr/OpensearchResponseWriter.java b/source/net/yacy/cora/services/federated/solr/OpensearchResponseWriter.java index 30e2b2f51..0a2bd0c98 100644 --- a/source/net/yacy/cora/services/federated/solr/OpensearchResponseWriter.java +++ b/source/net/yacy/cora/services/federated/solr/OpensearchResponseWriter.java @@ -33,7 +33,7 @@ import java.util.Set; import net.yacy.cora.document.RSSMessage; import net.yacy.cora.lod.vocabulary.DublinCore; import net.yacy.cora.protocol.HeaderFramework; -import net.yacy.search.index.YaCySchema; +import net.yacy.cora.services.federated.yacy.YaCySchema; import org.apache.lucene.document.Document; import org.apache.lucene.document.Fieldable; diff --git a/source/net/yacy/cora/services/federated/solr/ShardSelection.java b/source/net/yacy/cora/services/federated/solr/ShardSelection.java index b6755c3c6..10654582c 100644 --- a/source/net/yacy/cora/services/federated/solr/ShardSelection.java +++ b/source/net/yacy/cora/services/federated/solr/ShardSelection.java @@ -32,7 +32,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.concurrent.atomic.AtomicLong; -import net.yacy.search.index.YaCySchema; +import net.yacy.cora.services.federated.yacy.YaCySchema; import org.apache.solr.common.SolrInputDocument; diff --git a/source/net/yacy/cora/storage/ConfigurationSet.java b/source/net/yacy/cora/services/federated/yacy/ConfigurationSet.java similarity index 96% rename from source/net/yacy/cora/storage/ConfigurationSet.java rename to source/net/yacy/cora/services/federated/yacy/ConfigurationSet.java index fc9a170df..9c5beb8d0 100644 --- a/source/net/yacy/cora/storage/ConfigurationSet.java +++ b/source/net/yacy/cora/services/federated/yacy/ConfigurationSet.java @@ -22,7 +22,7 @@ * If not, see . */ -package net.yacy.cora.storage; +package net.yacy.cora.services.federated.yacy; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -34,12 +34,12 @@ import java.io.Serializable; import java.util.Iterator; import java.util.Map; import java.util.TreeMap; -import java.util.logging.Level; -import java.util.logging.Logger; -import net.yacy.cora.storage.ConfigurationSet.Entry; -import net.yacy.kelondro.logging.Log; -import net.yacy.search.index.YaCySchema; +import org.apache.log4j.Logger; + +import net.yacy.cora.services.federated.yacy.ConfigurationSet.Entry; +import net.yacy.cora.storage.Files; + /** * this class reads configuration attributes as a list of keywords from a list * the list may contain lines with one keyword, comment lines, empty lines and out-commented keyword lines @@ -55,8 +55,9 @@ import net.yacy.search.index.YaCySchema; */ public class ConfigurationSet extends TreeMap implements Serializable { - private static final long serialVersionUID=-5961730809008841258L; - + private final static long serialVersionUID=-5961730809008841258L; + private final static Logger log = Logger.getLogger(ConfigurationSet.class); + private final File file; public ConfigurationSet() { @@ -114,7 +115,7 @@ public class ConfigurationSet extends TreeMap implements Serializa } } } catch (final IOException e) { - Log.logException(e); + log.warn(e); } finally { if (br != null) try {br.close();} catch (IOException e) {} } @@ -190,7 +191,7 @@ public class ConfigurationSet extends TreeMap implements Serializa try { commit(); } catch (IOException ex) { - Logger.getLogger(ConfigurationSet.class.getName()).log(Level.SEVERE, null, ex); + log.warn(ex); } } } diff --git a/source/net/yacy/search/index/YaCySchema.java b/source/net/yacy/cora/services/federated/yacy/YaCySchema.java similarity index 99% rename from source/net/yacy/search/index/YaCySchema.java rename to source/net/yacy/cora/services/federated/yacy/YaCySchema.java index 7baf8994c..800e5b308 100644 --- a/source/net/yacy/search/index/YaCySchema.java +++ b/source/net/yacy/cora/services/federated/yacy/YaCySchema.java @@ -3,10 +3,6 @@ * Copyright 2011 by Michael Peter Christen * First released 14.04.2011 at http://yacy.net * - * $LastChangedDate: 2011-04-14 22:05:04 +0200 (Do, 14 Apr 2011) $ - * $LastChangedRevision: 7654 $ - * $LastChangedBy: orbiter $ - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -22,7 +18,7 @@ * If not, see . */ -package net.yacy.search.index; +package net.yacy.cora.services.federated.yacy; import java.util.Date; import java.util.List; diff --git a/source/net/yacy/kelondro/util/LookAheadIterator.java b/source/net/yacy/cora/util/LookAheadIterator.java similarity index 55% rename from source/net/yacy/kelondro/util/LookAheadIterator.java rename to source/net/yacy/cora/util/LookAheadIterator.java index e0d376fd1..a02aaff34 100644 --- a/source/net/yacy/kelondro/util/LookAheadIterator.java +++ b/source/net/yacy/cora/util/LookAheadIterator.java @@ -1,30 +1,24 @@ -// LookAheadIterator.java -// (C) 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany -// first published 04.02.2010 on http://yacy.net -// -// This is a part of YaCy, a peer-to-peer based web search engine -// -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ -// -// LICENSE -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/** + * LookAheadIterator + * Copyright 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany + * First published 04.02.2010 on http://yacy.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program in the file lgpl21.txt + * If not, see . + */ -package net.yacy.kelondro.util; +package net.yacy.cora.util; import java.util.Iterator; diff --git a/source/net/yacy/cora/util/Memory.java b/source/net/yacy/cora/util/Memory.java new file mode 100644 index 000000000..2e0ab19e7 --- /dev/null +++ b/source/net/yacy/cora/util/Memory.java @@ -0,0 +1,67 @@ +/** + * Memory + * Copyright 2005 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany + * First published 22.09.2005 on http://yacy.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program in the file lgpl21.txt + * If not, see . + */ + +package net.yacy.cora.util; + +public class Memory { + + private static final Runtime runtime = Runtime.getRuntime(); + + /** + * memory that is free without increasing of total memory taken from os + * @return bytes + */ + public static final long free() { + return runtime.freeMemory(); + } + + /** + * memory that is available including increasing total memory up to maximum + * @return bytes + */ + public static final long available() { + return maxMemory() - total() + free(); + } + + /** + * maximum memory the Java virtual will allocate machine; may vary over time in some cases + * @return bytes + */ + public static final long maxMemory() { + return runtime.maxMemory(); + } + + /** + * currently allocated memory in the Java virtual machine; may vary over time + * @return bytes + */ + public static final long total() { + return runtime.totalMemory(); + } + + /** + * memory that is currently bound in objects + * @return used bytes + */ + public static final long used() { + return total() - free(); + } + +} diff --git a/source/net/yacy/cora/util/SpaceExceededException.java b/source/net/yacy/cora/util/SpaceExceededException.java index 0d5874758..23a08c687 100644 --- a/source/net/yacy/cora/util/SpaceExceededException.java +++ b/source/net/yacy/cora/util/SpaceExceededException.java @@ -22,8 +22,6 @@ package net.yacy.cora.util; import java.util.Date; -import net.yacy.kelondro.util.MemoryControl; - public class SpaceExceededException extends Exception { private static final long serialVersionUID = 9059516027929222151L; @@ -32,17 +30,17 @@ public class SpaceExceededException extends Exception { private final long neededRAM, availableRAM, time; public SpaceExceededException(final long neededRAM, final String forUsage) { - super(Long.toString(neededRAM) + " bytes needed for " + forUsage + ": " + MemoryControl.available() + " free at " + (new Date()).toString()); + super(Long.toString(neededRAM) + " bytes needed for " + forUsage + ": " + Memory.available() + " free at " + (new Date()).toString()); this.time = System.currentTimeMillis(); - this.availableRAM = MemoryControl.available(); + this.availableRAM = Memory.available(); this.neededRAM = neededRAM; this.forUsage = forUsage; } public SpaceExceededException(final long neededRAM, final String forUsage, final Throwable t) { - super(Long.toString(neededRAM) + " bytes needed for " + forUsage + ": " + MemoryControl.available() + " free at " + (new Date()).toString(), t); + super(Long.toString(neededRAM) + " bytes needed for " + forUsage + ": " + Memory.available() + " free at " + (new Date()).toString(), t); this.time = System.currentTimeMillis(); - this.availableRAM = MemoryControl.available(); + this.availableRAM = Memory.available(); this.neededRAM = neededRAM; this.forUsage = forUsage; } diff --git a/source/net/yacy/kelondro/blob/ArrayStack.java b/source/net/yacy/kelondro/blob/ArrayStack.java index 6221ffe07..8b62c1acb 100644 --- a/source/net/yacy/kelondro/blob/ArrayStack.java +++ b/source/net/yacy/kelondro/blob/ArrayStack.java @@ -54,6 +54,7 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.document.UTF8; import net.yacy.cora.order.ByteOrder; import net.yacy.cora.order.CloneableIterator; +import net.yacy.cora.util.LookAheadIterator; import net.yacy.cora.util.SpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.MergeIterator; @@ -63,7 +64,6 @@ import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.ReferenceFactory; import net.yacy.kelondro.rwi.ReferenceIterator; import net.yacy.kelondro.util.FileUtils; -import net.yacy.kelondro.util.LookAheadIterator; import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.util.NamePrefixThreadFactory; diff --git a/source/net/yacy/kelondro/blob/HeapReader.java b/source/net/yacy/kelondro/blob/HeapReader.java index 66712dadc..bfbf28e3e 100644 --- a/source/net/yacy/kelondro/blob/HeapReader.java +++ b/source/net/yacy/kelondro/blob/HeapReader.java @@ -41,6 +41,7 @@ import net.yacy.cora.document.UTF8; import net.yacy.cora.order.ByteOrder; import net.yacy.cora.order.CloneableIterator; import net.yacy.cora.storage.HandleMap; +import net.yacy.cora.util.LookAheadIterator; import net.yacy.cora.util.SpaceExceededException; import net.yacy.kelondro.index.RowHandleMap; import net.yacy.kelondro.io.CachedFileWriter; @@ -50,7 +51,6 @@ import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.order.RotateIterator; import net.yacy.kelondro.util.FileUtils; -import net.yacy.kelondro.util.LookAheadIterator; import net.yacy.kelondro.util.MemoryControl; diff --git a/source/net/yacy/kelondro/blob/MapHeap.java b/source/net/yacy/kelondro/blob/MapHeap.java index a8f0a8aae..bdc41bf85 100644 --- a/source/net/yacy/kelondro/blob/MapHeap.java +++ b/source/net/yacy/kelondro/blob/MapHeap.java @@ -49,12 +49,12 @@ import net.yacy.cora.order.ByteOrder; import net.yacy.cora.order.CloneableIterator; import net.yacy.cora.storage.ARC; import net.yacy.cora.storage.ConcurrentARC; +import net.yacy.cora.util.LookAheadIterator; import net.yacy.cora.util.SpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.order.RotateIterator; import net.yacy.kelondro.util.FileUtils; -import net.yacy.kelondro.util.LookAheadIterator; import net.yacy.kelondro.util.MemoryControl; public class MapHeap implements Map> { diff --git a/source/net/yacy/kelondro/blob/Tables.java b/source/net/yacy/kelondro/blob/Tables.java index e17be9060..b466a8645 100644 --- a/source/net/yacy/kelondro/blob/Tables.java +++ b/source/net/yacy/kelondro/blob/Tables.java @@ -46,12 +46,12 @@ import java.util.regex.Pattern; import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.ASCII; import net.yacy.cora.document.UTF8; +import net.yacy.cora.util.LookAheadIterator; import net.yacy.cora.util.SpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.ByteArray; import net.yacy.kelondro.util.ByteBuffer; import net.yacy.kelondro.util.FileUtils; -import net.yacy.kelondro.util.LookAheadIterator; import de.anomic.data.ymark.YMarkUtil; diff --git a/source/net/yacy/kelondro/data/meta/URIMetadataNode.java b/source/net/yacy/kelondro/data/meta/URIMetadataNode.java index 7592e260f..916efc871 100644 --- a/source/net/yacy/kelondro/data/meta/URIMetadataNode.java +++ b/source/net/yacy/kelondro/data/meta/URIMetadataNode.java @@ -32,12 +32,12 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.document.UTF8; import net.yacy.cora.lod.vocabulary.Tagging; import net.yacy.cora.services.federated.solr.SolrType; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.document.Condenser; import net.yacy.kelondro.data.word.WordReference; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; -import net.yacy.search.index.YaCySchema; import org.apache.solr.common.SolrDocument; diff --git a/source/net/yacy/kelondro/rwi/ReferenceIterator.java b/source/net/yacy/kelondro/rwi/ReferenceIterator.java index a605ecc70..fef6509a0 100644 --- a/source/net/yacy/kelondro/rwi/ReferenceIterator.java +++ b/source/net/yacy/kelondro/rwi/ReferenceIterator.java @@ -32,11 +32,11 @@ import java.util.Map; import net.yacy.cora.document.UTF8; import net.yacy.cora.order.CloneableIterator; +import net.yacy.cora.util.LookAheadIterator; import net.yacy.cora.util.SpaceExceededException; import net.yacy.kelondro.blob.HeapReader; import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.LookAheadIterator; /** * iterator of BLOBHeap files: is used to import heap dumps into a write-enabled index heap diff --git a/source/net/yacy/kelondro/table/ChunkIterator.java b/source/net/yacy/kelondro/table/ChunkIterator.java index afdea51ed..ad8e4591b 100644 --- a/source/net/yacy/kelondro/table/ChunkIterator.java +++ b/source/net/yacy/kelondro/table/ChunkIterator.java @@ -33,8 +33,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.Iterator; +import net.yacy.cora.util.LookAheadIterator; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.LookAheadIterator; public class ChunkIterator extends LookAheadIterator implements Iterator { diff --git a/source/net/yacy/kelondro/util/StandardMemoryStrategy.java b/source/net/yacy/kelondro/util/StandardMemoryStrategy.java index 5210c5e4c..a1883fa0c 100644 --- a/source/net/yacy/kelondro/util/StandardMemoryStrategy.java +++ b/source/net/yacy/kelondro/util/StandardMemoryStrategy.java @@ -25,13 +25,13 @@ package net.yacy.kelondro.util; +import net.yacy.cora.util.Memory; + /** * Standard implementation to get information about memory usage or try to free some memory */ public class StandardMemoryStrategy extends MemoryStrategy { - - private final Runtime runtime = Runtime.getRuntime(); private final long[] gcs = new long[5]; private int gcs_pos = 0; private long properMbyte = 0L; @@ -94,7 +94,7 @@ public class StandardMemoryStrategy extends MemoryStrategy { */ @Override protected final long free() { - return this.runtime.freeMemory(); + return Memory.free(); } /** @@ -103,7 +103,7 @@ public class StandardMemoryStrategy extends MemoryStrategy { */ @Override protected final long available() { - return maxMemory() - total() + free(); + return Memory.available(); } /** @@ -113,7 +113,7 @@ public class StandardMemoryStrategy extends MemoryStrategy { @Override protected final long maxMemory() { - return this.runtime.maxMemory(); + return Memory.maxMemory(); } /** @@ -123,7 +123,7 @@ public class StandardMemoryStrategy extends MemoryStrategy { @Override protected final long total() { - return this.runtime.totalMemory(); + return Memory.total(); } /** @@ -187,7 +187,7 @@ public class StandardMemoryStrategy extends MemoryStrategy { */ @Override protected final long used() { - return total() - free(); + return Memory.used(); } @Override diff --git a/source/net/yacy/peers/graphics/WebStructureGraph.java b/source/net/yacy/peers/graphics/WebStructureGraph.java index 04e822450..78e2571d4 100644 --- a/source/net/yacy/peers/graphics/WebStructureGraph.java +++ b/source/net/yacy/peers/graphics/WebStructureGraph.java @@ -47,6 +47,7 @@ import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.ASCII; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.UTF8; +import net.yacy.cora.util.LookAheadIterator; import net.yacy.cora.util.SpaceExceededException; import net.yacy.document.Document; import net.yacy.kelondro.data.meta.DigestURI; @@ -61,7 +62,6 @@ import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.ReferenceContainerCache; import net.yacy.kelondro.rwi.ReferenceFactory; import net.yacy.kelondro.util.FileUtils; -import net.yacy.kelondro.util.LookAheadIterator; import net.yacy.search.Switchboard; public class WebStructureGraph diff --git a/source/net/yacy/search/index/Fulltext.java b/source/net/yacy/search/index/Fulltext.java index 273903a96..2854c7693 100644 --- a/source/net/yacy/search/index/Fulltext.java +++ b/source/net/yacy/search/index/Fulltext.java @@ -39,6 +39,7 @@ import net.yacy.cora.order.CloneableIterator; import net.yacy.cora.services.federated.solr.EmbeddedSolrConnector; import net.yacy.cora.services.federated.solr.MirrorSolrConnector; import net.yacy.cora.services.federated.solr.SolrConnector; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.cora.sorting.ConcurrentScoreMap; import net.yacy.cora.sorting.ScoreMap; import net.yacy.cora.storage.HandleSet; diff --git a/source/net/yacy/search/index/Segment.java b/source/net/yacy/search/index/Segment.java index 6d1318fcc..97e3d2e47 100644 --- a/source/net/yacy/search/index/Segment.java +++ b/source/net/yacy/search/index/Segment.java @@ -42,7 +42,9 @@ import net.yacy.cora.order.ByteOrder; import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.services.federated.solr.AbstractSolrConnector; import net.yacy.cora.services.federated.yacy.CacheStrategy; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.cora.storage.HandleSet; +import net.yacy.cora.util.LookAheadIterator; import net.yacy.cora.util.SpaceExceededException; import net.yacy.document.Condenser; import net.yacy.document.Document; @@ -63,7 +65,6 @@ import net.yacy.kelondro.rwi.IndexCell; import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.ReferenceFactory; import net.yacy.kelondro.util.ISO639; -import net.yacy.kelondro.util.LookAheadIterator; import net.yacy.repository.LoaderDispatcher; import net.yacy.search.Switchboard; import net.yacy.search.query.RWIProcess; diff --git a/source/net/yacy/search/index/SolrConfiguration.java b/source/net/yacy/search/index/SolrConfiguration.java index 2a31c4e17..1ccb6a76a 100644 --- a/source/net/yacy/search/index/SolrConfiguration.java +++ b/source/net/yacy/search/index/SolrConfiguration.java @@ -45,7 +45,8 @@ import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.ResponseHeader; -import net.yacy.cora.storage.ConfigurationSet; +import net.yacy.cora.services.federated.yacy.ConfigurationSet; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.document.Condenser; import net.yacy.document.Document; import net.yacy.document.parser.html.ContentScraper; diff --git a/source/net/yacy/search/query/QueryParams.java b/source/net/yacy/search/query/QueryParams.java index abb995558..22e858c14 100644 --- a/source/net/yacy/search/query/QueryParams.java +++ b/source/net/yacy/search/query/QueryParams.java @@ -46,6 +46,7 @@ import net.yacy.cora.document.UTF8; import net.yacy.cora.geo.GeoLocation; import net.yacy.cora.lod.vocabulary.Tagging; import net.yacy.cora.services.federated.yacy.CacheStrategy; +import net.yacy.cora.services.federated.yacy.YaCySchema; import net.yacy.cora.storage.HandleSet; import net.yacy.cora.util.SpaceExceededException; import net.yacy.document.Condenser; @@ -61,7 +62,6 @@ import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.util.SetTools; import net.yacy.peers.Seed; import net.yacy.search.index.Segment; -import net.yacy.search.index.YaCySchema; import net.yacy.search.ranking.RankingProfile; public final class QueryParams {