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 64f363db00f3bc2ea52338dc921b916e67e1b39b..9290b923976b8aa6ec30481cb6590ffdbe3712be 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 colCache; - - DataSetColumnCache(DataSetColumn colData) throws Exception { - colCache = new HashSet(); - 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 getColCache() { - return colCache; - } - - public void setColCache(Set colCache) { - this.colCache = colCache; } + return false; } + }