From df0a290032680ad19e4ae824bb4cdf3d96eaed16 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Wed, 29 Mar 2023 21:05:18 +0800
Subject: [PATCH] =?UTF-8?q?EntityCache=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/redkale/source/EntityCache.java  | 61 +++++++------------
 1 file changed, 21 insertions(+), 40 deletions(-)

diff --git a/src/main/java/org/redkale/source/EntityCache.java b/src/main/java/org/redkale/source/EntityCache.java
index bf98afb9a..68af9c568 100644
--- a/src/main/java/org/redkale/source/EntityCache.java
+++ b/src/main/java/org/redkale/source/EntityCache.java
@@ -186,24 +186,7 @@ public final class EntityCache<T> {
                         });
                     }
                     this.list = all2 == null ? new ConcurrentLinkedQueue() : new ConcurrentLinkedQueue(all2);
-                    if (continuousid && all2 != null && !all2.isEmpty()) {
-                        Collections.sort(all2, (T o1, T o2) -> {
-                            int v1 = o1 == null ? 0 : (Integer) primary.get(o1);
-                            int v2 = o2 == null ? 0 : (Integer) primary.get(o2);
-                            return v1 - v2;
-                        });
-                        if ((Integer) primary.get(all2.get(0)) != 0) {
-                            all2.add(null);
-                            Collections.sort(all2, (T o1, T o2) -> {
-                                int v1 = o1 == null ? 0 : (Integer) primary.get(o1);
-                                int v2 = o2 == null ? 0 : (Integer) primary.get(o2);
-                                return v1 - v2;
-                            });
-                        }
-                        this.array = all2.toArray(arrayer);
-                    } else {
-                        this.array = null;
-                    }
+                    this.array = transferArray(all2);
                     this.map = newmap2;
                 } catch (Throwable t) {
                     logger.log(Level.SEVERE, type + " schedule(interval=" + interval + "s) Cacheable error", t);
@@ -223,24 +206,7 @@ public final class EntityCache<T> {
                 });
             }
             this.list = new ConcurrentLinkedQueue(all);
-            if (continuousid && all != null && !all.isEmpty()) {
-                Collections.sort(all, (T o1, T o2) -> {
-                    int v1 = o1 == null ? 0 : (Integer) primary.get(o1);
-                    int v2 = o2 == null ? 0 : (Integer) primary.get(o2);
-                    return v1 - v2;
-                });
-                if ((Integer) primary.get(all.get(0)) != 0) {
-                    all.add(null);
-                    Collections.sort(all, (T o1, T o2) -> {
-                        int v1 = o1 == null ? 0 : (Integer) primary.get(o1);
-                        int v2 = o2 == null ? 0 : (Integer) primary.get(o2);
-                        return v1 - v2;
-                    });
-                }
-                this.array = all.toArray(arrayer);
-            } else {
-                this.array = null;
-            }
+            this.array = transferArray(all);
             this.map = newmap;
             this.fullloaded = true;
             loading.set(false);
@@ -248,6 +214,24 @@ public final class EntityCache<T> {
         return this.loadFuture;
     }
 
+    private T[] transferArray(List<T> all) {
+        if (continuousid && all != null && !all.isEmpty()) {
+            try {
+                int maxid = all.stream().mapToInt(v -> v == null ? 0 : (Integer) primary.get(v)).max().orElse(0);
+                T[] result = arrayer.apply(maxid + 1);
+                for (T v : all) {
+                    int index = v == null ? 0 : (Integer) primary.get(v);
+                    result[index] = v;
+                }
+                return result;
+            } catch (Exception e) { //主键值可能是负数，导致数组下标异常
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+
     public Class<T> getType() {
         return type;
     }
@@ -304,11 +288,8 @@ public final class EntityCache<T> {
                 return result;
             }
         }
-        if (continuousid) {
+        if (continuousid && array != null) {
             T[] array0 = array;
-            if (array0 == null) {
-                return arrayer.apply(pks.length);
-            }
             T[] result = arrayer.apply(pks.length);
             if (needCopy) {
                 for (int i = 0; i < result.length; i++) {