From 1fa0c2d991762d29c2fac16e4a3be624a6c13c1e Mon Sep 17 00:00:00 2001
From: kamhung <22250530@qq.com>
Date: Tue, 17 Nov 2015 15:51:50 +0800
Subject: [PATCH]

---
 src/com/wentch/redkale/source/EntityCache.java | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/com/wentch/redkale/source/EntityCache.java b/src/com/wentch/redkale/source/EntityCache.java
index 4cdec3993..2bab3b937 100644
--- a/src/com/wentch/redkale/source/EntityCache.java
+++ b/src/com/wentch/redkale/source/EntityCache.java
@@ -222,8 +222,7 @@ public final class EntityCache<T> {
     }
 
     public Collection<T> queryCollection(final boolean set, final SelectColumn selects, final Predicate<T> filter, final Comparator<T> sort) {
-        final boolean parallel = isParallel();
-        final Collection<T> rs = parallel ? (set ? new CopyOnWriteArraySet<>() : new CopyOnWriteArrayList<>()) : (set ? new LinkedHashSet<>() : new ArrayList<>());
+        final Collection<T> rs = set ? new LinkedHashSet<>() : new ArrayList<>();
         Stream<T> stream = listStream();
         if (filter != null) stream = stream.filter(filter);
         if (sort != null) stream = stream.sorted(sort);
@@ -252,7 +251,7 @@ public final class EntityCache<T> {
                 stream.forEach(action);
             }
         }
-        return parallel ? (set ? new LinkedHashSet<>(rs) : new ArrayList<>(rs)) : rs;
+        return rs;
     }
 
     public Sheet<T> querySheet(final boolean needtotal, final SelectColumn selects, final Predicate<T> filter, final Flipper flipper, final Comparator<T> sort) {
@@ -267,8 +266,7 @@ public final class EntityCache<T> {
         if (filter != null) stream = stream.filter(filter);
         if (sort != null) stream = stream.sorted(sort);
         if (flipper != null) stream = stream.skip(flipper.index()).limit(flipper.getSize());
-        boolean parallel = isParallel();
-        final List<T> rs = parallel ? new CopyOnWriteArrayList<>() : new ArrayList<>();
+        final List<T> rs = new ArrayList<>();
         if (selects == null) {
             Consumer<? super T> action = x -> rs.add(needcopy ? reproduce.copy(creator.create(), x) : x);
             if (sort != null) {
@@ -295,7 +293,7 @@ public final class EntityCache<T> {
             }
         }
         if (!needtotal) total = rs.size();
-        return new Sheet<>(total, parallel ? new ArrayList<>(rs) : rs);
+        return new Sheet<>(total, rs);
     }
 
     public void insert(T value) {
@@ -395,11 +393,7 @@ public final class EntityCache<T> {
         return rs;
     }
 
-    public boolean isParallel() {
-        return this.list.size() >= 1024 * 1024;
-    }
-
     private Stream<T> listStream() {
-        return isParallel() ? this.list.parallelStream() : this.list.stream();
+        return this.list.stream();
     }
 }