limit visibility

unused methods removed
min0r refactoring

h2/src/main/org/h2/mvstore/db/MVTableEngine.java

@@ -109,10 +109,7 @@ public class MVTableEngine implements TableEngine {
     public TableBase createTable(CreateTableData data) {
         Database db = data.session.getDatabase();
         Store store = init(db);
-        MVTable table = new MVTable(data, store);
-        table.init(data.session);
-        store.tableMap.put(table.getMapName(), table);
-        return table;
+        return store.createTable(data);
     }
 
     /**
@@ -124,8 +121,8 @@ public class MVTableEngine implements TableEngine {
          * The map of open tables.
          * Key: the map name, value: the table.
          */
-        final ConcurrentHashMap<String, MVTable> tableMap =
-                new ConcurrentHashMap<>();
+        private final ConcurrentHashMap<String, MVTable> tableMap =
+                                                    new ConcurrentHashMap<>();
 
         /**
          * The store.
@@ -152,7 +149,7 @@ public class MVTableEngine implements TableEngine {
          * @param builder the builder
          * @param encrypted whether the store is encrypted
          */
-        void open(Database db, MVStore.Builder builder, boolean encrypted) {
+        private void open(Database db, MVStore.Builder builder, boolean encrypted) {
             this.encrypted = encrypted;
             try {
                 this.store = builder.open();
@@ -166,7 +163,6 @@ public class MVTableEngine implements TableEngine {
                 this.transactionStore = new TransactionStore(
                         store,
                         new ValueDataType(db.getCompareMode(), db, null), db.getLockTimeout());
-//                transactionStore.init();
             } catch (IllegalStateException e) {
                 throw convertIllegalStateException(e);
             }
@@ -195,6 +191,10 @@ public class MVTableEngine implements TableEngine {
                 throw DbException.get(
                         ErrorCode.IO_EXCEPTION_1,
                         e, fileName);
+            } else if (errorCode == DataUtils.ERROR_INTERNAL) {
+                throw DbException.get(
+                        ErrorCode.GENERAL_ERROR_1,
+                        e, fileName);
             }
             throw DbException.get(
                     ErrorCode.FILE_CORRUPTED_1,
@@ -214,6 +214,19 @@ public class MVTableEngine implements TableEngine {
             return tableMap.get(tableName);
         }
 
+        /**
+         * Create a table.
+         *
+         * @param data CreateTableData
+         * @return table created
+         */
+        public MVTable createTable(CreateTableData data) {
+            MVTable table = new MVTable(data, this);
+            table.init(data.session);
+            tableMap.put(table.getMapName(), table);
+            return table;
+        }
+
         /**
          * Remove a table.
          *

h2/src/main/org/h2/mvstore/tx/Transaction.java

@@ -436,7 +436,7 @@ public class Transaction {
         return store.getChanges(this, getLogId(), savepointId);
     }
 
-    long getLogId() {
+    private long getLogId() {
         return getLogId(statusAndLogId.get());
     }
 
@@ -454,7 +454,7 @@ public class Transaction {
     /**
      * Check whether this transaction is open or prepared.
      */
-    void checkNotClosed() {
+    private void checkNotClosed() {
         if (getStatus() == STATUS_CLOSED) {
             throw DataUtils.newIllegalStateException(
                     DataUtils.ERROR_CLOSED, "Transaction {0} is closed", transactionId);

h2/src/main/org/h2/mvstore/tx/TransactionStore.java

@@ -89,11 +89,6 @@ public class TransactionStore {
     private final AtomicReferenceArray<Transaction> transactions =
                                                         new AtomicReferenceArray<>(MAX_OPEN_TRANSACTIONS + 1);
 
-    /**
-     * The next id of a temporary map.
-     */
-    private int nextTempMapId;
-
     private static final String UNDO_LOG_NAME_PEFIX = "undoLog";
     private static final char UNDO_LOG_COMMITTED = '-'; // must come before open in lexicographical order
     private static final char UNDO_LOG_OPEN = '.';
@@ -517,29 +512,6 @@ public class TransactionStore {
         return map;
     }
 
-    /**
-     * Create a temporary map. Such maps are removed when opening the store.
-     *
-     * @return the map
-     */
-    synchronized MVMap<Object, Integer> createTempMap() {
-        String mapName = "temp." + nextTempMapId++;
-        return openTempMap(mapName);
-    }
-
-    /**
-     * Open a temporary map.
-     *
-     * @param mapName the map name
-     * @return the map
-     */
-    private MVMap<Object, Integer> openTempMap(String mapName) {
-        MVMap.Builder<Object, Integer> mapBuilder =
-                new MVMap.Builder<Object, Integer>().
-                keyType(dataType);
-        return store.openMap(mapName, mapBuilder);
-    }
-
     /**
      * End this transaction. Change status to CLOSED and vacate transaction slot.
      * Will try to commit MVStore if autocommitDelay is 0 or if database is idle