moved kelondro index

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6393 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 16 years ago
parent 4446acc8cd
commit 194da25a2f

@ -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;

@ -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;

@ -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;

@ -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;

@ -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 {

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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 {

@ -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;

@ -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;

@ -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;

@ -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 {

@ -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:

@ -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;

@ -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;

@ -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;
/**

@ -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;

@ -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 {

@ -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;

@ -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 {

@ -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;

@ -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<ReferenceType extends Reference> {

@ -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<ReferenceType extends Reference> extends AbstractIndex<ReferenceType> implements Index<ReferenceType>, IndexReader<ReferenceType>, Iterable<ReferenceContainer<ReferenceType>> {

@ -26,7 +26,7 @@
package de.anomic.kelondro.text;
import de.anomic.kelondro.index.Row;
import net.yacy.kelondro.index.Row;
public interface ReferenceFactory<ReferenceType extends Reference> {

@ -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;

@ -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;

@ -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 {

@ -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<NavigationReference> {

@ -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;

@ -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;

@ -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<WordReference> {

@ -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;

@ -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;

@ -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 {

@ -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 {

@ -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;

@ -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;

@ -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;

@ -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;
/**
@ -93,4 +98,50 @@ public class FlatWordPartitionScheme implements PartitionScheme {
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<byte[], Integer> hm = new TreeMap<byte[], Integer>(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);
}
}

@ -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;

@ -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;

@ -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;

@ -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;

@ -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.

@ -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;

@ -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;

@ -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;

@ -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.

@ -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<Row.Entry> {
@ -380,51 +375,6 @@ public class HandleMap implements Iterable<Row.Entry> {
}
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<byte[], Integer> hm = new TreeMap<byte[], Integer>(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<Row.Entry> iterator() {
return this.rows(true, null);
}

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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 {

@ -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;

@ -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<Row.Entry> {
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<Row.Entry> {
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<Row.Entry> {
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<Object> part = sortingthreadexecutor.submit(new qsortthread(this, 0, p, 0));
@ -994,11 +994,11 @@ public class RowCollection implements Iterable<Row.Entry> {
}
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");

@ -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;

@ -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<Row.Entry> {

@ -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;

@ -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;

Loading…
Cancel
Save