diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 0d9d9fc0b..eb8767cfd 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -29,8 +29,9 @@ import java.io.File; import java.util.Iterator; import java.util.Map; +import net.yacy.kelondro.index.Cache; + import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.index.Cache; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.util.MemoryControl; import de.anomic.kelondro.util.FileUtils; diff --git a/htroot/Supporter.java b/htroot/Supporter.java index 74f99f374..912d65fe2 100644 --- a/htroot/Supporter.java +++ b/htroot/Supporter.java @@ -31,12 +31,12 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.NaturalOrder; import de.anomic.data.Blacklist; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.Row.Entry; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.search.Switchboard; diff --git a/htroot/Surftips.java b/htroot/Surftips.java index 65d3fe5f9..192078feb 100644 --- a/htroot/Surftips.java +++ b/htroot/Surftips.java @@ -31,12 +31,12 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.NaturalOrder; import de.anomic.data.Blacklist; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.Row.Entry; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.search.Switchboard; diff --git a/source/dbtest.java b/source/dbtest.java index 0c7c19ed7..80ac8c3d4 100644 --- a/source/dbtest.java +++ b/source/dbtest.java @@ -12,14 +12,14 @@ import java.util.Random; import javax.imageio.ImageIO; +import net.yacy.kelondro.index.ObjectArrayCache; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowSet; -import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.index.ObjectArrayCache; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.table.SQLTable; import de.anomic.kelondro.table.SplitTable; diff --git a/source/de/anomic/crawler/Balancer.java b/source/de/anomic/crawler/Balancer.java index b8d0b1699..34e10cfb4 100644 --- a/source/de/anomic/crawler/Balancer.java +++ b/source/de/anomic/crawler/Balancer.java @@ -33,13 +33,13 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.CloneableIterator; import de.anomic.crawler.retrieval.Request; import de.anomic.http.client.Cache; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.table.Table; public class Balancer { diff --git a/source/de/anomic/crawler/ZURL.java b/source/de/anomic/crawler/ZURL.java index 7a6bd4d12..382bc46dc 100755 --- a/source/de/anomic/crawler/ZURL.java +++ b/source/de/anomic/crawler/ZURL.java @@ -32,12 +32,12 @@ import java.util.Date; import java.util.Iterator; import java.util.LinkedList; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.order.Base64Order; import de.anomic.crawler.retrieval.Request; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowSet; -import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.table.SplitTable; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/crawler/retrieval/Request.java b/source/de/anomic/crawler/retrieval/Request.java index d6bce899b..819971b4d 100755 --- a/source/de/anomic/crawler/retrieval/Request.java +++ b/source/de/anomic/crawler/retrieval/Request.java @@ -30,11 +30,11 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Date; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Row; import de.anomic.server.serverProcessorJob; import de.anomic.yacy.yacySeedDB; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/data/URLAnalysis.java b/source/de/anomic/data/URLAnalysis.java index 42d62e6eb..d50db1fb2 100644 --- a/source/de/anomic/data/URLAnalysis.java +++ b/source/de/anomic/data/URLAnalysis.java @@ -50,10 +50,10 @@ import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; +import net.yacy.kelondro.index.HandleMap; +import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.order.Base64Order; -import de.anomic.kelondro.index.HandleSet; -import de.anomic.kelondro.index.HandleMap; import de.anomic.kelondro.text.MetadataRepository; import de.anomic.kelondro.text.ReferenceContainerArray; import de.anomic.kelondro.text.Segment; diff --git a/source/de/anomic/document/Word.java b/source/de/anomic/document/Word.java index bfe3268d4..31ff28571 100644 --- a/source/de/anomic/document/Word.java +++ b/source/de/anomic/document/Word.java @@ -32,12 +32,12 @@ import java.util.Locale; import java.util.Set; import java.util.TreeSet; +import net.yacy.kelondro.index.ARC; +import net.yacy.kelondro.index.ConcurrentARC; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.Digest; -import de.anomic.kelondro.index.ARC; -import de.anomic.kelondro.index.ConcurrentARC; import de.anomic.kelondro.util.MemoryControl; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/kelondro/blob/ArrayStack.java b/source/de/anomic/kelondro/blob/ArrayStack.java index 6769c2732..079327d06 100755 --- a/source/de/anomic/kelondro/blob/ArrayStack.java +++ b/source/de/anomic/kelondro/blob/ArrayStack.java @@ -47,13 +47,13 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.MergeIterator; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Row; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceFactory; diff --git a/source/de/anomic/kelondro/blob/HeapReader.java b/source/de/anomic/kelondro/blob/HeapReader.java index 91eb71115..ab9ee77b3 100644 --- a/source/de/anomic/kelondro/blob/HeapReader.java +++ b/source/de/anomic/kelondro/blob/HeapReader.java @@ -34,12 +34,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ExecutionException; +import net.yacy.kelondro.index.HandleMap; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.RotateIterator; -import de.anomic.kelondro.index.HandleMap; import de.anomic.kelondro.io.random.CachedFileWriter; import de.anomic.kelondro.io.random.Writer; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/kelondro/blob/HeapWriter.java b/source/de/anomic/kelondro/blob/HeapWriter.java index 31087b118..16756ed62 100644 --- a/source/de/anomic/kelondro/blob/HeapWriter.java +++ b/source/de/anomic/kelondro/blob/HeapWriter.java @@ -30,11 +30,11 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import net.yacy.kelondro.index.HandleMap; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.Digest; -import de.anomic.kelondro.index.HandleMap; import de.anomic.kelondro.util.FileUtils; public final class HeapWriter { diff --git a/source/de/anomic/kelondro/blob/MapView.java b/source/de/anomic/kelondro/blob/MapView.java index 09bb0b28a..f49f58f62 100644 --- a/source/de/anomic/kelondro/blob/MapView.java +++ b/source/de/anomic/kelondro/blob/MapView.java @@ -36,12 +36,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import net.yacy.kelondro.index.ARC; +import net.yacy.kelondro.index.ConcurrentARC; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.order.RotateIterator; -import de.anomic.kelondro.index.ARC; -import de.anomic.kelondro.index.ConcurrentARC; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/table/RecordStack.java b/source/de/anomic/kelondro/table/RecordStack.java index 36950294c..75307d4e4 100644 --- a/source/de/anomic/kelondro/table/RecordStack.java +++ b/source/de/anomic/kelondro/table/RecordStack.java @@ -34,10 +34,10 @@ import java.io.RandomAccessFile; import java.util.Iterator; import java.util.StringTokenizer; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Row; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/table/Records.java b/source/de/anomic/kelondro/table/Records.java index 13b26190c..69e64d4c6 100644 --- a/source/de/anomic/kelondro/table/Records.java +++ b/source/de/anomic/kelondro/table/Records.java @@ -38,13 +38,13 @@ import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; +import net.yacy.kelondro.index.Column; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.Row.EntryIndex; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Column; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.Row.EntryIndex; import de.anomic.kelondro.io.chunks.IOChunksInterface; import de.anomic.kelondro.io.chunks.RandomAccessIOChunks; import de.anomic.kelondro.io.random.CachedFileWriter; diff --git a/source/de/anomic/kelondro/table/Relations.java b/source/de/anomic/kelondro/table/Relations.java index b68e8f9c7..f51b981fc 100755 --- a/source/de/anomic/kelondro/table/Relations.java +++ b/source/de/anomic/kelondro/table/Relations.java @@ -30,10 +30,10 @@ import java.io.File; import java.io.IOException; import java.util.HashMap; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.ObjectIndex; public class Relations { diff --git a/source/de/anomic/kelondro/table/SQLTable.java b/source/de/anomic/kelondro/table/SQLTable.java index ee9ac9e3b..e5576e9e3 100644 --- a/source/de/anomic/kelondro/table/SQLTable.java +++ b/source/de/anomic/kelondro/table/SQLTable.java @@ -36,13 +36,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowCollection; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowCollection; -import de.anomic.kelondro.index.ObjectIndex; /* * Commands to create a database using mysql: diff --git a/source/de/anomic/kelondro/table/SplitTable.java b/source/de/anomic/kelondro/table/SplitTable.java index 27c10d01c..a7d3a8434 100644 --- a/source/de/anomic/kelondro/table/SplitTable.java +++ b/source/de/anomic/kelondro/table/SplitTable.java @@ -43,6 +43,12 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import net.yacy.kelondro.index.Cache; +import net.yacy.kelondro.index.Column; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.ObjectIndexCache; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowCollection; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.MergeIterator; @@ -51,12 +57,6 @@ import net.yacy.kelondro.order.Order; import net.yacy.kelondro.order.StackIterator; import de.anomic.kelondro.blob.ArrayStack; -import de.anomic.kelondro.index.Cache; -import de.anomic.kelondro.index.Column; -import de.anomic.kelondro.index.ObjectIndexCache; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowCollection; -import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.NamePrefixThreadFactory; diff --git a/source/de/anomic/kelondro/table/Table.java b/source/de/anomic/kelondro/table/Table.java index 0157982b2..f5802e854 100644 --- a/source/de/anomic/kelondro/table/Table.java +++ b/source/de/anomic/kelondro/table/Table.java @@ -38,17 +38,17 @@ import java.util.Map; import java.util.TreeMap; import java.util.TreeSet; +import net.yacy.kelondro.index.Column; +import net.yacy.kelondro.index.HandleMap; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowCollection; +import net.yacy.kelondro.index.RowSet; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Column; -import de.anomic.kelondro.index.HandleMap; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowCollection; -import de.anomic.kelondro.index.RowSet; -import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.index.Row.Entry; import de.anomic.kelondro.io.records.BufferedRecords; import de.anomic.kelondro.io.records.Records; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/kelondro/text/IODispatcher.java b/source/de/anomic/kelondro/text/IODispatcher.java index be151c660..a4300e09a 100644 --- a/source/de/anomic/kelondro/text/IODispatcher.java +++ b/source/de/anomic/kelondro/text/IODispatcher.java @@ -29,10 +29,10 @@ import java.io.IOException; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Semaphore; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.logging.Log; import de.anomic.kelondro.blob.ArrayStack; -import de.anomic.kelondro.index.Row; import de.anomic.kelondro.util.MemoryControl; /** diff --git a/source/de/anomic/kelondro/text/IndexCell.java b/source/de/anomic/kelondro/text/IndexCell.java index 62f3f7915..02b9c2051 100644 --- a/source/de/anomic/kelondro/text/IndexCell.java +++ b/source/de/anomic/kelondro/text/IndexCell.java @@ -31,14 +31,14 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; +import net.yacy.kelondro.index.ARC; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.SimpleARC; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.MergeIterator; import net.yacy.kelondro.order.Order; -import de.anomic.kelondro.index.ARC; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.SimpleARC; import de.anomic.kelondro.util.ByteArray; import de.anomic.kelondro.util.MemoryControl; import de.anomic.server.serverProfiling; diff --git a/source/de/anomic/kelondro/text/Metadata.java b/source/de/anomic/kelondro/text/Metadata.java index a5448553b..0cb87886a 100644 --- a/source/de/anomic/kelondro/text/Metadata.java +++ b/source/de/anomic/kelondro/text/Metadata.java @@ -28,10 +28,10 @@ package de.anomic.kelondro.text; import java.util.Date; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.Bitfield; import de.anomic.crawler.retrieval.Request; -import de.anomic.kelondro.index.Row; import de.anomic.kelondro.text.Reference; public interface Metadata { diff --git a/source/de/anomic/kelondro/text/MetadataRepository.java b/source/de/anomic/kelondro/text/MetadataRepository.java index cd74d778a..b4c961b0f 100644 --- a/source/de/anomic/kelondro/text/MetadataRepository.java +++ b/source/de/anomic/kelondro/text/MetadataRepository.java @@ -38,6 +38,10 @@ import java.util.Iterator; import java.util.Map; import java.util.TreeSet; +import net.yacy.kelondro.index.Cache; +import net.yacy.kelondro.index.HandleSet; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.CloneableIterator; @@ -46,10 +50,6 @@ import de.anomic.document.parser.html.CharacterCoding; import de.anomic.http.client.Client; import de.anomic.http.client.RemoteProxyConfig; import de.anomic.http.metadata.ResponseContainer; -import de.anomic.kelondro.index.Cache; -import de.anomic.kelondro.index.HandleSet; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.table.SplitTable; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/source/de/anomic/kelondro/text/Reference.java b/source/de/anomic/kelondro/text/Reference.java index 9e3479ac2..17a97889a 100644 --- a/source/de/anomic/kelondro/text/Reference.java +++ b/source/de/anomic/kelondro/text/Reference.java @@ -26,7 +26,7 @@ package de.anomic.kelondro.text; -import de.anomic.kelondro.index.Row.Entry; +import net.yacy.kelondro.index.Row.Entry; public interface Reference { diff --git a/source/de/anomic/kelondro/text/ReferenceContainer.java b/source/de/anomic/kelondro/text/ReferenceContainer.java index fd241dffc..3640e5558 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainer.java +++ b/source/de/anomic/kelondro/text/ReferenceContainer.java @@ -34,11 +34,11 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.ByteOrder; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowSet; import de.anomic.kelondro.text.referencePrototype.WordReferenceRow; import de.anomic.kelondro.util.ByteBuffer; diff --git a/source/de/anomic/kelondro/text/ReferenceContainerArray.java b/source/de/anomic/kelondro/text/ReferenceContainerArray.java index e02f0c6f0..063b4b4cb 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainerArray.java +++ b/source/de/anomic/kelondro/text/ReferenceContainerArray.java @@ -29,15 +29,15 @@ import java.io.IOException; import java.util.Date; import java.util.Iterator; +import net.yacy.kelondro.index.HandleMap; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.CloneableIterator; import de.anomic.kelondro.blob.BLOB; import de.anomic.kelondro.blob.ArrayStack; -import de.anomic.kelondro.index.HandleMap; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowSet; public final class ReferenceContainerArray { diff --git a/source/de/anomic/kelondro/text/ReferenceContainerCache.java b/source/de/anomic/kelondro/text/ReferenceContainerCache.java index 34190e693..61f380ec8 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainerCache.java +++ b/source/de/anomic/kelondro/text/ReferenceContainerCache.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.ByteOrder; @@ -44,8 +46,6 @@ import de.anomic.kelondro.blob.HeapReader; import de.anomic.kelondro.blob.HeapWriter; import de.anomic.kelondro.util.ByteArray; import de.anomic.kelondro.util.FileUtils; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowSet; public final class ReferenceContainerCache extends AbstractIndex implements Index, IndexReader, Iterable> { diff --git a/source/de/anomic/kelondro/text/ReferenceFactory.java b/source/de/anomic/kelondro/text/ReferenceFactory.java index 4306f922a..5d6b31e55 100644 --- a/source/de/anomic/kelondro/text/ReferenceFactory.java +++ b/source/de/anomic/kelondro/text/ReferenceFactory.java @@ -26,7 +26,7 @@ package de.anomic.kelondro.text; -import de.anomic.kelondro.index.Row; +import net.yacy.kelondro.index.Row; public interface ReferenceFactory { diff --git a/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java b/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java index 1d03070d0..a8a2d32da 100644 --- a/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java +++ b/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java @@ -26,11 +26,11 @@ package de.anomic.kelondro.text.citationPrototype; +import net.yacy.kelondro.index.Column; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.MicroDate; -import de.anomic.kelondro.index.Column; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.Row.Entry; import de.anomic.kelondro.text.Reference; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/kelondro/text/metadataPrototype/URLMetadataRow.java b/source/de/anomic/kelondro/text/metadataPrototype/URLMetadataRow.java index 2b5f8a45b..b0bb74228 100644 --- a/source/de/anomic/kelondro/text/metadataPrototype/URLMetadataRow.java +++ b/source/de/anomic/kelondro/text/metadataPrototype/URLMetadataRow.java @@ -33,13 +33,13 @@ import java.util.Date; import java.util.Iterator; import java.util.Properties; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.order.NaturalOrder; import de.anomic.crawler.retrieval.Request; -import de.anomic.kelondro.index.Row; import de.anomic.kelondro.text.Metadata; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.text.referencePrototype.WordReferenceRow; diff --git a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReference.java b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReference.java index f35eca00f..3cda99115 100644 --- a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReference.java +++ b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReference.java @@ -26,7 +26,7 @@ package de.anomic.kelondro.text.navigationPrototype; -import de.anomic.kelondro.index.Row.Entry; +import net.yacy.kelondro.index.Row.Entry; import de.anomic.kelondro.text.Reference; public interface NavigationReference extends Reference { diff --git a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceFactory.java b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceFactory.java index 845058c98..834afa27a 100644 --- a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceFactory.java +++ b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceFactory.java @@ -26,7 +26,7 @@ package de.anomic.kelondro.text.navigationPrototype; -import de.anomic.kelondro.index.Row.Entry; +import net.yacy.kelondro.index.Row.Entry; import de.anomic.kelondro.text.ReferenceFactory; public class NavigationReferenceFactory implements ReferenceFactory { diff --git a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceRow.java b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceRow.java index d8309a08c..90739ca37 100644 --- a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceRow.java +++ b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceRow.java @@ -26,10 +26,10 @@ package de.anomic.kelondro.text.navigationPrototype; +import net.yacy.kelondro.index.Column; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.Base64Order; -import de.anomic.kelondro.index.Column; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.Row.Entry; import de.anomic.kelondro.text.AbstractReference; import de.anomic.kelondro.text.Reference; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceVars.java b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceVars.java index 03b3e3a4c..d776453dd 100644 --- a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceVars.java +++ b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceVars.java @@ -26,7 +26,7 @@ package de.anomic.kelondro.text.navigationPrototype; -import de.anomic.kelondro.index.Row.Entry; +import net.yacy.kelondro.index.Row.Entry; import de.anomic.kelondro.text.AbstractReference; import de.anomic.kelondro.text.Reference; diff --git a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceFactory.java b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceFactory.java index 7142a2fc4..361341ea8 100644 --- a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceFactory.java +++ b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceFactory.java @@ -26,7 +26,7 @@ package de.anomic.kelondro.text.referencePrototype; -import de.anomic.kelondro.index.Row.Entry; +import net.yacy.kelondro.index.Row.Entry; import de.anomic.kelondro.text.ReferenceFactory; public class WordReferenceFactory implements ReferenceFactory { diff --git a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java index c96bb1119..54210d3c1 100644 --- a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java +++ b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java @@ -26,13 +26,13 @@ package de.anomic.kelondro.text.referencePrototype; +import net.yacy.kelondro.index.Column; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.MicroDate; import de.anomic.document.Word; -import de.anomic.kelondro.index.Column; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.Row.Entry; import de.anomic.kelondro.text.AbstractReference; import de.anomic.kelondro.text.Reference; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java index 43e8fc150..7d4a118b7 100644 --- a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java +++ b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java @@ -30,10 +30,10 @@ import java.util.ArrayList; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.MicroDate; -import de.anomic.kelondro.index.Row.Entry; import de.anomic.kelondro.text.AbstractReference; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; diff --git a/source/de/anomic/kelondro/util/AttrSeq.java b/source/de/anomic/kelondro/util/AttrSeq.java index 3eaa08f49..67b5f7913 100644 --- a/source/de/anomic/kelondro/util/AttrSeq.java +++ b/source/de/anomic/kelondro/util/AttrSeq.java @@ -43,11 +43,11 @@ import java.util.TreeSet; import java.util.logging.Logger; import java.util.zip.GZIPInputStream; +import net.yacy.kelondro.index.Column; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowCollection; import net.yacy.kelondro.order.Base64Order; -import de.anomic.kelondro.index.Column; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowCollection; public class AttrSeq { diff --git a/source/de/anomic/kelondro/util/FileUtils.java b/source/de/anomic/kelondro/util/FileUtils.java index 26e318ec4..6203f1c08 100644 --- a/source/de/anomic/kelondro/util/FileUtils.java +++ b/source/de/anomic/kelondro/util/FileUtils.java @@ -54,10 +54,10 @@ import java.util.zip.GZIPOutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.logging.Log; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowSet; public final class FileUtils { diff --git a/source/de/anomic/search/RankingProcess.java b/source/de/anomic/search/RankingProcess.java index f5d2f4192..71aba5cb3 100644 --- a/source/de/anomic/search/RankingProcess.java +++ b/source/de/anomic/search/RankingProcess.java @@ -41,12 +41,12 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; +import net.yacy.kelondro.index.BinSearch; import net.yacy.kelondro.order.Digest; import de.anomic.document.Condenser; import de.anomic.document.Word; import de.anomic.document.parser.html.ContentScraper; -import de.anomic.kelondro.index.BinSearch; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceOrder; diff --git a/source/de/anomic/search/TextSnippet.java b/source/de/anomic/search/TextSnippet.java index 09017117d..52e13234f 100644 --- a/source/de/anomic/search/TextSnippet.java +++ b/source/de/anomic/search/TextSnippet.java @@ -35,6 +35,8 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.yacy.kelondro.index.ARC; +import net.yacy.kelondro.index.ConcurrentARC; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; @@ -46,8 +48,6 @@ import de.anomic.document.Word; import de.anomic.document.parser.html.CharacterCoding; import de.anomic.http.client.Cache; import de.anomic.http.metadata.ResponseHeader; -import de.anomic.kelondro.index.ARC; -import de.anomic.kelondro.index.ConcurrentARC; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.util.SetTools; diff --git a/source/de/anomic/search/blockrank/CRProcess.java b/source/de/anomic/search/blockrank/CRProcess.java index 6ff577e85..4c73ffb00 100644 --- a/source/de/anomic/search/blockrank/CRProcess.java +++ b/source/de/anomic/search/blockrank/CRProcess.java @@ -30,14 +30,14 @@ import java.io.File; import java.io.IOException; import java.util.Iterator; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.MicroDate; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.RowSet; -import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.text.IndexCell; import de.anomic.kelondro.text.ReferenceContainer; diff --git a/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java b/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java index a575122b6..99fa8bd65 100755 --- a/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java +++ b/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java @@ -25,7 +25,12 @@ package de.anomic.yacy.dht; +import java.util.Random; +import java.util.TreeMap; + +import net.yacy.kelondro.index.HandleMap; import net.yacy.kelondro.order.Base64Order; +import de.anomic.kelondro.util.MemoryControl; import de.anomic.yacy.yacySeed; /** @@ -92,5 +97,51 @@ public class FlatWordPartitionScheme implements PartitionScheme { while (s.length() < 12) s += "A"; return s.getBytes(); } + + + public static void main(String[] args) { + int count = (args.length == 0) ? 1000000 : Integer.parseInt(args[0]); + System.out.println("Starting test with " + count + " objects"); + System.out.println("expected memory: " + (count * 16) + " bytes"); + System.out.println("available memory: " + MemoryControl.available()); + Random r = new Random(0); + long start = System.currentTimeMillis(); + + System.gc(); // for resource measurement + long a = MemoryControl.available(); + HandleMap idx = new HandleMap(12, Base64Order.enhancedCoder, 4, 0, 150000); + for (int i = 0; i < count; i++) { + idx.inc(FlatWordPartitionScheme.positionToHash(r.nextInt(count))); + } + long timek = ((long) count) * 1000L / (System.currentTimeMillis() - start); + System.out.println("Result HandleMap: " + timek + " inc per second"); + System.gc(); + long memk = a - MemoryControl.available(); + System.out.println("Used Memory: " + memk + " bytes"); + System.out.println("x " + idx.get(FlatWordPartitionScheme.positionToHash(0))); + idx = null; + + r = new Random(0); + start = System.currentTimeMillis(); + byte[] hash; + Integer d; + System.gc(); // for resource measurement + a = MemoryControl.available(); + TreeMap hm = new TreeMap(Base64Order.enhancedCoder); + for (int i = 0; i < count; i++) { + hash = FlatWordPartitionScheme.positionToHash(r.nextInt(count)); + d = hm.get(hash); + if (d == null) hm.put(hash, 1); else hm.put(hash, d + 1); + } + long timej = ((long) count) * 1000L / (System.currentTimeMillis() - start); + System.out.println("Result TreeMap: " + timej + " inc per second"); + System.gc(); + long memj = a - MemoryControl.available(); + System.out.println("Used Memory: " + memj + " bytes"); + System.out.println("x " + hm.get(FlatWordPartitionScheme.positionToHash(0))); + System.out.println("Geschwindigkeitsfaktor j/k: " + ((float) (10 * timej / timek) / 10.0) + " - je kleiner desto besser fuer kelondro"); + System.out.println("Speicherplatzfaktor j/k: " + ((float) (10 * memj / memk) / 10.0) + " - je groesser desto besser fuer kelondro"); + System.exit(0); + } } diff --git a/source/de/anomic/yacy/dht/Transmission.java b/source/de/anomic/yacy/dht/Transmission.java index 70a4dc7d2..0aceab5f1 100644 --- a/source/de/anomic/yacy/dht/Transmission.java +++ b/source/de/anomic/yacy/dht/Transmission.java @@ -30,9 +30,9 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.logging.Log; -import de.anomic.kelondro.index.Row; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceContainerCache; import de.anomic.kelondro.text.Segment; diff --git a/source/de/anomic/yacy/yacyNewsDB.java b/source/de/anomic/yacy/yacyNewsDB.java index 909b1d6b6..42e2fc50d 100644 --- a/source/de/anomic/yacy/yacyNewsDB.java +++ b/source/de/anomic/yacy/yacyNewsDB.java @@ -49,10 +49,10 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Iterator; +import net.yacy.kelondro.index.ObjectIndex; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.Base64Order; -import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/yacy/yacyNewsQueue.java b/source/de/anomic/yacy/yacyNewsQueue.java index e6ba37b28..77a669fdb 100644 --- a/source/de/anomic/yacy/yacyNewsQueue.java +++ b/source/de/anomic/yacy/yacyNewsQueue.java @@ -50,10 +50,10 @@ import java.util.Date; import java.util.HashSet; import java.util.Iterator; +import net.yacy.kelondro.index.Column; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Column; -import de.anomic.kelondro.index.Row; import de.anomic.kelondro.table.RecordStack; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/yacy/yacyNewsRecord.java b/source/de/anomic/yacy/yacyNewsRecord.java index 9801f3d76..2c087959b 100644 --- a/source/de/anomic/yacy/yacyNewsRecord.java +++ b/source/de/anomic/yacy/yacyNewsRecord.java @@ -51,9 +51,9 @@ import java.util.Map; import java.util.Properties; import java.util.Map.Entry; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.index.Row; import de.anomic.kelondro.util.DateFormatter; import de.anomic.server.serverCodings; diff --git a/source/de/anomic/kelondro/index/ARC.java b/source/net/yacy/kelondro/index/ARC.java similarity index 98% rename from source/de/anomic/kelondro/index/ARC.java rename to source/net/yacy/kelondro/index/ARC.java index bb6908c3b..eaaa001c8 100644 --- a/source/de/anomic/kelondro/index/ARC.java +++ b/source/net/yacy/kelondro/index/ARC.java @@ -23,7 +23,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; /** * This is a simple cache using two generations of hashtables to store the content with a LFU strategy. diff --git a/source/de/anomic/kelondro/index/BinSearch.java b/source/net/yacy/kelondro/index/BinSearch.java similarity index 98% rename from source/de/anomic/kelondro/index/BinSearch.java rename to source/net/yacy/kelondro/index/BinSearch.java index 97244a278..1afe1b671 100644 --- a/source/de/anomic/kelondro/index/BinSearch.java +++ b/source/net/yacy/kelondro/index/BinSearch.java @@ -1,4 +1,4 @@ -// kelondroBinSearch.java +// BinSearch.java // ----------------------- // part of The Kelondro Database // (C) by Michael Peter Christen; mc@yacy.net @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.NaturalOrder; diff --git a/source/de/anomic/kelondro/index/Cache.java b/source/net/yacy/kelondro/index/Cache.java similarity index 99% rename from source/de/anomic/kelondro/index/Cache.java rename to source/net/yacy/kelondro/index/Cache.java index bab1a62f1..c1762fc72 100644 --- a/source/de/anomic/kelondro/index/Cache.java +++ b/source/net/yacy/kelondro/index/Cache.java @@ -1,4 +1,4 @@ -// kelondro.blob.Cache.java +// Cache.java // (C) 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 26.10.2006 on http://www.anomic.de // @@ -25,7 +25,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.io.IOException; import java.util.ArrayList; diff --git a/source/de/anomic/kelondro/index/Column.java b/source/net/yacy/kelondro/index/Column.java similarity index 99% rename from source/de/anomic/kelondro/index/Column.java rename to source/net/yacy/kelondro/index/Column.java index 3606fdc84..de5cd6071 100644 --- a/source/de/anomic/kelondro/index/Column.java +++ b/source/net/yacy/kelondro/index/Column.java @@ -1,4 +1,4 @@ -// kelondroColumn.java +// Column.java // (C) 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 24.05.2006 on http://www.anomic.de // @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/index/ConcurrentARC.java b/source/net/yacy/kelondro/index/ConcurrentARC.java similarity index 98% rename from source/de/anomic/kelondro/index/ConcurrentARC.java rename to source/net/yacy/kelondro/index/ConcurrentARC.java index 9b4843f98..a44035d2f 100644 --- a/source/de/anomic/kelondro/index/ConcurrentARC.java +++ b/source/net/yacy/kelondro/index/ConcurrentARC.java @@ -23,7 +23,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; /** * This is a simple cache using two generations of hashtables to store the content with a LFU strategy. diff --git a/source/de/anomic/kelondro/index/HandleMap.java b/source/net/yacy/kelondro/index/HandleMap.java similarity index 83% rename from source/de/anomic/kelondro/index/HandleMap.java rename to source/net/yacy/kelondro/index/HandleMap.java index 8fbeddfed..5388ff85d 100644 --- a/source/de/anomic/kelondro/index/HandleMap.java +++ b/source/net/yacy/kelondro/index/HandleMap.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -34,8 +34,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.Iterator; -import java.util.Random; -import java.util.TreeMap; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -46,12 +44,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.CloneableIterator; -import de.anomic.kelondro.util.MemoryControl; -import de.anomic.yacy.dht.FlatWordPartitionScheme; public class HandleMap implements Iterable { @@ -378,51 +373,6 @@ public class HandleMap implements Iterable { return map; } - } - - public static void main(String[] args) { - int count = (args.length == 0) ? 1000000 : Integer.parseInt(args[0]); - System.out.println("Starting test with " + count + " objects"); - System.out.println("expected memory: " + (count * 16) + " bytes"); - System.out.println("available memory: " + MemoryControl.available()); - Random r = new Random(0); - long start = System.currentTimeMillis(); - - System.gc(); // for resource measurement - long a = MemoryControl.available(); - HandleMap idx = new HandleMap(12, Base64Order.enhancedCoder, 4, 0, 150000); - for (int i = 0; i < count; i++) { - idx.inc(FlatWordPartitionScheme.positionToHash(r.nextInt(count))); - } - long timek = ((long) count) * 1000L / (System.currentTimeMillis() - start); - System.out.println("Result HandleMap: " + timek + " inc per second"); - System.gc(); - long memk = a - MemoryControl.available(); - System.out.println("Used Memory: " + memk + " bytes"); - System.out.println("x " + idx.get(FlatWordPartitionScheme.positionToHash(0))); - idx = null; - - r = new Random(0); - start = System.currentTimeMillis(); - byte[] hash; - Integer d; - System.gc(); // for resource measurement - a = MemoryControl.available(); - TreeMap hm = new TreeMap(Base64Order.enhancedCoder); - for (int i = 0; i < count; i++) { - hash = FlatWordPartitionScheme.positionToHash(r.nextInt(count)); - d = hm.get(hash); - if (d == null) hm.put(hash, 1); else hm.put(hash, d + 1); - } - long timej = ((long) count) * 1000L / (System.currentTimeMillis() - start); - System.out.println("Result TreeMap: " + timej + " inc per second"); - System.gc(); - long memj = a - MemoryControl.available(); - System.out.println("Used Memory: " + memj + " bytes"); - System.out.println("x " + hm.get(FlatWordPartitionScheme.positionToHash(0))); - System.out.println("Geschwindigkeitsfaktor j/k: " + ((float) (10 * timej / timek) / 10.0) + " - je kleiner desto besser fuer kelondro"); - System.out.println("Speicherplatzfaktor j/k: " + ((float) (10 * memj / memk) / 10.0) + " - je groesser desto besser fuer kelondro"); - System.exit(0); } public Iterator iterator() { diff --git a/source/de/anomic/kelondro/index/HandleSet.java b/source/net/yacy/kelondro/index/HandleSet.java similarity index 96% rename from source/de/anomic/kelondro/index/HandleSet.java rename to source/net/yacy/kelondro/index/HandleSet.java index 7acf3e8b3..5ad1e5e68 100644 --- a/source/de/anomic/kelondro/index/HandleSet.java +++ b/source/net/yacy/kelondro/index/HandleSet.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/source/de/anomic/kelondro/index/IndexTest.java b/source/net/yacy/kelondro/index/IndexTest.java similarity index 97% rename from source/de/anomic/kelondro/index/IndexTest.java rename to source/net/yacy/kelondro/index/IndexTest.java index 34b3ebf1c..67d2aa3a4 100644 --- a/source/de/anomic/kelondro/index/IndexTest.java +++ b/source/net/yacy/kelondro/index/IndexTest.java @@ -26,7 +26,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.util.HashMap; import java.util.Random; diff --git a/source/de/anomic/kelondro/index/ObjectArray.java b/source/net/yacy/kelondro/index/ObjectArray.java similarity index 93% rename from source/de/anomic/kelondro/index/ObjectArray.java rename to source/net/yacy/kelondro/index/ObjectArray.java index 7af188faf..5dc054247 100644 --- a/source/de/anomic/kelondro/index/ObjectArray.java +++ b/source/net/yacy/kelondro/index/ObjectArray.java @@ -1,4 +1,4 @@ -// kelondroArray.java +// ObjectArray.java // (C) 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 01.06.2006 on http://www.anomic.de // @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.io.IOException; diff --git a/source/de/anomic/kelondro/index/ObjectArrayCache.java b/source/net/yacy/kelondro/index/ObjectArrayCache.java similarity index 99% rename from source/de/anomic/kelondro/index/ObjectArrayCache.java rename to source/net/yacy/kelondro/index/ObjectArrayCache.java index d981102fb..5bccd6afe 100644 --- a/source/de/anomic/kelondro/index/ObjectArrayCache.java +++ b/source/net/yacy/kelondro/index/ObjectArrayCache.java @@ -1,4 +1,4 @@ -// kelondroIntBytesMap.java +// ObjectArrayCache.java // (C) 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 08.06.2006 on http://www.anomic.de // @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.util.ArrayList; import java.util.HashSet; diff --git a/source/de/anomic/kelondro/index/ObjectIndex.java b/source/net/yacy/kelondro/index/ObjectIndex.java similarity index 97% rename from source/de/anomic/kelondro/index/ObjectIndex.java rename to source/net/yacy/kelondro/index/ObjectIndex.java index fd9f277e4..319a9cce4 100644 --- a/source/de/anomic/kelondro/index/ObjectIndex.java +++ b/source/net/yacy/kelondro/index/ObjectIndex.java @@ -1,4 +1,4 @@ -// kelondroIndex.java +// ObjectIndex.java // ------------------ // part of the Kelondro Database // (C) by Michael Peter Christen; mc@yacy.net @@ -29,7 +29,7 @@ kelondroTree and kelondroHashtable */ -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.io.IOException; import java.util.ArrayList; diff --git a/source/de/anomic/kelondro/index/ObjectIndexCache.java b/source/net/yacy/kelondro/index/ObjectIndexCache.java similarity index 99% rename from source/de/anomic/kelondro/index/ObjectIndexCache.java rename to source/net/yacy/kelondro/index/ObjectIndexCache.java index 13895989c..35a9e4c0e 100644 --- a/source/de/anomic/kelondro/index/ObjectIndexCache.java +++ b/source/net/yacy/kelondro/index/ObjectIndexCache.java @@ -1,4 +1,4 @@ -// kelondroRAMIndex.java +// ObjectIndexCache.java // (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 07.01.2008 on http://yacy.net // @@ -22,17 +22,17 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.MergeIterator; import net.yacy.kelondro.order.StackIterator; -import de.anomic.kelondro.index.Row.Entry; public class ObjectIndexCache implements ObjectIndex { diff --git a/source/de/anomic/kelondro/index/Row.java b/source/net/yacy/kelondro/index/Row.java similarity index 99% rename from source/de/anomic/kelondro/index/Row.java rename to source/net/yacy/kelondro/index/Row.java index 6b79ad03c..36ff92dcb 100644 --- a/source/de/anomic/kelondro/index/Row.java +++ b/source/net/yacy/kelondro/index/Row.java @@ -1,4 +1,4 @@ -// kelondroRow.java +// Row.java // (C) 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 24.05.2006 on http://www.anomic.de // @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.io.UnsupportedEncodingException; import java.util.ArrayList; diff --git a/source/de/anomic/kelondro/index/RowCollection.java b/source/net/yacy/kelondro/index/RowCollection.java similarity index 98% rename from source/de/anomic/kelondro/index/RowCollection.java rename to source/net/yacy/kelondro/index/RowCollection.java index 39d563750..bb25ef992 100644 --- a/source/de/anomic/kelondro/index/RowCollection.java +++ b/source/net/yacy/kelondro/index/RowCollection.java @@ -1,4 +1,4 @@ -// kelondroRowCollection.java +// RowCollection.java // (C) 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 12.01.2006 on http://www.anomic.de // @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.io.File; import java.io.IOException; @@ -46,16 +46,16 @@ import de.anomic.kelondro.util.MemoryControl; import de.anomic.kelondro.util.NamePrefixThreadFactory; import de.anomic.kelondro.util.kelondroException; import de.anomic.kelondro.util.FileUtils; -import de.anomic.server.serverProcessor; public class RowCollection implements Iterable { public static final long growfactor100 = 140L; private static final int isortlimit = 20; - static final Integer dummy = 0; + private static int availableCPU = Runtime.getRuntime().availableProcessors(); - public static final ExecutorService sortingthreadexecutor = (serverProcessor.useCPU > 1) ? Executors.newCachedThreadPool(new NamePrefixThreadFactory("sorting")) : null; - public static final ExecutorService partitionthreadexecutor = (serverProcessor.useCPU > 1) ? Executors.newCachedThreadPool(new NamePrefixThreadFactory("partition")) : null; + + public static final ExecutorService sortingthreadexecutor = (availableCPU > 1) ? Executors.newCachedThreadPool(new NamePrefixThreadFactory("sorting")) : null; + public static final ExecutorService partitionthreadexecutor = (availableCPU > 1) ? Executors.newCachedThreadPool(new NamePrefixThreadFactory("partition")) : null; protected byte[] chunkcache; protected int chunkcount; @@ -538,7 +538,7 @@ public class RowCollection implements Iterable { final int p = partition(0, this.chunkcount, this.sortBound, swapspace); if (sortingthreadexecutor != null && !sortingthreadexecutor.isShutdown() && - serverProcessor.useCPU > 1 && + availableCPU > 1 && this.chunkcount > 8000 && p > isortlimit * 5 && this.chunkcount - p > isortlimit * 5 @@ -583,7 +583,7 @@ public class RowCollection implements Iterable { final int p = partition(0, this.chunkcount, this.sortBound, swapspace); if ((sortingthreadexecutor != null) && (!sortingthreadexecutor.isShutdown()) && - (serverProcessor.useCPU > 1) && + (availableCPU > 1) && (this.chunkcount > 4000)) { // sort this using multi-threading final Future part = sortingthreadexecutor.submit(new qsortthread(this, 0, p, 0)); @@ -994,11 +994,11 @@ public class RowCollection implements Iterable { } final long t2 = System.nanoTime(); System.out.println("copy c -> d: " + (t2 - t1) + " nanoseconds, " + d(testsize, (t2 - t1)) + " entries/nanoseconds"); - serverProcessor.useCPU = 1; + availableCPU = 1; c.sort(); final long t3 = System.nanoTime(); System.out.println("sort c (1) : " + (t3 - t2) + " nanoseconds, " + d(testsize, (t3 - t2)) + " entries/nanoseconds"); - serverProcessor.useCPU = 2; + availableCPU = 2; d.sort(); final long t4 = System.nanoTime(); System.out.println("sort d (2) : " + (t4 - t3) + " nanoseconds, " + d(testsize, (t4 - t3)) + " entries/nanoseconds"); diff --git a/source/de/anomic/kelondro/index/RowSet.java b/source/net/yacy/kelondro/index/RowSet.java similarity index 97% rename from source/de/anomic/kelondro/index/RowSet.java rename to source/net/yacy/kelondro/index/RowSet.java index 8ea911270..e3dd26201 100644 --- a/source/de/anomic/kelondro/index/RowSet.java +++ b/source/net/yacy/kelondro/index/RowSet.java @@ -1,4 +1,4 @@ -// kelondroRowSet.java +// RowSet.java // (C) 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 20.06.2006 on http://www.anomic.de // @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.util.Iterator; import java.util.Random; diff --git a/source/de/anomic/kelondro/index/RowSetArray.java b/source/net/yacy/kelondro/index/RowSetArray.java similarity index 98% rename from source/de/anomic/kelondro/index/RowSetArray.java rename to source/net/yacy/kelondro/index/RowSetArray.java index bb6c6b343..785ddf04e 100644 --- a/source/de/anomic/kelondro/index/RowSetArray.java +++ b/source/net/yacy/kelondro/index/RowSetArray.java @@ -19,18 +19,18 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; +import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.MergeIterator; import net.yacy.kelondro.order.StackIterator; -import de.anomic.kelondro.index.Row.Entry; public class RowSetArray implements ObjectIndex, Iterable { diff --git a/source/de/anomic/kelondro/index/SimpleARC.java b/source/net/yacy/kelondro/index/SimpleARC.java similarity index 99% rename from source/de/anomic/kelondro/index/SimpleARC.java rename to source/net/yacy/kelondro/index/SimpleARC.java index bc49eabb8..ddccec17b 100644 --- a/source/de/anomic/kelondro/index/SimpleARC.java +++ b/source/net/yacy/kelondro/index/SimpleARC.java @@ -23,7 +23,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.index; +package net.yacy.kelondro.index; import java.util.LinkedHashMap; import java.util.Map; diff --git a/source/yacy.java b/source/yacy.java index 6c99c4122..2aac6e1cd 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -43,6 +43,7 @@ import java.util.TreeSet; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import net.yacy.kelondro.index.RowCollection; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; @@ -56,7 +57,6 @@ import de.anomic.http.metadata.ResponseContainer; import de.anomic.http.server.HTTPDemon; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapDataMining; -import de.anomic.kelondro.index.RowCollection; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.MetadataRepository;