Skip to content

Commit 7b5fb89

Browse files
committed
fix: apply AI bot suggestion for year 2262 overflow
Change-Id: Iade245d7881798735bfb10598d9d1b4b4db0f4a1
1 parent a4fdcf7 commit 7b5fb89

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

  • java-bigtable/google-cloud-bigtable/src

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Mutation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.io.ObjectOutputStream;
3535
import java.io.Serializable;
3636
import java.time.Instant;
37-
import java.time.temporal.ChronoUnit;
3837
import java.util.List;
3938
import javax.annotation.Nonnull;
4039

@@ -157,7 +156,8 @@ public Mutation setCell(
157156
@Override
158157
public Mutation setCell(
159158
@Nonnull String familyName, @Nonnull ByteString qualifier, @Nonnull ByteString value) {
160-
long timestamp = Instant.EPOCH.until(Instant.now(), ChronoUnit.MICROS);
159+
Instant now = Instant.now();
160+
long timestamp = now.getEpochSecond() * 1_000_000L + now.getNano() / 1_000;
161161

162162
return setCell(familyName, qualifier, timestamp, value, TimestampOrigin.CLIENT_AUTO_GENERATED);
163163
}
@@ -176,7 +176,7 @@ private Mutation setCell(
176176
@Nonnull ByteString qualifier,
177177
long timestamp,
178178
@Nonnull ByteString value,
179-
TimestampOrigin timestampOrigin) {
179+
@Nonnull TimestampOrigin timestampOrigin) {
180180
Validations.validateFamily(familyName);
181181
Preconditions.checkNotNull(qualifier, "qualifier can't be null.");
182182
Preconditions.checkNotNull(value, "value can't be null.");

java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/MutationTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.io.ObjectInputStream;
3333
import java.io.ObjectOutputStream;
3434
import java.time.Instant;
35-
import java.time.temporal.ChronoUnit;
3635
import java.util.List;
3736
import org.junit.Before;
3837
import org.junit.Test;
@@ -51,7 +50,8 @@ public void setUp() {
5150

5251
@Test
5352
public void setCellTest() {
54-
long minTimestamp = Instant.EPOCH.until(Instant.now(), ChronoUnit.MICROS);
53+
Instant minInstant = Instant.now();
54+
long minTimestamp = minInstant.getEpochSecond() * 1_000_000L + minInstant.getNano() / 1_000;
5555

5656
mutation
5757
.setCell(
@@ -68,7 +68,8 @@ public void setCellTest() {
6868

6969
List<com.google.bigtable.v2.Mutation> actual = mutation.getMutations();
7070

71-
long maxTimestamp = Instant.EPOCH.until(Instant.now(), ChronoUnit.MICROS);
71+
Instant maxInstant = Instant.now();
72+
long maxTimestamp = maxInstant.getEpochSecond() * 1_000_000L + maxInstant.getNano() / 1_000;
7273
com.google.common.collect.Range<Long> expectedTimestampRange =
7374
com.google.common.collect.Range.closed(minTimestamp, maxTimestamp);
7475

0 commit comments

Comments
 (0)