Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 43120 invoked from network); 18 Jul 2007 15:49:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jul 2007 15:49:30 -0000 Received: (qmail 32816 invoked by uid 500); 18 Jul 2007 15:49:18 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 32784 invoked by uid 500); 18 Jul 2007 15:49:18 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 32764 invoked by uid 99); 18 Jul 2007 15:49:18 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jul 2007 08:49:18 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jul 2007 08:49:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BBEDB1A981A; Wed, 18 Jul 2007 08:48:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r557301 - in /db/derby/code/trunk/java/engine/org/apache/derby: database/Database.java impl/db/BasicDatabase.java Date: Wed, 18 Jul 2007 15:48:54 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070718154854.BBEDB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djd Date: Wed Jul 18 08:48:53 2007 New Revision: 557301 URL: http://svn.apache.org/viewvc?view=rev&rev=557301 Log: DERBY-2397 (partial) Remove old unused drop all meta data statements method. Code is never called and has been copied into the upgrade code for use there. Modified: db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java?view=diff&rev=557301&r1=557300&r2=557301 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java Wed Jul 18 08:48:53 2007 @@ -57,17 +57,6 @@ */ public boolean isReadOnly(); - /** - * Delete all stored prepared statements that were - * created for JDBC MetaData queries. - * - * @exception SQLException thrown on error deleting - * the stored prepared statements, most likely - * a deadlock or timeout. - */ - public void dropAllJDBCMetaDataSPSes() - throws SQLException; - /** * Backup the database to a backup directory. See online documentation * for more detail about how to use this feature. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java?view=diff&rev=557301&r1=557300&r2=557301 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java Wed Jul 18 08:48:53 2007 @@ -566,50 +566,6 @@ return databaseID; } - /** - * Drop all Stored Prepared Statements that - * have been created for JDBC MetaData queries. - * Does NOT commit the current transaction - * upon completation. - * - * @exception SQLException on error, most likely - * a deadlock or timeout. - */ - public void dropAllJDBCMetaDataSPSes() throws SQLException - { - try - { - LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC(); - - DataDictionary dd = lcc.getDataDictionary(); - - TransactionController tc = lcc.getTransactionExecute(); - - /* - ** Inform the data dictionary we are going - ** to perform some DDL - */ - dd.startWriting(lcc); - - for (java.util.ListIterator li = dd.getAllSPSDescriptors().listIterator(); li.hasNext(); ) - { - SPSDescriptor spsd = (SPSDescriptor) li.next(); - - /* - ** Is it in SYS? if so, zap it. Can't drop metadata SPS in SYSIBM, JCC depends on it. - */ - if (spsd.getSchemaDescriptor().isSystemSchema() && !spsd.getSchemaDescriptor().isSYSIBM()) - { - dd.dropSPSDescriptor(spsd, tc); - dd.dropDependentsStoredDependencies(spsd.getUUID(), tc); - } - } - } catch (StandardException se) - { - throw PublicAPI.wrapStandardException(se); - } - } - /* ** Return an Object instead of a ResourceAdapter ** so that XA classes are only used where needed;