From 20a45e5aa12394955bfd10d91d27408dc3f0588c Mon Sep 17 00:00:00 2001
From: fujie <405295521@qq.com>
Date: Mon, 20 Nov 2017 21:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=BA=8F=E8=A1=A8in=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/in/DataSetColumnInProcessor.java  | 47 +++----------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/in/DataSetColumnInProcessor.java b/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/in/DataSetColumnInProcessor.java
index 64f363d..9290b92 100644
--- a/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/in/DataSetColumnInProcessor.java
+++ b/org.tinygroup.tinyscript.dataset/src/main/java/org/tinygroup/tinyscript/dataset/in/DataSetColumnInProcessor.java
@@ -1,16 +1,10 @@
 package org.tinygroup.tinyscript.dataset.in;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import org.tinygroup.tinyscript.dataset.DataSetColumn;
-import org.tinygroup.tinyscript.dataset.Field;
 import org.tinygroup.tinyscript.expression.InExpressionProcessor;
 
 public class DataSetColumnInProcessor implements InExpressionProcessor {
 
-	private DataSetColumnCache colCache;
-
 	@Override
 	public boolean isMatch(Object collection) throws Exception {
 		return collection instanceof DataSetColumn;
@@ -19,42 +13,13 @@ public class DataSetColumnInProcessor implements InExpressionProcessor {
 	@Override
 	public boolean checkIn(Object collection, Object item) throws Exception {
 		DataSetColumn colData = (DataSetColumn) collection;
-		if (colCache == null || !colCache.getField().equals(colCache.getField())) {
-			colCache = new DataSetColumnCache(colData);
-		}
-		return colCache.isExist(item);
-	}
-
-	class DataSetColumnCache {
-		private Field field;
-		private Set<Object> colCache;
-
-		DataSetColumnCache(DataSetColumn colData) throws Exception {
-			colCache = new HashSet<Object>();
-			for (int i = 0; i < colData.getRows(); i++) {
-				colCache.add(colData.getData(colData.isIndexFromOne() ? i + 1 : i));
+		for (int i = 0; i < colData.getRows(); i++) {
+			if (item == colData.getData(colData.isIndexFromOne() ? i + 1 : i)
+					|| item.equals(colData.getData(colData.isIndexFromOne() ? i + 1 : i))) {
+				return true;
 			}
-			this.field = colData.getField();
-		}
-
-		public boolean isExist(Object item) {
-			return colCache.contains(item);
-		}
-
-		public Field getField() {
-			return field;
-		}
-
-		public void setField(Field field) {
-			this.field = field;
-		}
-
-		public Set<Object> getColCache() {
-			return colCache;
-		}
-
-		public void setColCache(Set<Object> colCache) {
-			this.colCache = colCache;
 		}
+		return false;
 	}
+
 }
-- 
Gitee