3871_1.patch

Sergey Ivanovskiy, 10/09/2019 08:49 AM

     ** 050 CA  20190905          The data file is not mapped to memory, but to a byte buffer.  This
     **                           allows very large dump files to be imported, without limitations from
     **                           the physical memory.
     ** 051 SBI 20191008          Added the source converter for one byte encodings, set the source
     **                           encoding.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
     import java.io.*;
     import java.lang.InstantiationException;
     import java.lang.reflect.*;
     import java.nio.charset.*;
     import java.sql.*;
     import java.util.*;
     import java.util.logging.*;
     import com.goldencode.p2j.util.*;
     import com.goldencode.p2j.util.ErrorManager;
     import org.hibernate.*;
     import org.hibernate.cfg.*;
     import org.hibernate.dialect.*;
     import org.hibernate.service.*;
     import org.hibernate.type.*;
     import org.hibernate.type.Type;
     import com.goldencode.p2j.pattern.*;
     import com.goldencode.p2j.persist.*;
     import com.goldencode.p2j.persist.type.*;
-...
                    // Open a new session and begin a transaction.
                    session = openSession();
                    Transaction tx = session.beginTransaction();
                    // Read up to batchSize records from input file.
-...
           /** The date format  as it was set when the table was dumped. */
           private String dateFormat = null;
           /** The import source charset converter */
           private CharsetConverter charsetConverter;
           /**
            * Constructor.
+           *
-...
                 // If any IO issue would occur, it should have happened in the super c'tor.
                 ErrorManager.recordOrThrowError(98, "Unable to open file:" + filename + ".");
+             }
              if (isSourceConversionRequired())
+             {
                 charsetConverter = createSourceCharsetConverter();
+             }
              else
+             {
                 charsetConverter = null;
+             }
+          }
           /**
-...
+          }
           /**
            * Returns the charset converter.
+           *
            * @return   The charset converter
            */
           protected CharsetConverter getCharsetConverter()
+          {
              if (charsetConverter != null)
+             {
                 return charsetConverter;
+             }
              return super.getCharsetConverter();
+          }
           /**
            * Reads the PSC footer, storing the key/values pairs in private map pscHeader.
+           *
            * @return  The number of PSC records actually read. If negative, the footer could not
-...
              encoding    = getMetadata("cpstream");    // eg. ISO8859-15
              // cc = new CharsetConverter(encoding);
              setConvertSource(encoding);
              ldbname     = getMetadata("ldbname");     // eg. p2j_test
              timestamp   = getMetadata("timestamp");   // eg. 2013/06/07-09:57:02

     ** 019 ECF 20171026          Added write(byte[], int, int) method.
     ** 020 EVL 20180620          Adding pulse on close for empty frames.
     ** 021 CA  20190905          Allow byte buffer instead of memory buffers for read-only files.
     ** 022 SBI 20191008          Added getCharsetConverter(), createSourceCharsetConverter() and
     **                           isSourceConversionRequired().
     */
     /*
-...
     import java.io.*;
     import java.nio.*;
     import java.nio.channels.*;
     import java.nio.charset.*;
     /**
      * A stream class supporting input and output semantics for any file-like
-...
+       }
        /**
         * Returns the charset converter.
+        *
         * @return   The charset converter
         */
        protected CharsetConverter getCharsetConverter()
+       {
           return cc;
+       }
        /**
         * Creates the source charset converter if the source code page is one byte encoding, otherwise
         * returns null value.
+        *
         * @return   The source charset converter
         */
        protected CharsetConverter createSourceCharsetConverter()
+       {
           CharsetConverter charsetConverter;
           try
+          {
              Charset charset = Charset.forName(sourceCp);
              if (charset.newEncoder().maxBytesPerChar() == 1)
+             {
                 charsetConverter = new CharsetConverter(sourceCp);
+             }
              else
+             {
                 charsetConverter = null;
+             }
+          }
           catch(IllegalArgumentException | UnsupportedOperationException e)
+          {
              charsetConverter = null;
+          }
           return charsetConverter;
+       }
        /**
         * Tests if the source conversion is required such that if the code page is not equal to
         * the default code page.
+        *
         * @return   true if the source conversion is required, otherwise false.
         */
        protected boolean isSourceConversionRequired()
+       {
           Charset cs = Charset.forName(sourceCp);
           return !Charset.defaultCharset().equals(cs);
+       }
        /**
         * Write a byte to the buffer, flushing if the buffer is full.
+        *
         * @param    b
-...
           if (convert && ch >= 0)
+          {
              ch = cc.toChar(ch);
              ch = getCharsetConverter().toChar(ch);
+          }
           return ch;

Project

General

Profile

FWD » Core Development » Database

3871_1.patch