db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1550525 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
Date Thu, 12 Dec 2013 20:50:37 GMT
Author: myrnavl
Date: Thu Dec 12 20:50:37 2013
New Revision: 1550525

URL: http://svn.apache.org/r1550525
Log:
DERBY-5196; Correct the layout of log.ctrl as described on the Derby web site
   fixing the header in the source file

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=1550525&r1=1550524&r2=1550525&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java Thu
Dec 12 20:50:37 2013
@@ -156,19 +156,19 @@ import java.util.zip.CRC32;
 	are present and where the last checkpoint log record is located.
 	@derby.upgrade	
 	@derby.diskLayout
-	(pre-v15)
-		int format id
-		int log file version
-		long the log instant (LogCounter) of the last completed checkpoint
-	(v15 onward)
 		int format id
 		int obsolete log file version
 		long the log instant (LogCounter) of the last completed checkpoint
-		int JBMS version
-		int checkpoint interval
-		long spare (value set to 0)
-		long spare (value set to 0)
+		   (logfile counter, position)
+		int Derby major version
+		int Derby minor version
+		int subversion revision/build number
+		byte Flags (beta flag (0 or 1), test durability flag (0 or 1))
+		byte spare (0)
+		byte spare (0)
+		byte spare (0)
 		long spare (value set to 0)
+		long checksum for control data written
 
 	@derby.endFormat
 	</PRE>	
@@ -2397,7 +2397,7 @@ public final class LogToFile implements 
         chance system crashes while writing into the file,
         using the checksum we find that the control file
         is hosed then we  use the mirror file, which will have
-        the condrol data written at last check point.
+        the control data written at last check point.
 
 		see comment at beginning of file for log control file format.
 



Mime
View raw message