Plumbs the new continuable binary reader through the IonReaderBuilder…

… and all IonReader tests.
linlin-s · Oct 6, 2023 · 10a992b · 10a992b
1 parent 2d17bd6
commit 10a992b
Show file tree

Hide file tree

Showing 29 changed files with 615 additions and 504 deletions.
diff --git a/src/com/amazon/ion/IonCursor.java b/src/com/amazon/ion/IonCursor.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion;
 
 import java.io.Closeable;

diff --git a/src/com/amazon/ion/Timestamp.java b/src/com/amazon/ion/Timestamp.java
@@ -76,6 +76,8 @@ public final class Timestamp
 {
     private static final boolean APPLY_OFFSET_YES = true;
     private static final boolean APPLY_OFFSET_NO = false;
+    private static final boolean CHECK_FRACTION_YES = true;
+    private static final boolean CHECK_FRACTION_NO = false;
 
     private static final int NO_MONTH = 0;
     private static final int NO_DAY = 0;
@@ -444,7 +446,7 @@ private void set_fields_from_calendar(Calendar cal,
      */
     private Timestamp(int zyear)
     {
-        this(Precision.YEAR, zyear, NO_MONTH, NO_DAY, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO);
+        this(Precision.YEAR, zyear, NO_MONTH, NO_DAY, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO, CHECK_FRACTION_NO);
     }
 
     /**
@@ -454,7 +456,7 @@ private Timestamp(int zyear)
      */
     private Timestamp(int zyear, int zmonth)
     {
-        this(Precision.MONTH, zyear, zmonth, NO_DAY, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO);
+        this(Precision.MONTH, zyear, zmonth, NO_DAY, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO, CHECK_FRACTION_NO);
     }
 
     /**
@@ -467,7 +469,7 @@ private Timestamp(int zyear, int zmonth)
     @Deprecated
     public Timestamp(int zyear, int zmonth, int zday)
     {
-        this(Precision.DAY, zyear, zmonth, zday, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO);
+        this(Precision.DAY, zyear, zmonth, zday, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO, CHECK_FRACTION_NO);
     }
 
 
@@ -490,7 +492,7 @@ public Timestamp(int year, int month, int day,
                      int hour, int minute,
                      Integer offset)
     {
-        this(Precision.MINUTE, year, month, day, hour, minute, NO_SECONDS, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES);
+        this(Precision.MINUTE, year, month, day, hour, minute, NO_SECONDS, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES, CHECK_FRACTION_NO);
     }
 
     /**
@@ -512,7 +514,7 @@ public Timestamp(int year, int month, int day,
                      int hour, int minute, int second,
                      Integer offset)
     {
-        this(Precision.SECOND, year, month, day, hour, minute, second, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES);
+        this(Precision.SECOND, year, month, day, hour, minute, second, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES, CHECK_FRACTION_NO);
     }
 
     /**
@@ -541,7 +543,7 @@ public Timestamp(int year, int month, int day,
                      int hour, int minute, int second, BigDecimal frac,
                      Integer offset)
     {
-        this(Precision.SECOND, year, month, day, hour, minute, second, frac, offset, APPLY_OFFSET_YES);
+        this(Precision.SECOND, year, month, day, hour, minute, second, frac, offset, APPLY_OFFSET_YES, CHECK_FRACTION_YES);
     }
 
     /**
@@ -564,7 +566,7 @@ public Timestamp(int year, int month, int day,
      */
     private Timestamp(Precision p, int zyear, int zmonth, int zday,
                       int zhour, int zminute, int zsecond, BigDecimal frac,
-                      Integer offset, boolean shouldApplyOffset)
+                      Integer offset, boolean shouldApplyOffset, boolean shouldCheckFraction)
     {
         boolean dayPrecision = false;
 
@@ -573,13 +575,22 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
             throw new IllegalArgumentException("invalid Precision passed to constructor");
         case FRACTION:
         case SECOND:
-            if (frac == null || frac.equals(BigDecimal.ZERO))
+            if (frac == null)
             {
                 _fraction = null;
             }
+            else if (shouldCheckFraction)
+            {
+                if (frac.equals(BigDecimal.ZERO)) {
+                    _fraction = null;
+                } else {
+                    checkFraction(p, frac);
+                    _fraction = frac;
+                }
+            }
             else
             {
-                _fraction = frac.abs();
+                _fraction = frac;
             }
             _second = checkAndCastSecond(zsecond);
         case MINUTE:
@@ -599,7 +610,7 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
             _day    = checkAndCastDay(zday, zyear, zmonth);
         }
 
-        _precision = checkFraction(p, _fraction);
+        _precision = p;
 
         if (shouldApplyOffset && offset != null) {
             apply_offset(offset);
@@ -662,7 +673,7 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
     {
         return new Timestamp(p, zyear, zmonth, zday,
                              zhour, zminute, zsecond, frac,
-                             offset, APPLY_OFFSET_NO);
+                             offset, APPLY_OFFSET_NO, CHECK_FRACTION_YES);
     }
 
     /**
@@ -1111,7 +1122,7 @@ else if (timezone_start == '+' || timezone_start == '-')
 
         Timestamp ts =
             new Timestamp(precision, year, month, day,
-                          hour, minute, seconds, fraction, offset, APPLY_OFFSET_YES);
+                          hour, minute, seconds, fraction, offset, APPLY_OFFSET_YES, CHECK_FRACTION_NO);
         return ts;
     }
 
@@ -1198,7 +1209,8 @@ public Timestamp clone()
                              _second,
                              _fraction,
                              _offset,
-                             APPLY_OFFSET_NO);
+                             APPLY_OFFSET_NO,
+                             CHECK_FRACTION_NO);
     }
 
     /**
@@ -1229,7 +1241,8 @@ private Timestamp make_localtime()
                                             _second,
                                             _fraction,
                                             _offset,
-                                            APPLY_OFFSET_NO);
+                                            APPLY_OFFSET_NO,
+                                            CHECK_FRACTION_NO);
         // explicitly apply the local offset to the time field values
         localtime.apply_offset(-offset);
 
@@ -1344,7 +1357,8 @@ public static Timestamp forSecond(int year, int month, int day,
         // Storing them separately is silly.
         int s = second.intValue();
         BigDecimal frac = second.subtract(BigDecimal.valueOf(s));
-        return new Timestamp(Precision.SECOND, year, month, day, hour, minute, s, frac, offset, APPLY_OFFSET_YES);
+        return new Timestamp(Precision.SECOND, year, month, day, hour, minute, s, frac, offset, APPLY_OFFSET_YES,
+                             CHECK_FRACTION_YES);
     }
 
 

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplication.java b/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonType;

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCore.java b/src/com/amazon/ion/impl/IonReaderContinuableCore.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
 import com.amazon.ion.Decimal;