]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/engine/Dictionary.java
Optimize v6 file writing.
[Dictionary.git] / src / com / hughes / android / dictionary / engine / Dictionary.java
index 57ae6e73cd5f6c41ed392fa7d2f050eaa4b76251..35c3143606f544e71cc2fd569a9d4e7cc0378d97 100644 (file)
 
 package com.hughes.android.dictionary.engine;
 
-import com.hughes.android.dictionary.DictionaryInfo;
-import com.hughes.util.CachingList;
-import com.hughes.util.StringUtil;
-import com.hughes.util.raf.RAFList;
-import com.hughes.util.raf.RAFListSerializer;
-import com.hughes.util.raf.RAFSerializable;
-
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.DataOutput;
+import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.ObjectOutputStream;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.zip.GZIPOutputStream;
+
+import com.hughes.android.dictionary.DictionaryInfo;
+import com.hughes.util.CachingList;
+import com.hughes.util.raf.RAFList;
+import com.hughes.util.raf.RAFListSerializer;
+import com.hughes.util.raf.RAFSerializable;
 
 public class Dictionary implements RAFSerializable<Dictionary> {
 
-    static final int CACHE_SIZE = 5000;
+    private static final int CACHE_SIZE = 5000;
 
-    static final int CURRENT_DICT_VERSION = 7;
-    static final String END_OF_DICTIONARY = "END OF DICTIONARY";
+    private static final int CURRENT_DICT_VERSION = 7;
+    private static final String END_OF_DICTIONARY = "END OF DICTIONARY";
 
     // persisted
     final int dictFileVersion;
-    final long creationMillis;
+    private final long creationMillis;
     public final String dictInfo;
     public final List<PairEntry> pairEntries;
     public final List<TextEntry> textEntries;
     public final List<HtmlEntry> htmlEntries;
+    public final List<byte[]> htmlData;
     public final List<EntrySource> sources;
     public final List<Index> indices;
 
@@ -57,14 +67,16 @@ public class Dictionary implements RAFSerializable<Dictionary> {
         this.dictFileVersion = CURRENT_DICT_VERSION;
         this.creationMillis = System.currentTimeMillis();
         this.dictInfo = dictInfo;
-        pairEntries = new ArrayList<PairEntry>();
-        textEntries = new ArrayList<TextEntry>();
-        htmlEntries = new ArrayList<HtmlEntry>();
-        sources = new ArrayList<EntrySource>();
-        indices = new ArrayList<Index>();
+        pairEntries = new ArrayList<>();
+        textEntries = new ArrayList<>();
+        htmlEntries = new ArrayList<>();
+        htmlData = null;
+        sources = new ArrayList<>();
+        indices = new ArrayList<>();
     }
 
-    public Dictionary(final RandomAccessFile raf) throws IOException {
+    public Dictionary(final FileChannel ch) throws IOException {
+        DataInput raf = new DataInputStream(Channels.newInputStream(ch));
         dictFileVersion = raf.readInt();
         if (dictFileVersion < 0 || dictFileVersion > CURRENT_DICT_VERSION) {
             throw new IOException("Invalid dictionary version: " + dictFileVersion);
@@ -75,30 +87,33 @@ public class Dictionary implements RAFSerializable<Dictionary> {
         // Load the sources, then seek past them, because reading them later
         // disrupts the offset.
         try {
-            final RAFList<EntrySource> rafSources = RAFList.create(raf, new EntrySource.Serializer(
-                    this), raf.getFilePointer(), dictFileVersion);
-            sources = new ArrayList<EntrySource>(rafSources);
-            raf.seek(rafSources.getEndOffset());
+            final RAFList<EntrySource> rafSources = RAFList.create(ch, new EntrySource.Serializer(
+                    this), ch.position(), dictFileVersion, dictInfo + " sources: ");
+            sources = new ArrayList<>(rafSources);
+            ch.position(rafSources.getEndOffset());
 
             pairEntries = CachingList.create(
-                    RAFList.create(raf, new PairEntry.Serializer(this), raf.getFilePointer(), dictFileVersion, dictFileVersion >= 7 ? 64 : 1, dictFileVersion >= 7),
-                    CACHE_SIZE);
+                              RAFList.create(ch, new PairEntry.Serializer(this), ch.position(), dictFileVersion, dictInfo + " pairs: "),
+                              CACHE_SIZE, false);
             textEntries = CachingList.create(
-                    RAFList.create(raf, new TextEntry.Serializer(this), raf.getFilePointer(), dictFileVersion),
-                    CACHE_SIZE);
+                              RAFList.create(ch, new TextEntry.Serializer(this), ch.position(), dictFileVersion, dictInfo + " text: "),
+                              CACHE_SIZE, true);
             if (dictFileVersion >= 5) {
                 htmlEntries = CachingList.create(
-                        RAFList.create(raf, new HtmlEntry.Serializer(this), raf.getFilePointer(), dictFileVersion),
-                        CACHE_SIZE);
+                                  RAFList.create(ch, new HtmlEntry.Serializer(this, ch), ch.position(), dictFileVersion, dictInfo + " html: "),
+                                  CACHE_SIZE, false);
             } else {
                 htmlEntries = Collections.emptyList();
             }
-            indices = CachingList.createFullyCached(RAFList.create(raf, indexSerializer,
-                    raf.getFilePointer(), dictFileVersion));
+            if (dictFileVersion >= 7) {
+                htmlData = RAFList.create(ch, new HtmlEntry.DataDeserializer(), ch.position(), dictFileVersion, dictInfo + " html: ");
+            } else {
+                htmlData = null;
+            }
+            indices = CachingList.createFullyCached(RAFList.create(ch, new IndexSerializer(ch),
+                                                    ch.position(), dictFileVersion, dictInfo + " index: "));
         } catch (RuntimeException e) {
-            final IOException ioe = new IOException("RuntimeException loading dictionary");
-            ioe.initCause(e);
-            throw ioe;
+            throw new IOException("RuntimeException loading dictionary", e);
         }
         final String end = raf.readUTF();
         if (!end.equals(END_OF_DICTIONARY)) {
@@ -109,6 +124,7 @@ public class Dictionary implements RAFSerializable<Dictionary> {
     @Override
     public void write(DataOutput out) throws IOException {
         RandomAccessFile raf = (RandomAccessFile)out;
+        if (dictFileVersion < 7) throw new RuntimeException("write function cannot write formats older than v7!");
         raf.writeInt(dictFileVersion);
         raf.writeLong(creationMillis);
         raf.writeUTF(dictInfo);
@@ -118,32 +134,316 @@ public class Dictionary implements RAFSerializable<Dictionary> {
         RAFList.write(raf, pairEntries, new PairEntry.Serializer(this), 64, true);
         System.out.println("text start: " + raf.getFilePointer());
         RAFList.write(raf, textEntries, new TextEntry.Serializer(this));
-        System.out.println("html start: " + raf.getFilePointer());
-        RAFList.write(raf, htmlEntries, new HtmlEntry.Serializer(this));
+        System.out.println("html index start: " + raf.getFilePointer());
+        RAFList.write(raf, htmlEntries, new HtmlEntry.Serializer(this, null), 64, true);
+        System.out.println("html data start: " + raf.getFilePointer());
+        assert htmlData == null;
+        RAFList.write(raf, htmlEntries, new HtmlEntry.DataSerializer(), 128, true);
+        System.out.println("indices start: " + raf.getFilePointer());
+        RAFList.write(raf, indices, new IndexSerializer(null));
+        System.out.println("end: " + raf.getFilePointer());
+        raf.writeUTF(END_OF_DICTIONARY);
+    }
+
+    private void writev6Sources(RandomAccessFile out) throws IOException {
+        ByteArrayOutputStream toc = new ByteArrayOutputStream();
+        DataOutputStream tocout = new DataOutputStream(toc);
+
+        out.writeInt(sources.size());
+        long tocPos = out.getFilePointer();
+        out.seek(tocPos + sources.size() * 8 + 8);
+        for (EntrySource s : sources) {
+            long dataPos = out.getFilePointer();
+            tocout.writeLong(dataPos);
+
+            out.writeUTF(s.getName());
+            out.writeInt(s.getNumEntries());
+        }
+        long dataPos = out.getFilePointer();
+        tocout.writeLong(dataPos);
+        tocout.close();
+
+        out.seek(tocPos);
+        out.write(toc.toByteArray());
+        out.seek(dataPos);
+    }
+
+    private void writev6PairEntries(RandomAccessFile out) throws IOException {
+        ByteArrayOutputStream toc = new ByteArrayOutputStream();
+        DataOutputStream tocout = new DataOutputStream(toc);
+
+        long tocPos = out.getFilePointer();
+        long dataPos = tocPos + 4 + pairEntries.size() * 8 + 8;
+
+        out.seek(dataPos);
+        DataOutputStream outb = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(out.getFD())));
+
+        tocout.writeInt(pairEntries.size());
+        for (PairEntry pe : pairEntries) {
+            tocout.writeLong(dataPos + outb.size());
+
+            outb.writeShort(pe.entrySource.index());
+            outb.writeInt(pe.pairs.size());
+            for (PairEntry.Pair p : pe.pairs) {
+                outb.writeUTF(p.lang1);
+                outb.writeUTF(p.lang2);
+            }
+        }
+        dataPos += outb.size();
+        outb.flush();
+        tocout.writeLong(dataPos);
+        tocout.close();
+
+        out.seek(tocPos);
+        out.write(toc.toByteArray());
+        out.seek(dataPos);
+    }
+
+    private void writev6TextEntries(RandomAccessFile out) throws IOException {
+        ByteArrayOutputStream toc = new ByteArrayOutputStream();
+        DataOutputStream tocout = new DataOutputStream(toc);
+
+        out.writeInt(textEntries.size());
+        long tocPos = out.getFilePointer();
+        out.seek(tocPos + textEntries.size() * 8 + 8);
+        for (TextEntry t : textEntries) {
+            long dataPos = out.getFilePointer();
+            tocout.writeLong(dataPos);
+
+            out.writeShort(t.entrySource.index());
+            out.writeUTF(t.text);
+        }
+        long dataPos = out.getFilePointer();
+        tocout.writeLong(dataPos);
+        tocout.close();
+
+        out.seek(tocPos);
+        out.write(toc.toByteArray());
+        out.seek(dataPos);
+    }
+
+    private void writev6EmptyList(RandomAccessFile out) throws IOException {
+        out.writeInt(0);
+        out.writeLong(out.getFilePointer() + 8);
+    }
+
+    private void writev6HtmlEntries(RandomAccessFile out) throws IOException {
+        ByteArrayOutputStream toc = new ByteArrayOutputStream();
+        DataOutputStream tocout = new DataOutputStream(toc);
+
+        long tocPos = out.getFilePointer();
+        long dataPos = tocPos + 4 + htmlEntries.size() * 8 + 8;
+
+        out.seek(dataPos);
+        DataOutputStream outb = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(out.getFD())));
+
+        tocout.writeInt(htmlEntries.size());
+        for (HtmlEntry h : htmlEntries) {
+            tocout.writeLong(dataPos + outb.size());
+
+            outb.writeShort(h.entrySource.index());
+            outb.writeUTF(h.title);
+            byte[] data = h.getHtml().getBytes(StandardCharsets.UTF_8);
+            outb.writeInt(data.length);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            GZIPOutputStream gzout = new GZIPOutputStream(baos);
+            gzout.write(data);
+            gzout.close();
+            outb.writeInt(baos.size());
+            outb.write(baos.toByteArray());
+        }
+        dataPos += outb.size();
+        outb.flush();
+        tocout.writeLong(dataPos);
+        tocout.close();
+
+        out.seek(tocPos);
+        out.write(toc.toByteArray());
+        out.seek(dataPos);
+    }
+
+    private void writev6HtmlIndices(DataOutputStream out, long pos, List<HtmlEntry> entries) throws IOException {
+        long dataPos = pos + 4 + entries.size() * 8 + 8;
+
+        out.writeInt(entries.size());
+
+        // TOC is trivial, so optimize writing it
+        for (int i = 0; i < entries.size(); i++) {
+            out.writeLong(dataPos);
+            dataPos += 4;
+        }
+        out.writeLong(dataPos);
+
+        for (HtmlEntry e : entries) {
+            out.writeInt(e.index());
+        }
+    }
+
+    private void writev6IndexEntries(RandomAccessFile out, List<Index.IndexEntry> entries, int[] prunedRowIdx) throws IOException {
+        ByteArrayOutputStream toc = new ByteArrayOutputStream();
+        DataOutputStream tocout = new DataOutputStream(toc);
+
+        long tocPos = out.getFilePointer();
+        long dataPos = tocPos + 4 + entries.size() * 8 + 8;
+
+        out.seek(dataPos);
+        DataOutputStream outb = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(out.getFD())));
+
+        tocout.writeInt(entries.size());
+        for (Index.IndexEntry e : entries) {
+            tocout.writeLong(dataPos + outb.size());
+
+            outb.writeUTF(e.token);
+
+            int startRow = e.startRow;
+            int numRows = e.numRows;
+            if (prunedRowIdx != null) {
+                // note: the start row will always be a TokenRow
+                // and thus never be pruned
+                int newNumRows = 1;
+                for (int i = 1; i < numRows; i++) {
+                    if (prunedRowIdx[startRow + i] >= 0) newNumRows++;
+                }
+                startRow = prunedRowIdx[startRow];
+                numRows = newNumRows;
+            }
+
+            outb.writeInt(startRow);
+            outb.writeInt(numRows);
+            final boolean hasNormalizedForm = !e.token.equals(e.normalizedToken());
+            outb.writeBoolean(hasNormalizedForm);
+            if (hasNormalizedForm) outb.writeUTF(e.normalizedToken());
+            writev6HtmlIndices(outb, dataPos + outb.size(),
+                               prunedRowIdx == null ? e.htmlEntries : Collections.<HtmlEntry>emptyList());
+        }
+        dataPos += outb.size();
+        outb.flush();
+        tocout.writeLong(dataPos);
+        tocout.close();
+
+        out.seek(tocPos);
+        out.write(toc.toByteArray());
+        out.seek(dataPos);
+    }
+
+    private void writev6Index(RandomAccessFile out, boolean skipHtml) throws IOException {
+        ByteArrayOutputStream toc = new ByteArrayOutputStream();
+        DataOutputStream tocout = new DataOutputStream(toc);
+
+        out.writeInt(indices.size());
+        long tocPos = out.getFilePointer();
+        out.seek(tocPos + indices.size() * 8 + 8);
+        for (Index idx : indices) {
+            // create pruned index for skipHtml feature
+            int[] prunedRowIdx = null;
+            int prunedSize = 0;
+            if (skipHtml) {
+                prunedRowIdx = new int[idx.rows.size()];
+                for (int i = 0; i < idx.rows.size(); i++) {
+                    final RowBase r = idx.rows.get(i);
+                    // prune Html entries
+                    boolean pruned = r instanceof HtmlEntry.Row;
+                    prunedRowIdx[i] = pruned ? -1 : prunedSize;
+                    if (!pruned) prunedSize++;
+                }
+            }
+
+            long dataPos = out.getFilePointer();
+            tocout.writeLong(dataPos);
+
+            out.writeUTF(idx.shortName);
+            out.writeUTF(idx.longName);
+            out.writeUTF(idx.sortLanguage.getIsoCode());
+            out.writeUTF(idx.normalizerRules);
+            out.writeBoolean(idx.swapPairEntries);
+            out.writeInt(idx.mainTokenCount);
+            writev6IndexEntries(out, idx.sortedIndexEntries, prunedRowIdx);
+
+            // write stoplist, serializing the whole Set *shudder*
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            final ObjectOutputStream oos = new ObjectOutputStream(baos);
+            oos.writeObject(idx.stoplist);
+            oos.close();
+            final byte[] bytes = baos.toByteArray();
+
+
+            DataOutputStream outb = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(out.getFD())));
+            outb.writeInt(bytes.length);
+            outb.write(bytes);
+
+            outb.writeInt(skipHtml ? prunedSize : idx.rows.size());
+            outb.writeInt(5);
+            for (RowBase r : idx.rows) {
+                int type = 0;
+                if (r instanceof PairEntry.Row) {
+                    type = 0;
+                } else if (r instanceof TokenRow) {
+                    final TokenRow tokenRow = (TokenRow)r;
+                    type = tokenRow.hasMainEntry ? 1 : 3;
+                } else if (r instanceof TextEntry.Row) {
+                    type = 2;
+                } else if (r instanceof HtmlEntry.Row) {
+                    type = 4;
+                    if (skipHtml) continue;
+                } else {
+                    throw new RuntimeException("Row type not supported for v6");
+                }
+                outb.writeByte(type);
+                outb.writeInt(r.referenceIndex);
+            }
+            outb.flush();
+        }
+        long dataPos = out.getFilePointer();
+        tocout.writeLong(dataPos);
+        tocout.close();
+
+        out.seek(tocPos);
+        out.write(toc.toByteArray());
+        out.seek(dataPos);
+    }
+
+    public void writev6(DataOutput out, boolean skipHtml) throws IOException {
+        RandomAccessFile raf = (RandomAccessFile)out;
+        raf.writeInt(6);
+        raf.writeLong(creationMillis);
+        raf.writeUTF(dictInfo);
+        System.out.println("sources start: " + raf.getFilePointer());
+        writev6Sources(raf);
+        System.out.println("pair start: " + raf.getFilePointer());
+        writev6PairEntries(raf);
+        System.out.println("text start: " + raf.getFilePointer());
+        writev6TextEntries(raf);
+        System.out.println("html index start: " + raf.getFilePointer());
+        if (skipHtml) writev6EmptyList(raf);
+        else writev6HtmlEntries(raf);
         System.out.println("indices start: " + raf.getFilePointer());
-        RAFList.write(raf, indices, indexSerializer);
+        writev6Index(raf, skipHtml);
         System.out.println("end: " + raf.getFilePointer());
         raf.writeUTF(END_OF_DICTIONARY);
     }
 
-    private final RAFListSerializer<Index> indexSerializer = new RAFListSerializer<Index>() {
+    private final class IndexSerializer implements RAFListSerializer<Index> {
+        private final FileChannel ch;
+
+        IndexSerializer(FileChannel ch) {
+            this.ch = ch;
+        }
+
         @Override
         public Index read(DataInput raf, final int readIndex) throws IOException {
-            return new Index(Dictionary.this, raf);
+            return new Index(Dictionary.this, ch, raf);
         }
 
         @Override
         public void write(DataOutput raf, Index t) throws IOException {
             t.write(raf);
         }
-    };
+    }
 
     final RAFListSerializer<HtmlEntry> htmlEntryIndexSerializer = new RAFListSerializer<HtmlEntry>() {
         @Override
-        public void write(DataOutput raf, HtmlEntry t) throws IOException {
-            if (t.index() == -1)
-                throw new IndexOutOfBoundsException();
-            raf.writeInt(t.index());
+        public void write(DataOutput raf, HtmlEntry t) {
+            assert false;
         }
 
         @Override
@@ -179,14 +479,17 @@ public class Dictionary implements RAFSerializable<Dictionary> {
         RandomAccessFile raf = null;
         try {
             raf = new RandomAccessFile(file, "r");
-            final Dictionary dict = new Dictionary(raf);
+            final Dictionary dict = new Dictionary(raf.getChannel());
             final DictionaryInfo dictionaryInfo = dict.getDictionaryInfo();
             dictionaryInfo.uncompressedFilename = file.getName();
             dictionaryInfo.uncompressedBytes = file.length();
             raf.close();
             return dictionaryInfo;
         } catch (IOException e) {
-            return null;
+            final DictionaryInfo dictionaryInfo = new DictionaryInfo();
+            dictionaryInfo.uncompressedFilename = file.getName();
+            dictionaryInfo.uncompressedBytes = file.length();
+            return dictionaryInfo;
         } finally {
             if (raf != null) {
                 try {