stateless command parsing - first step for executor cache

orientechnologies · Aug 11, 2015 · 303f8c2 · 303f8c2
1 parent ef94a50
commit 303f8c2
Show file tree

Hide file tree

Showing 100 changed files with 850 additions and 1,636 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLAbstract.java
@@ -230,7 +230,9 @@ protected String preParse(final String queryText, final OCommandRequest iRequest
 
         if (iRequest instanceof OCommandRequestAbstract) {
           final Map<Object, Object> params = ((OCommandRequestAbstract) iRequest).getParameters();
-          result.replaceParameters(params);
+          StringBuilder builder = new StringBuilder();
+          result.toString(params, builder);
+          return builder.toString();
         }
 
         return result.toString();

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OAlias.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OAlias.java
@@ -2,6 +2,8 @@
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package com.orientechnologies.orient.core.sql.parser;
 
+import java.util.Map;
+
 public
 class OAlias extends SimpleNode {
   public OAlias(int id) {
@@ -18,5 +20,8 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
+
+  }
 }
 /* JavaCC - OriginalChecksum=c0c2ff315abe152a8ea5f2ecafd0f853 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OAndBlock.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OAndBlock.java
@@ -36,12 +36,6 @@ public boolean evaluate(OIdentifiable currentRecord, OCommandContext ctx) {
 
   }
 
-  @Override public void replaceParameters(Map<Object, Object> params) {
-    for(OBooleanExpression sub:subBlocks){
-      sub.replaceParameters(params);
-    }
-  }
-
   public List<OBooleanExpression> getSubBlocks() {
     return subBlocks;
   }
@@ -50,24 +44,22 @@ public void setSubBlocks(List<OBooleanExpression> subBlocks) {
     this.subBlocks = subBlocks;
   }
 
-  @Override
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
-  public String toString() {
     if (subBlocks == null || subBlocks.size() == 0) {
-      return "";
+      return;
-    }
-    if (subBlocks.size() == 1) {
-      return subBlocks.get(0).toString();
     }
-    StringBuilder result = new StringBuilder();
+//    if (subBlocks.size() == 1) {
+//      subBlocks.get(0).toString(params, builder);
+//    }
+
     boolean first = true;
     for (OBooleanExpression expr : subBlocks) {
       if (!first) {
-        result.append(" AND ");
+        builder.append(" AND ");
       }
-      result.append(expr.toString());
+      expr.toString(params, builder);
       first = false;
     }
-    return result.toString();
   }
 
   @Override protected boolean supportsBasicCalculation() {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OArrayNumberSelector.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OArrayNumberSelector.java
@@ -27,34 +27,23 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 
-  @Override
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
-  public String toString() {
     if (inputValue != null) {
-      if (inputFinalValue == UNSET) {
+      // if (inputFinalValue == UNSET) {
-        return inputValue.toString();
+      // inputValue.toString(params, builder);
-      } else if (inputFinalValue == null) {
+      // } else if (inputFinalValue == null) {
-        return "NULL";
+      // builder.append("NULL");
-      } else {
+      // } else {
-        return inputFinalValue.toString();
+      // builder.appinputFinalValue.toString(params, builder);
-      }
+      // }
+      inputValue.toString(params, builder);
     } else if (expressionValue != null) {
-      return expressionValue.toString();
+      expressionValue.toString(params, builder);
     } else if (integer != null) {
-      return integer.toString();
+      builder.append(integer);
     }
-    return super.toString();
   }
 
-  public void replaceParameters(Map<Object, Object> params) {
+
-    if (inputValue != null) {
-      Object result = inputValue.bindFromInputParams(params);
-      if (result != inputValue) {
-        inputFinalValue = result;
-      }
-    }
-    if (expressionValue != null) {
-      expressionValue.replaceParameters(params);
-    }
-  }
 }
 /* JavaCC - OriginalChecksum=5b2e495391ede3ccdc6c25aa63c8e591 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OArrayRangeSelector.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OArrayRangeSelector.java
@@ -25,35 +25,24 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 
-  @Override
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
-  public String toString() {
-    StringBuilder result = new StringBuilder();
     if (from != null) {
-      result.append(from);
+      builder.append(from);
     } else {
-      result.append(fromSelector.toString());
+      fromSelector.toString(params, builder);
     }
     if (newRange) {
-      result.append("-");
+      builder.append("-");
       // TODO in 3.0 result.append("..");
     } else {
-      result.append("-");
+      builder.append("-");
     }
     if (to != null) {
-      result.append(to);
+      builder.append(to);
     } else {
-      result.append(toSelector.toString());
+      toSelector.toString(params, builder);
     }
-    return result.toString();
   }
 
-  public void replaceParameters(Map<Object, Object> params) {
-    if (fromSelector != null) {
-      fromSelector.replaceParameters(params);
-    }
-    if (toSelector != null) {
-      toSelector.replaceParameters(params);
-    }
-  }
 }
 /* JavaCC - OriginalChecksum=594a372e31fcbcd3ed962c2260e76468 (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OArraySelector.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OArraySelector.java
@@ -6,9 +6,6 @@
 
 public class OArraySelector extends SimpleNode {
 
-  private static final Object UNSET           = new Object();
-  private Object              inputFinalValue = UNSET;
-
   protected ORid              rid;
   protected OInputParameter   inputParam;
   protected OExpression       expression;
@@ -27,36 +24,17 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 
-  @Override
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
-  public String toString() {
     if (rid != null) {
-      return rid.toString();
+      rid.toString(params, builder);
     } else if (inputParam != null) {
-      if (inputFinalValue == UNSET) {
+      inputParam.toString(params, builder);
-        return inputParam.toString();
-      } else if (inputFinalValue == null) {
-        return "NULL";
-      } else {
-        return inputFinalValue.toString();
-      }
     } else if (expression != null) {
-      return expression.toString();
+      expression.toString(params, builder);
     } else if (integer != null) {
-      return integer.toString();
+      integer.toString(params, builder);
     }
-    return null;
   }
 
-  public void replaceParameters(Map<Object, Object> params) {
-    if (inputParam != null) {
-      Object result = inputParam.bindFromInputParams(params);
-      if (result != inputParam) {
-        inputFinalValue = result;
-      }
-    }
-    if (expression != null) {
-      expression.replaceParameters(params);
-    }
-  }
 }
 /* JavaCC - OriginalChecksum=f87a5543b1dad0fb5f6828a0663a7c9e (do not edit this line) */
diff --git a/...rc/main/java/com/orientechnologies/orient/core/sql/parser/OArraySingleValuesSelector.java b/...rc/main/java/com/orientechnologies/orient/core/sql/parser/OArraySingleValuesSelector.java
@@ -23,26 +23,17 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 
-  @Override
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
-  public String toString() {
     boolean first = true;
-    StringBuilder result = new StringBuilder();
     for (OArraySelector item : items) {
       if (!first) {
-        result.append(",");
+        builder.append(",");
       }
-      result.append(item.toString());
+      item.toString(params, builder);
       first = false;
     }
-    return result.toString();
   }
 
-  public void replaceParameters(Map<Object, Object> params) {
+
-    if(items!=null){
-      for(OArraySelector item:items){
-        item.replaceParameters(params);
-      }
-    }
-  }
 }
 /* JavaCC - OriginalChecksum=991998c77a4831184b6dca572513fd8d (do not edit this line) */
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBaseExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBaseExpression.java
@@ -35,35 +35,25 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 
-  @Override
+  @Override public String toString() {
-  public String toString() {
+    return super.toString();
-    StringBuilder result = new StringBuilder();
+  }
+
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
     if (number != null) {
-      result.append(number.toString());
+      number.toString(params, builder);
     } else if (identifier != null) {
-      result.append(identifier.toString());
+      identifier.toString(params, builder);
     } else if (string != null) {
-      result.append(string);
+      builder.append(string);
     } else if (inputParam != null) {
-      if (inputFinalValue == UNSET) {
+      inputParam.toString(params,builder);
-        result.append(inputParam.toString());
-      } else if (inputFinalValue == null) {
-        result.append("NULL");
-      } else {
-        if (inputFinalValue instanceof String) {
-          result.append("\"");
-          result.append(OExpression.encode(inputFinalValue.toString()));
-          result.append("\"");
-        } else {
-          result.append(inputFinalValue.toString());
-        }
-      }
     }
 
     if (modifier != null) {
-      result.append(modifier.toString());
+      modifier.toString(params, builder);
     }
-    return result.toString();
+
   }
 
   public Object execute(OIdentifiable iCurrentRecord, OCommandContext ctx) {
@@ -83,20 +73,7 @@ public Object execute(OIdentifiable iCurrentRecord, OCommandContext ctx) {
     return result;
   }
 
-  public void replaceParameters(Map<Object, Object> params) {
+
-    if (identifier != null) {
-      identifier.replaceParameters(params);
-    }
-    if (inputParam != null) {
-      Object result = inputParam.bindFromInputParams(params);
-      if (inputParam != result) {
-        inputFinalValue = result;
-      }
-    }
-    if (modifier != null) {
-      modifier.replaceParameters(params);
-    }
-  }
 
   @Override
   protected boolean supportsBasicCalculation() {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBaseIdentifier.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBaseIdentifier.java
@@ -26,22 +26,14 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 
-  @Override
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
-  public String toString() {
     if (levelZero != null) {
-      return levelZero.toString();
+      levelZero.toString(params, builder);
     } else if (suffix != null) {
-      return suffix.toString();
+      suffix.toString(params, builder);
     }
-    return super.toString();
   }
 
-  public void replaceParameters(Map<Object, Object> params) {
-    if (levelZero != null) {
-      levelZero.replaceParameters(params);
-    }
-
-  }
 
   public Object execute(OIdentifiable iCurrentRecord, OCommandContext ctx) {
     if (levelZero != null) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBatch.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OBatch.java
@@ -11,7 +11,6 @@ class OBatch extends SimpleNode {
 
   protected OInputParameter inputParam;
 
-  protected Object          inputFinalValue;
 
   public OBatch(int id) {
     super(id);
@@ -27,30 +26,18 @@ public Object jjtAccept(OrientSqlVisitor visitor, Object data) {
     return visitor.visit(this, data);
   }
 
-  public void replaceParameters(Map<Object, Object> params) {
-    if (inputParam != null) {
-      Object result = inputParam.bindFromInputParams(params);
-      if (inputParam != result) {
-        inputFinalValue = result;
-      }
-    }
-  }
 
-  @Override
+  public void toString(Map<Object, Object> params, StringBuilder builder) {
-  public String toString() {
     if (num == null && inputParam == null) {
-      return "";
+      return;
     }
-    StringBuilder result = new StringBuilder();
+
-    result.append(" BATCH ");
+    builder.append(" BATCH ");
     if (num != null) {
-      result.append(num);
+      num.toString(params, builder);
-    } else if (inputFinalValue != null) {
-      result.append(inputFinalValue);
     } else {
-      result.append(inputParam);
+      inputParam.toString(params, builder);
     }
-    return result.toString();
   }
 }
 /* JavaCC - OriginalChecksum=b1587460e08cbf21086d8c8fcca192e0 (do not edit this line) */