Bugfix for timestamp persistence / transfer

h2/src/main/org/h2/store/Data.java

@@ -526,7 +526,7 @@ public class Data {
                 Timestamp ts = v.getTimestamp();
                 writeByte((byte) type);
                 writeVarLong(DateTimeUtils.getTimeLocalWithoutDst(ts));
-                writeVarInt(ts.getNanos());
+                writeVarInt(ts.getNanos() % 1000000);
             }
             break;
         }
@@ -1010,7 +1010,7 @@ public class Data {
             }
             Timestamp ts = v.getTimestamp();
             return 1 + getVarLongLen(DateTimeUtils.getTimeLocalWithoutDst(ts)) +
-                    getVarIntLen(ts.getNanos());
+                    getVarIntLen(ts.getNanos() % 1000000);
         }
         case Value.GEOMETRY:
         case Value.JAVA_OBJECT: {

h2/src/main/org/h2/value/Transfer.java

@@ -15,11 +15,9 @@ import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.sql.Time;
 import java.sql.Timestamp;
 
 import org.h2.api.ErrorCode;
@@ -383,11 +381,11 @@ public class Transfer {
             } else if (version >= Constants.TCP_PROTOCOL_VERSION_7) {
                 Timestamp ts = v.getTimestamp();
                 writeLong(DateTimeUtils.getTimeLocalWithoutDst(ts));
-                writeInt(ts.getNanos());
+                writeInt(ts.getNanos() % 1000000);
             } else {
                 Timestamp ts = v.getTimestamp();
                 writeLong(ts.getTime());
-                writeInt(ts.getNanos());
+                writeInt(ts.getNanos() % 1000000);
             }
             break;
         }
@@ -563,13 +561,15 @@ public class Transfer {
             return ValueTime.fromMillis(readLong());
         case Value.TIMESTAMP: {
             if (version >= Constants.TCP_PROTOCOL_VERSION_9) {
-                return ValueTimestamp.fromDateValueAndNanos(readLong(), readLong());
+                return ValueTimestamp.fromDateValueAndNanos(
+                        readLong(), readLong());
             } else if (version >= Constants.TCP_PROTOCOL_VERSION_7) {
                 return ValueTimestamp.fromMillisNanos(
                         DateTimeUtils.getTimeUTCWithoutDst(readLong()),
-                        readInt());
+                        readInt() % 1000000);
             }
-            return ValueTimestamp.fromMillisNanos(readLong(), readInt());
+            return ValueTimestamp.fromMillisNanos(readLong(), 
+                    readInt() % 1000000);
         }
         case Value.DECIMAL:
             return ValueDecimal.get(new BigDecimal(readString()));

h2/src/test/org/h2/test/unit/TestDataPage.java

@@ -225,7 +225,6 @@ public class TestDataPage extends TestBase implements DataHandler {
         assertEquals(123, data.readInt());
     }
 
-
     private void testAll() {
         Data page = Data.create(this, 128);