Fixed bug #2557 (closing database within transaction)

1 files changed, 0 insertions, 622 deletions

diff --git a/java/src/Freeze/SharedDb.java b/java/src/Freeze/SharedDb.java
deleted file mode 100755
index b8fa5eaad2c..00000000000
--- a/java/src/Freeze/SharedDb.java
+++ /dev/null
@@ -1,622 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package Freeze;
-
-class SharedDb
-{
-    public static SharedDb
-    get(ConnectionI connection, String dbName, String key, String value, 
-        Map.Index[] indices, boolean createDb, java.util.Comparator comparator,
-        java.util.Map indexComparators)
-    {
-        MapKey mapKey = new MapKey(connection.envName(), connection.communicator(), dbName);
-
-        if(dbName.equals(Util.catalogName()))
-        {
-            //
-            // We don't want to lock the _map to retrieve the catalog
-            //
-            SharedDb result = connection.dbEnv().getCatalog();
-            checkTypes(result, key, value);
-            result._refCount++;
-            return result;
-        }
-        else if(dbName.equals(Util.catalogIndexListName()))
-        {
-            SharedDb result = connection.dbEnv().getCatalogIndexList();
-            checkTypes(result, key, value);
-            result._refCount++;
-            return result;
-        }
-
-        synchronized(_map) 
-        {
-            SharedDb result = (SharedDb)_map.get(mapKey);
-            if(result == null)
-            {
-                ConnectionI insertConnection = (ConnectionI)Util.createConnection(mapKey.communicator, mapKey.envName);
-
-                try
-                {
-                    result = new SharedDb(mapKey, key, value, insertConnection, 
-                                          indices, createDb, comparator, indexComparators);
-                }
-                finally
-                {
-                    insertConnection.close();
-                }
-
-                Object previousValue = _map.put(mapKey, result);
-                assert(previousValue == null);
-                result._inMap = true;
-            }
-            else
-            {
-                checkTypes(result, key, value);
-                result.connectIndices(indices);
-                result._refCount++;
-            }
-            return result;
-        }
-    }
-
-    public static SharedDb
-    create(ConnectionI connection, String dbName, String key, String value, 
-           Map.Index[] indices, java.util.Comparator comparator,
-           java.util.Map indexComparators)
-    {
-
-        MapKey mapKey = new MapKey(connection.envName(), connection.communicator(), dbName);
-
-        return new SharedDb(mapKey, key, value, connection, 
-                            indices, true, comparator, indexComparators);
-       
-    }
-        
-    public static SharedDb[]
-    openCatalogs(SharedDbEnv dbEnv)
-    {
-        MapKey catalogMapKey = new MapKey(dbEnv.getEnvName(), dbEnv.getCommunicator(), Util.catalogName());
-        MapKey catalogIndexListMapKey = 
-            new MapKey(dbEnv.getEnvName(), dbEnv.getCommunicator(), Util.catalogIndexListName());
-
-        synchronized(_map) 
-        {
-            SharedDb[] result = new SharedDb[2];
-
-            if(_map.get(catalogMapKey) != null)
-            {
-                throw new DatabaseException(errorPrefix(catalogMapKey) + "Catalog already opened");
-            }
-
-            if(_map.get(catalogIndexListMapKey) != null)
-            {
-                throw new DatabaseException(errorPrefix(catalogIndexListMapKey) + "Catalog already opened");
-            }
-
-            try
-            {
-                result[0] = new SharedDb(catalogMapKey, "string", "::Freeze::CatalogData", dbEnv.getEnv());
-            }
-            catch(com.sleepycat.db.DatabaseException dx)
-            {
-                DatabaseException ex = new DatabaseException(errorPrefix(catalogMapKey) 
-                                                             + "creation: " + dx.getMessage());
-                ex.initCause(dx);
-                throw ex;
-            }
-
-            try
-            {
-                result[1] = new SharedDb(catalogIndexListMapKey, "string", "::Ice::StringSeq", dbEnv.getEnv());
-            }
-            catch(com.sleepycat.db.DatabaseException dx)
-            {
-                DatabaseException ex = new DatabaseException(errorPrefix(catalogIndexListMapKey) 
-                                                             + "creation: " + dx.getMessage());
-                ex.initCause(dx);
-                throw ex;
-            }
-
-            Object previousValue = _map.put(catalogMapKey, result[0]);
-            assert(previousValue == null);
-            result[0]._inMap = true;
-            previousValue = _map.put(catalogIndexListMapKey, result[1]);
-            assert(previousValue == null);
-            result[1]._inMap = true;
-
-            return result;
-        }
-    }
-
-    public com.sleepycat.db.Database
-    db()
-    {
-        return _db;
-    }
-
-    public String 
-    dbName()
-    {
-        return _mapKey.dbName;
-    }
-
-    public void
-    close()
-    {
-        synchronized(_map) 
-        {
-            if(--_refCount == 0)
-            {
-
-                if(_inMap)
-                {
-                    //
-                    // Remove from map
-                    //
-
-                    Object value = _map.remove(_mapKey);
-                    assert(value == this);
-                }
-
-                if(_trace >= 1)
-                {
-                    _mapKey.communicator.getLogger().trace("Freeze.Map", "closing Db \"" + _mapKey.dbName + "\"");
-                }
-
-                //
-                // Keep lock to prevent somebody else from re-opening this Db
-                // before it's closed.
-                //
-                try
-                {
-                    cleanupIndices();
-                   
-                    _db.close();
-                }
-                catch(com.sleepycat.db.DatabaseException dx)
-                {
-                    DatabaseException ex = new DatabaseException();
-                    ex.initCause(dx);
-                    ex.message = errorPrefix(_mapKey) + "close: " + dx.getMessage();
-                    throw ex;
-                }
-            }
-        }
-    }
-
-    protected void 
-    finalize()
-    {
-        assert(_refCount == 0);
-    }
-
-    private SharedDb(MapKey mapKey, String key, String value, ConnectionI connection, Map.Index[] indices,
-                     boolean createDb, java.util.Comparator comparator, java.util.Map indexComparators)
-    {   
-        _mapKey = mapKey;
-        _indices = indices;
-        _trace = connection.trace();
-
-      
-        Catalog catalog = new Catalog(connection, Util.catalogName(), true);
-        CatalogData catalogData = (CatalogData)catalog.get(_mapKey.dbName);
-        if(catalogData != null)
-        {
-            if(catalogData.evictor)
-            {
-                DatabaseException ex = new DatabaseException();
-                ex.message = errorPrefix(_mapKey) + "is not an evictor";
-                throw ex;
-            }
-            _key = catalogData.key;
-            _value = catalogData.value;
-            checkTypes(this, key, value);
-        }
-        else
-        {
-            _key = key;
-            _value = value;
-        }
-            
-        com.sleepycat.db.DatabaseConfig config = new com.sleepycat.db.DatabaseConfig();
-           
-           
-        config.setAllowCreate(createDb);
-        config.setType(com.sleepycat.db.DatabaseType.BTREE);
-
-        if(comparator != null)
-        {
-            config.setBtreeComparator(comparator);
-        }
-        Ice.Properties properties = _mapKey.communicator.getProperties();
-        String propPrefix = "Freeze.Map." + _mapKey.dbName + ".";
-                
-        int btreeMinKey = properties.getPropertyAsInt(propPrefix + "BtreeMinKey");
-        if(btreeMinKey > 2)
-        {
-            if(_trace >= 1)
-            {
-                _mapKey.communicator.getLogger().trace(
-                    "Freeze.Map", "Setting \"" + _mapKey.dbName + "\"'s btree minkey to " + btreeMinKey);
-            }
-            config.setBtreeMinKey(btreeMinKey);
-        }
-                
-        boolean checksum = properties.getPropertyAsInt(propPrefix + "Checksum") > 0;
-        if(checksum)
-        {
-            if(_trace >= 1)
-            {
-                _mapKey.communicator.getLogger().trace(
-                    "Freeze.Map", "Turning checksum on for \"" + _mapKey.dbName + "\"");
-            }
-                    
-            config.setChecksum(true);
-        }
-                
-        int pageSize = properties.getPropertyAsInt(propPrefix + "PageSize");
-        if(pageSize > 0)
-        {
-            if(_trace >= 1)
-            {
-                _mapKey.communicator.getLogger().trace(
-                    "Freeze.Map", "Setting \"" + _mapKey.dbName + "\"'s pagesize to " + pageSize);
-            }
-            config.setPageSize(pageSize);
-        }
-
-        if(_trace >= 1)
-        {
-            _mapKey.communicator.getLogger().trace("Freeze.Map", "opening Db \"" + _mapKey.dbName + "\"");
-        }
-
-        Transaction tx = connection.currentTransaction();
-        boolean ownTx = (tx == null);
-
-        for(;;)
-        {
-            try
-            {
-                if(ownTx)
-                {
-                    tx = null;
-                    tx = connection.beginTransaction();
-                }
-                   
-                com.sleepycat.db.Transaction txn = Util.getTxn(tx);
-    
-                _db = connection.dbEnv().getEnv().openDatabase(txn, mapKey.dbName, null, config);
-                    
-                String[] oldIndices = null;
-                java.util.List<String> newIndices = new java.util.LinkedList<String>();
-                    
-                CatalogIndexList catalogIndexList = new CatalogIndexList(connection, Util.catalogIndexListName(), true);
-                    
-                if(createDb)
-                {
-                    oldIndices = (String[])catalogIndexList.get(_mapKey.dbName);
-                }
-                    
-                    
-                if(_indices != null)
-                {
-                    for(int i = 0; i < _indices.length; ++i)
-                    {
-                        String indexName = _indices[i].name();
-                            
-                        java.util.Comparator indexComparator = null;
-                        if(indexComparators != null)
-                        {
-                            indexComparator = (java.util.Comparator)indexComparators.get(indexName);
-                        }
-                            
-                        _indices[i].associate(mapKey.dbName, _db, txn, createDb, indexComparator);
-                            
-                        if(createDb)
-                        {
-                            if(oldIndices != null)
-                            {
-                                int j = java.util.Arrays.asList(oldIndices).indexOf(indexName);
-                                if(j != -1)
-                                {
-                                    oldIndices[j] = null;
-                                }
-                            }
-                            newIndices.add(indexName);
-                        }
-                    }
-                }
-                    
-                if(catalogData == null)
-                {
-                    catalogData = new CatalogData();
-                    catalogData.evictor = false;
-                    catalogData.key = key;
-                    catalogData.value = value;
-                    catalog.put(_mapKey.dbName, catalogData);
-                }
-                    
-                if(createDb)
-                {
-                    boolean indexRemoved = false;
-                        
-                    if(oldIndices != null)
-                    {
-                        //
-                        // Remove old indices and write the new ones
-                        //
-                        for(int i = 0; i < oldIndices.length; ++i)
-                        {
-                            String index = oldIndices[i];
-                            if(index != null)
-                            {
-                                if(_trace >= 1)
-                                {
-                                    _mapKey.communicator.getLogger().trace(
-                                        "Freeze.Map", "removing old index \"" + index + "\" on Db \"" +  _mapKey.dbName + "\"");
-                                }
-                                    
-                                indexRemoved = true;
-                                    
-                                try
-                                {
-                                    connection.removeMapIndex(mapKey.dbName, index);
-                                }
-                                catch(IndexNotFoundException ife)
-                                {
-                                    // Ignored
-                                        
-                                    if(_trace >= 1)
-                                    {
-                                        _mapKey.communicator.getLogger().trace(
-                                            "Freeze.Map", "index \"" + index + "\" on Db \"" + _mapKey.dbName + "\" does not exist");
-                                    }
-                                }
-                            }
-                        }
-                    }
-                        
-                    int oldSize = oldIndices == null ? 0 : oldIndices.length;
-                        
-                    if(indexRemoved || newIndices.size() != oldSize)
-                    {   
-                        if(newIndices.size() == 0)
-                        {
-                            catalogIndexList.remove(_mapKey.dbName);
-                            if(_trace >= 1)
-                            {
-                                _mapKey.communicator.getLogger().trace(
-                                    "Freeze.Map", "Removed catalogIndexList entry for Db \"" + _mapKey.dbName + "\"");
-                            }
-                                
-                        }
-                        else
-                        {
-                            catalogIndexList.put(_mapKey.dbName, newIndices.toArray(new String[0]));
-                            if(_trace >= 1)
-                            {
-                                _mapKey.communicator.getLogger().trace(
-                                    "Freeze.Map", "Updated catalogIndexList entry for Db \"" + _mapKey.dbName + "\"");
-                            }
-                        }
-                    }
-                }
-
-                if(ownTx)
-                {
-                    try
-                    {
-                        tx.commit();
-                    }
-                    finally
-                    {
-                        tx = null;
-                    }
-                }
-                break; // for(;;)
-                
-                //
-                // TODO: FREEZE_DB_MODE
-                //
-            }
-            catch(java.io.FileNotFoundException dx)
-            {
-                cleanupIndices();
-                NotFoundException ex = new NotFoundException();
-                ex.initCause(dx);
-                ex.message = errorPrefix(_mapKey) + "Db.open: " + dx.getMessage();
-                throw ex;
-            }
-            catch(com.sleepycat.db.DeadlockException dx)
-            {
-                if(ownTx)
-                { 
-                    if(connection.deadlockWarning())
-                    {
-                        connection.communicator().getLogger().warning(
-                            "Deadlock in Freeze.Shared.Shared on Db \"" 
-                            + mapKey.dbName + "\"; retrying ...");
-                    }
-                    tx = null;
-                }
-                else
-                {
-                    cleanupIndices();
-                    DeadlockException ex = new DeadlockException(errorPrefix(_mapKey) + "Db.open: " + dx.getMessage(), tx);
-                    ex.initCause(dx);
-                    throw ex;
-                }
-            }
-            catch(com.sleepycat.db.DatabaseException dx)
-            {
-                cleanupIndices();
-                DatabaseException ex = new DatabaseException();
-                ex.initCause(dx);
-                ex.message = errorPrefix(_mapKey) + "Db.open: " + dx.getMessage();
-                throw ex;
-            }
-            finally
-            {
-                if(ownTx && tx != null)
-                {
-                    try
-                    {
-                        tx.rollback();
-                    }
-                    catch(DatabaseException de)
-                    {
-                    }
-                }
-            }
-        }
-        _refCount = 1;
-    }
- 
-
-    private SharedDb(MapKey mapKey, String key, String value, com.sleepycat.db.Environment dbEnv)
-        throws com.sleepycat.db.DatabaseException
-    {   
-        _mapKey = mapKey;
-        _key = key;
-        _value = value;
-        _trace = _mapKey.communicator.getProperties().getPropertyAsInt("Freeze.Trace.Map");
-        
-        if(_trace >= 1)
-        {
-            _mapKey.communicator.getLogger().trace("Freeze.Map", "opening Db \"" + _mapKey.dbName + "\"");
-        }
-
-        com.sleepycat.db.DatabaseConfig config = new com.sleepycat.db.DatabaseConfig();
-        config.setAllowCreate(true);
-        config.setType(com.sleepycat.db.DatabaseType.BTREE);
-        config.setTransactional(true);
-
-        try
-        {
-            _db = dbEnv.openDatabase(null, mapKey.dbName, null, config);
-        }
-        catch(java.io.FileNotFoundException dx)
-        {
-            //
-            // This should never happen
-            //
-            NotFoundException ex = new NotFoundException();
-            ex.initCause(dx);
-            ex.message = errorPrefix(_mapKey) + "Db.open: " + dx.getMessage();
-            throw ex;
-        }       
-        _refCount = 1;
-    }
-
-    private void
-    connectIndices(Map.Index[] indices)
-    {
-        if(indices != null)
-        {
-            assert(_indices != null && indices.length == _indices.length);
-
-            for(int i = 0; i < indices.length; ++i)
-            {
-                indices[i].init(_indices[i]);
-            }
-        }
-    }
-
-    private void
-    cleanupIndices()
-    {
-        if(_indices != null)
-        {
-            for(int i = 0; i < _indices.length; ++i)
-            {
-                _indices[i].close();
-            }
-            _indices = null;
-        }
-    }
-
-    private static void
-    checkTypes(SharedDb sharedDb, String key, String value)
-    {
-        if(!key.equals(sharedDb._key))
-        {
-            DatabaseException ex = new DatabaseException();
-            ex.message = errorPrefix(sharedDb._mapKey) + sharedDb.dbName() + "'s key type is " + sharedDb._key +
-                ", not " + key;
-            throw ex;
-        }
-        if(!value.equals(sharedDb._value))
-        {
-            DatabaseException ex = new DatabaseException();
-            ex.message = errorPrefix(sharedDb._mapKey) + sharedDb.dbName() + "'s value type is " + sharedDb._value +
-                ", not " + value;
-            throw ex;
-        }
-    }
-
-    private static String
-    errorPrefix(MapKey k)
-    {
-        return "Freeze DB DbEnv(\"" + k.envName + "\") Db(\"" + k.dbName + "\"): ";
-    }
-
-    private static class MapKey
-    {
-        final String envName;
-        final Ice.Communicator communicator;
-        final String dbName;
-        
-        MapKey(String envName, Ice.Communicator communicator, String dbName)
-        {
-            assert(envName != null);
-            assert(communicator != null);
-            assert(dbName != null);
-
-            this.envName = envName;
-            this.communicator = communicator;
-            this.dbName = dbName;
-        }
-
-        public boolean
-        equals(Object o)
-        {   
-            try
-            {
-                MapKey k = (MapKey)o;
-                return (dbName.equals(k.dbName)) && (communicator == k.communicator) && envName.equals(k.envName);
-            }
-            catch(ClassCastException ex)
-            {
-                communicator.getLogger().trace("Freeze.Map", "equals cast failed");
-                return false;
-            }
-        }
-        
-        public int hashCode()
-        {
-            return dbName.hashCode() ^ envName.hashCode() ^ communicator.hashCode();
-        }
-    }
-
-    private com.sleepycat.db.Database _db;
-    private MapKey _mapKey;
-    private String _key;
-    private String _value;
-    private int _refCount = 0;
-    private int _trace;
-    private Map.Index[] _indices;
-    private boolean _inMap = false;
-
-//
-// Hash map of (MapKey, SharedDb)
-//
-    private static java.util.Map _map = new java.util.HashMap();
-}