db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r673481 - in /db/derby/code/branches/10.3/java: engine/org/apache/derby/impl/store/raw/data/CachedPage.java engine/org/apache/derby/loc/messages.xml shared/org/apache/derby/shared/common/reference/SQLState.java
Date Wed, 02 Jul 2008 20:05:19 GMT
Author: mikem
Date: Wed Jul  2 13:05:18 2008
New Revision: 673481

URL: http://svn.apache.org/viewvc?rev=673481&view=rev
Log:
DERBY-3725

Backporting fix from trunk to 10.3 branch (changes 669216 and 669312)

Added a page dump to this serious page corrupted error where the format id
has been corrupted so we don't know what kind of page it is, and thus can't
bootstrap the load to even create the object.


Modified:
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/branches/10.3/java/shared/org/apache/derby/shared/common/reference/SQLState.java

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java?rev=673481&r1=673480&r2=673481&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
Wed Jul  2 13:05:18 2008
@@ -262,7 +262,9 @@
 		if (formatId == -1)
         {
 			throw StandardException.newException(
-                    SQLState.DATA_UNKNOWN_PAGE_FORMAT, newIdentity);
+                    SQLState.DATA_UNKNOWN_PAGE_FORMAT_2, 
+                    newIdentity,
+                    org.apache.derby.iapi.util.StringUtil.hexDump(pageData));
         }
 
 		// createArgs[0] contains the integer form of the formatId 
@@ -341,6 +343,7 @@
 		 throws StandardException
 	{
 		CachedPage realPage;
+
 		try 
         {
 			realPage = 
@@ -356,7 +359,9 @@
             else
             {
                 throw StandardException.newException(
-                    SQLState.DATA_UNKNOWN_PAGE_FORMAT, se, newIdentity);
+                    SQLState.DATA_UNKNOWN_PAGE_FORMAT_2, 
+                    newIdentity,
+                    org.apache.derby.iapi.util.StringUtil.hexDump(pageData));
             }
 		}
 

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml?rev=673481&r1=673480&r2=673481&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/loc/messages.xml Wed Jul  2 13:05:18
2008
@@ -5079,6 +5079,13 @@
                 <arg>object</arg>
             </msg>
 
+            <msg>
+                <name>XSDBB.D</name>
+                <text>Unknown page format at page {0}, page dump follows: {1} </text>
+                <arg>page</arg>
+                <arg>value</arg>
+            </msg>
+
         </family>
 
 

Modified: db/derby/code/branches/10.3/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=673481&r1=673480&r2=673481&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/shared/org/apache/derby/shared/common/reference/SQLState.java
(original)
+++ db/derby/code/branches/10.3/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Wed Jul  2 13:05:18 2008
@@ -492,6 +492,7 @@
 	String DATA_MULTIPLE_JBMS_FORCE_LOCK                        = "XSDB8.D";
 	String DATA_CORRUPT_STREAM_CONTAINER                        = "XSDB9.D";
 	String DATA_OBJECT_ALLOCATION_FAILED                        = "XSDBA.D";
+	String DATA_UNKNOWN_PAGE_FORMAT_2                           = "XSDBB.D";
 
 	/*
 	** RawStore - Data.Filesystem statement exceptions



Mime
View raw message