Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 62073 invoked from network); 7 Jun 2005 01:09:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Jun 2005 01:09:15 -0000 Received: (qmail 73925 invoked by uid 500); 7 Jun 2005 01:09:14 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 73902 invoked by uid 500); 7 Jun 2005 01:09:14 -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 73885 invoked by uid 500); 7 Jun 2005 01:09:14 -0000 Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org Received: (qmail 73880 invoked by uid 99); 7 Jun 2005 01:09:13 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 06 Jun 2005 18:09:09 -0700 Received: (qmail 61970 invoked by uid 65534); 7 Jun 2005 01:09:01 -0000 Message-ID: <20050607010901.61969.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r188643 - /incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java /incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java Date: Tue, 07 Jun 2005 01:09:00 -0000 To: derby-cvs@incubator.apache.org From: bandaram@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bandaram Date: Mon Jun 6 18:09:00 2005 New Revision: 188643 URL: http://svn.apache.org/viewcvs?rev=3D188643&view=3Drev Log: Move SanityManager code under if (SanityManager.DEBUG). Submitted by Army Brown (qozinx@sbcglobal.net) Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictio= nary/ColumnDescriptor.java incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/= data/FileContainer.java Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/= dictionary/ColumnDescriptor.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/o= rg/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java?rev=3D188643&r1= =3D188642&r2=3D188643&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictio= nary/ColumnDescriptor.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictio= nary/ColumnDescriptor.java Mon Jun 6 18:09:00 2005 @@ -105,12 +105,9 @@ this.uuid =3D table.getUUID(); } =20 - if (SanityManager.DEBUG) - { - assertAutoinc(autoinc, - autoincInc, - columnDefaultInfo); - } + assertAutoinc(autoinc, + autoincInc, + columnDefaultInfo); =20 this.autoincStart =3D autoincStart; this.autoincInc =3D autoincInc; @@ -153,12 +150,9 @@ this.uuid =3D uuid; this.defaultUUID =3D defaultUUID; =20 - if (SanityManager.DEBUG) - { - assertAutoinc(autoinc, - autoincInc, - columnDefaultInfo); - } + assertAutoinc(autoinc, + autoincInc, + columnDefaultInfo); =09 this.autoincStart =3D autoincStart; this.autoincInc =3D autoincInc; @@ -397,19 +391,24 @@ private static void assertAutoinc(boolean autoinc, long autoincInc, DefaultInfo defaultInfo){ - if (autoinc){ - SanityManager.ASSERT((autoincInc !=3D 0), "increment is zero for autoi= ncrement column"); - SanityManager.ASSERT((defaultInfo =3D=3D null || + + if (SanityManager.DEBUG) { + if (autoinc){ + SanityManager.ASSERT((autoincInc !=3D 0), + "increment is zero for autoincrement column"); + SanityManager.ASSERT((defaultInfo =3D=3D null || defaultInfo.isDefaultValueAutoinc()), "If column is autoinc and have defaultInfo, " +=20 "isDefaultValueAutoinc must be true."); - } - else{ - SanityManager.ASSERT((autoincInc =3D=3D 0), "increment is non-zero for = non-autoincrement column"); - SanityManager.ASSERT((defaultInfo =3D=3D null || + } + else{ + SanityManager.ASSERT((autoincInc =3D=3D 0), + "increment is non-zero for non-autoincrement column"); + SanityManager.ASSERT((defaultInfo =3D=3D null || ! defaultInfo.isDefaultValueAutoinc()), "If column is not autoinc and have defaultInfo, " +=20 "isDefaultValueAutoinc can not be true"); + } } } =20 Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/stor= e/raw/data/FileContainer.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/o= rg/apache/derby/impl/store/raw/data/FileContainer.java?rev=3D188643&r1=3D18= 8642&r2=3D188643&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/= data/FileContainer.java (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/= data/FileContainer.java Mon Jun 6 18:09:00 2005 @@ -1748,12 +1748,14 @@ } catch (StandardException se) { - SanityManager.DEBUG_PRINT("FileContainer", - "got exception from initPage:" + - "\nreuse =3D " + reuse + - "\ncreatePageArgs[1] =3D " + createPageArgs[1] + - "\nallocPage =3D " + allocPage - ); + if (SanityManager.DEBUG) { + SanityManager.DEBUG_PRINT("FileContainer", + "got exception from initPage:" + + "\nreuse =3D " + reuse + + "\ncreatePageArgs[1] =3D " + createPageArgs[1]= + + "\nallocPage =3D " + allocPage + ); + } allocCache.dumpAllocationCache(); =20 throw se;