From 361fe9b5fd14c8cdff64cb899294fc79fbcd9102 Mon Sep 17 00:00:00 2001
From: sunhaisheng <sunhaisheng@guazi.com>
Date: Sat, 7 Sep 2019 08:58:55 +0800
Subject: [PATCH] 1. modify revisedOffset's type to long for OffsetToken class.
 2. modify unit test class.

---
 .../sharding/segment/select/pagination/Pagination.java      | 6 +++---
 .../shardingsphere/core/rewrite/token/pojo/OffsetToken.java | 4 ++--
 .../core/rewrite/builder/BaseParameterBuilderTest.java      | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sharding-core/sharding-core-optimize/src/main/java/org/apache/shardingsphere/core/optimize/sharding/segment/select/pagination/Pagination.java b/sharding-core/sharding-core-optimize/src/main/java/org/apache/shardingsphere/core/optimize/sharding/segment/select/pagination/Pagination.java
index 96753d0bbb..9ba59488a1 100644
--- a/sharding-core/sharding-core-optimize/src/main/java/org/apache/shardingsphere/core/optimize/sharding/segment/select/pagination/Pagination.java
+++ b/sharding-core/sharding-core-optimize/src/main/java/org/apache/shardingsphere/core/optimize/sharding/segment/select/pagination/Pagination.java
@@ -89,7 +89,7 @@ public final class Pagination {
      */
     public long getActualOffset() {
         if (null == offsetSegment) {
-            return 0;
+            return 0L;
         }
         return offsetSegment.isBoundOpened() ? actualOffset - 1 : actualOffset;
     }
@@ -130,8 +130,8 @@ public final class Pagination {
      *
      * @return revised offset
      */
-    public int getRevisedOffset() {
-        return 0;
+    public long getRevisedOffset() {
+        return 0L;
     }
     
     /**
diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OffsetToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OffsetToken.java
index 73a8bd7625..238f5ed963 100644
--- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OffsetToken.java
+++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OffsetToken.java
@@ -30,9 +30,9 @@ public final class OffsetToken extends SQLToken implements Substitutable {
     
     private final int stopIndex;
     
-    private final int revisedOffset;
+    private final long revisedOffset;
     
-    public OffsetToken(final int startIndex, final int stopIndex, final int revisedOffset) {
+    public OffsetToken(final int startIndex, final int stopIndex, final long revisedOffset) {
         super(startIndex);
         this.stopIndex = stopIndex;
         this.revisedOffset = revisedOffset;
diff --git a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/builder/BaseParameterBuilderTest.java b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/builder/BaseParameterBuilderTest.java
index 5c56e4b284..d5a1bc32ee 100644
--- a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/builder/BaseParameterBuilderTest.java
+++ b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/builder/BaseParameterBuilderTest.java
@@ -64,8 +64,8 @@ public final class BaseParameterBuilderTest {
     
     @Test
     public void assertGetParameters() {
-        assertThat(baseParameterBuilder.getParameters(), is(Arrays.<Object>asList(1, 2, 0, 6L, 7)));
-        assertThat(baseParameterBuilder.getParameters(mock(RoutingUnit.class)), is(Arrays.<Object>asList(1, 2, 0, 6L, 7)));
+        assertThat(baseParameterBuilder.getParameters(), is(Arrays.<Object>asList(1, 2, 0L, 6L, 7)));
+        assertThat(baseParameterBuilder.getParameters(mock(RoutingUnit.class)), is(Arrays.<Object>asList(1, 2, 0L, 6L, 7)));
     }
     
     @Test
@@ -81,7 +81,7 @@ public final class BaseParameterBuilderTest {
     @Test
     public void assertGetReplacedIndexAndParameters() {
         Map<Integer, Object> expected = new LinkedHashMap<>();
-        expected.put(2, 0);
+        expected.put(2, 0L);
         expected.put(3, 6L);
         assertThat(baseParameterBuilder.getReplacedIndexAndParameters(), is(expected));
     }
-- 
GitLab