Fix long overflow during missing entities migration (#385)

Signed-off-by: Steven Sheehy <steven.sheehy@hedera.com>
hashgraph · Nov 18, 2019 · f7403b2 · f7403b2
1 parent 18303a0
commit f7403b2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/com/hedera/mirror/migration/V1_11_6__Missing_Entities.java b/src/main/java/com/hedera/mirror/migration/V1_11_6__Missing_Entities.java
@@ -105,7 +105,11 @@ private void updateAccount(String line) throws Exception {
         Entities entity = entityExists.orElseGet(() -> toEntity(accountID));
 
         if (entity.getExpiryTimeNs() == null && accountInfo.hasExpirationTime()) {
-            entity.setExpiryTimeNs(Utility.timeStampInNanos(accountInfo.getExpirationTime()));
+            try {
+                entity.setExpiryTimeNs(Utility.timeStampInNanos(accountInfo.getExpirationTime()));
+            } catch (ArithmeticException e) {
+                log.warn("Invalid expiration time for account {}: {}", accountID.getAccountNum(), StringUtils.trim(e.getMessage()));
+            }
         }
 
         if (entity.getAutoRenewPeriod() == null && accountInfo.hasAutoRenewPeriod()) {

diff --git a/src/main/java/com/hedera/mirror/util/Utility.java b/src/main/java/com/hedera/mirror/util/Utility.java
@@ -613,8 +613,7 @@ public static Long timeStampInNanos(Timestamp timestamp) {
         try {
             return Math.addExact(Math.multiplyExact(timestamp.getSeconds(), SCALAR), timestamp.getNanos());
         } catch (ArithmeticException e) {
-            log.error("Long overflow when converting Timestamp to nanos timestamp : {}", timestamp, e);
-            throw e;
+            throw new ArithmeticException("Long overflow when converting Timestamp to nanos timestamp: " + timestamp);
         }
     }
 

diff --git a/src/test/java/com/hedera/mirror/migration/V1_11_6__Missing_EntitiesTest.java b/src/test/java/com/hedera/mirror/migration/V1_11_6__Missing_EntitiesTest.java
@@ -36,6 +36,7 @@
 import javax.annotation.Resource;
 import javax.sql.DataSource;
 
+import com.hederahashgraph.api.proto.java.Timestamp;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Hex;
 import org.flywaydb.core.api.configuration.Configuration;
@@ -215,6 +216,17 @@ void corruptFile() throws Exception {
         assertThat(entityRepository.count()).isEqualTo(0L);
     }
 
+    @Test
+    void longOverflow() throws Exception {
+        AccountInfo.Builder accountInfo = accountInfo().setExpirationTime(Timestamp.newBuilder().setSeconds(31556889864403199L).build());
+        write(accountInfo.build());
+        migration.migrate(new FlywayContext());
+        assertThat(entityRepository.findAll())
+                .hasSize(2)
+                .extracting(Entities::getExpiryTimeNs)
+                .containsOnlyNulls();
+    }
+
     private AccountInfo.Builder accountInfo() throws Exception {
         return AccountInfo.newBuilder()
                 .setAccountID(accountId)