Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF639F24D for ; Wed, 24 Apr 2013 07:39:36 +0000 (UTC) Received: (qmail 61808 invoked by uid 500); 24 Apr 2013 07:27:09 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 61713 invoked by uid 500); 24 Apr 2013 07:27:04 -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 61607 invoked by uid 99); 24 Apr 2013 07:27:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Apr 2013 07:26:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Apr 2013 07:26:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A2CE723888E7; Wed, 24 Apr 2013 07:26:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1471270 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/NetCursor.java java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java Date: Wed, 24 Apr 2013 07:26:33 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130424072633.A2CE723888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Wed Apr 24 07:26:33 2013 New Revision: 1471270 URL: http://svn.apache.org/r1471270 Log: DERBY-5964: Timestamp comparison failure in AutomaticIndexStatisticsTest.testStatisticsCorrectness Merged revision 1404886 from trunk. Modified: db/derby/code/branches/10.8/ (props changed) db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java (props changed) db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java Propchange: db/derby/code/branches/10.8/ ------------------------------------------------------------------------------ Merged /db/derby/code/trunk:r1404886 Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java ------------------------------------------------------------------------------ Merged /db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:r1404886 Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java?rev=1471270&r1=1471269&r2=1471270&view=diff ============================================================================== --- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java (original) +++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java Wed Apr 24 07:26:33 2013 @@ -44,6 +44,7 @@ import org.apache.derbyTesting.junit.Ind import org.apache.derbyTesting.junit.JDBC; import org.apache.derbyTesting.junit.JDBCDataSource; import org.apache.derbyTesting.junit.TestConfiguration; +import org.apache.derbyTesting.junit.TimeZoneTestSetup; import org.apache.derbyTesting.junit.Utilities; /** @@ -75,7 +76,14 @@ public class AutomaticIndexStatisticsTes public static Test suite() { TestSuite suite = new TestSuite(AutomaticIndexStatisticsTest.class); - return TestConfiguration.additionalDatabaseDecorator(suite, MASTERDB); + // DERBY-5964: The test needs to check the timestamp stored in + // SYSSTATISTICS, which is in the local timezone. Since those + // timestamps may be ambiguous around the transition to or from DST, + // run this test in a timezone that doesn't observe DST. The + // TimeZoneTestSetup can probably be removed once DERBY-5974 is fixed. + return new TimeZoneTestSetup( + TestConfiguration.additionalDatabaseDecorator(suite, MASTERDB), + "GMT"); } /** Initialize the default statistics helper object. */