You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/09/03 07:35:32 UTC
[kylin] branch 2.5.x updated: KYLIN-3522 PrepareStatement cache
issue
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/2.5.x by this push:
new 95a311b KYLIN-3522 PrepareStatement cache issue
95a311b is described below
commit 95a311bbea3f707329f53a24de1cd5973c0debea
Author: Ma,Gang <ga...@ebay.com>
AuthorDate: Fri Aug 31 18:13:49 2018 +0800
KYLIN-3522 PrepareStatement cache issue
---
.../org/apache/kylin/metadata/filter/CompareTupleFilter.java | 11 +++++++++++
.../main/java/org/apache/kylin/query/relnode/OLAPContext.java | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
index 2c75ec1..1c1c409 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java
@@ -135,6 +135,17 @@ public class CompareTupleFilter extends TupleFilter implements IOptimizeableTupl
this.firstCondValue = this.conditionValues.iterator().next();
}
+ public void clearPreviousVariableValues(String variable) {
+ Object previousValue = dynamicVariables.get(variable);
+ if (previousValue == null) {
+ return;
+ }
+ if (this.firstCondValue == previousValue) {
+ this.firstCondValue = null;
+ }
+ this.conditionValues.remove(previousValue);
+ }
+
@Override
public TupleFilter copy() {
return new CompareTupleFilter(this);
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java
index e43c257..e530b72 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPContext.java
@@ -313,7 +313,7 @@ public class OLAPContext {
String str = value.toString();
if (compFilter.getColumn().getType().isDateTimeFamily())
str = String.valueOf(DateFormat.stringToMillis(str));
-
+ compFilter.clearPreviousVariableValues(variable);
compFilter.bindVariable(variable, str);
}