diff --git a/src/common/src/tarithoperator.c b/src/common/src/tarithoperator.c
index 31c7e32773965c866f069d04910cbbc59c187762..d0183ba5b0998b8aa509e360c4dfc02e0721604c 100644
--- a/src/common/src/tarithoperator.c
+++ b/src/common/src/tarithoperator.c
@@ -21,7 +21,7 @@
 #include "tcompare.h"
 #include "texpr.h"
 
-//GET_TYPED_DATA(v, double, _right_type, (char *)&((right)[i]));                                
+//GET_TYPED_DATA(v, double, _right_type, (char *)&((right)[i]));
 
 void calc_i32_i32_add(void *left, void *right, int32_t numLeft, int32_t numRight, void *output, int32_t order) {
   int32_t *pLeft = (int32_t *)left;
@@ -183,215 +183,219 @@ _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFn(int32_t srcType) {
 }
 
 void vectorAdd(void *left, int32_t len1, int32_t _left_type, void *right, int32_t len2, int32_t _right_type, void *out, int32_t _ord) {
-  int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;                                 
-  int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;                                               
+  int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;
+  int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;
   double *output=(double*)out;
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnLeft = getVectorValueAddrFn(_left_type);
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnRight = getVectorValueAddrFn(_right_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(_left_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(_right_type);
-                                                                                                 
-  if ((len1) == (len2)) {                                                                           
-    for (; i < (len2) && i >= 0; i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) { 
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) + getVectorDoubleValueFnRight(right,i));                                                       
-    }                                                                                               
-  } else if ((len1) == 1) {                                                                         
-    for (; i >= 0 && i < (len2); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {         
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) + getVectorDoubleValueFnRight(right,i));                                                       
-    }                                                                                               
-  } else if ((len2) == 1) {                                                                         
-    for (; i >= 0 && i < (len1); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {         
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) + getVectorDoubleValueFnRight(right,0));                                                        
-    }                                                                                               
-  }                                                                                                 
+
+  if ((len1) == (len2)) {
+    for (; i < (len2) && i >= 0; i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) + getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len1) == 1) {
+    for (; i >= 0 && i < (len2); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) + getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len2) == 1) {
+    for (; i >= 0 && i < (len1); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) + getVectorDoubleValueFnRight(right,0));
+    }
+  }
 }
+
 void vectorSub(void *left, int32_t len1, int32_t _left_type, void *right, int32_t len2, int32_t _right_type, void *out, int32_t _ord) {
-  int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;                                 
-  int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;                                               
+  int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;
+  int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;
   double *output=(double*)out;
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnLeft = getVectorValueAddrFn(_left_type);
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnRight = getVectorValueAddrFn(_right_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(_left_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(_right_type);
-                                                                                                  
-  if ((len1) == (len2)) {                                                                           
-    for (; i < (len2) && i >= 0; i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) { 
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) - getVectorDoubleValueFnRight(right,i));                                                       
-    }                                                                                               
-  } else if ((len1) == 1) {                                                                         
-    for (; i >= 0 && i < (len2); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {         
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) - getVectorDoubleValueFnRight(right,i));                                                       
-    }                                                                                               
-  } else if ((len2) == 1) {                                                                         
-    for (; i >= 0 && i < (len1); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {         
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) - getVectorDoubleValueFnRight(right,0));                                                        
-    }                                                                                               
-  }                                                                                                 
+
+  if ((len1) == (len2)) {
+    for (; i < (len2) && i >= 0; i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) - getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len1) == 1) {
+    for (; i >= 0 && i < (len2); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) - getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len2) == 1) {
+    for (; i >= 0 && i < (len1); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) - getVectorDoubleValueFnRight(right,0));
+    }
+  }
 }
+
 void vectorMultiply(void *left, int32_t len1, int32_t _left_type, void *right, int32_t len2, int32_t _right_type, void *out, int32_t _ord) {
-  int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;                                 
-  int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;                                               
+  int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;
+  int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;
   double *output=(double*)out;
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnLeft = getVectorValueAddrFn(_left_type);
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnRight = getVectorValueAddrFn(_right_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(_left_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(_right_type);
-                                                                                                  
-  if ((len1) == (len2)) {                                                                           
-    for (; i < (len2) && i >= 0; i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) { 
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) * getVectorDoubleValueFnRight(right,i));    
-    }                                                                                               
-  } else if ((len1) == 1) {                                                                         
-    for (; i >= 0 && i < (len2); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {         
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) * getVectorDoubleValueFnRight(right,i));                                                       
-    }                                                                                               
-  } else if ((len2) == 1) {                                                                         
-    for (; i >= 0 && i < (len1); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {         
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) * getVectorDoubleValueFnRight(right,0));                                                        
-    }                                                                                               
-  }                                                                                                 
+
+  if ((len1) == (len2)) {
+    for (; i < (len2) && i >= 0; i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) * getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len1) == 1) {
+    for (; i >= 0 && i < (len2); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) * getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len2) == 1) {
+    for (; i >= 0 && i < (len1); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) * getVectorDoubleValueFnRight(right,0));
+    }
+  }
 }
-void vectorDivide(void *left, int32_t len1, int32_t _left_type, void *right, int32_t len2, int32_t _right_type, void *out, int32_t _ord) {                
-  int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;                                 
-  int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;                                               
+
+void vectorDivide(void *left, int32_t len1, int32_t _left_type, void *right, int32_t len2, int32_t _right_type, void *out, int32_t _ord) {
+  int32_t i = ((_ord) == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;
+  int32_t step = ((_ord) == TSDB_ORDER_ASC) ? 1 : -1;
   double *output=(double*)out;
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnLeft = getVectorValueAddrFn(_left_type);
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnRight = getVectorValueAddrFn(_right_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(_left_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(_right_type);
-                                                                                                    
-  if ((len1) == (len2)) {                                                                           
-    for (; i < (len2) && i >= 0; i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) { 
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      double v, u = 0.0;                                                                            
-      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,i));                                
-      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {                                   
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) /getVectorDoubleValueFnRight(right,i));                                                       
-    }                                                                                               
-  } else if ((len1) == 1) {                                                                         
-    for (; i >= 0 && i < (len2); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {         
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      double v, u = 0.0;                                                                            
-      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,i));                                
-      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {                                   
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) /getVectorDoubleValueFnRight(right,i));                                                       
-    }                                                                                               
-  } else if ((len2) == 1) {                                                                         
-    for (; i >= 0 && i < (len1); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {         
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      double v, u = 0.0;                                                                            
-      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,0));                                
-      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {                                   
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) /getVectorDoubleValueFnRight(right,0));                                                       
-    }                                                                                               
-  }                                                                                                 
-} 
+
+  if ((len1) == (len2)) {
+    for (; i < (len2) && i >= 0; i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      double v, u = 0.0;
+      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,i));
+      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) /getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len1) == 1) {
+    for (; i >= 0 && i < (len2); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      double v, u = 0.0;
+      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,i));
+      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) /getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len2) == 1) {
+    for (; i >= 0 && i < (len1); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      double v, u = 0.0;
+      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,0));
+      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) /getVectorDoubleValueFnRight(right,0));
+    }
+  }
+}
+
 void vectorRemainder(void *left, int32_t len1, int32_t _left_type, void *right, int32_t len2, int32_t _right_type, void *out, int32_t _ord) {
-  int32_t i = (_ord == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;                                   
-  int32_t step = (_ord == TSDB_ORDER_ASC) ? 1 : -1;                                                 
+  int32_t i = (_ord == TSDB_ORDER_ASC) ? 0 : MAX(len1, len2) - 1;
+  int32_t step = (_ord == TSDB_ORDER_ASC) ? 1 : -1;
   double *output=(double*)out;
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnLeft = getVectorValueAddrFn(_left_type);
   _arithmetic_getVectorValueAddr_fn_t getVectorValueAddrFnRight = getVectorValueAddrFn(_right_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(_left_type);
   _arithmetic_getVectorDoubleValue_fn_t getVectorDoubleValueFnRight = getVectorDoubleValueFn(_right_type);
-                                                                                                    
-  if (len1 == (len2)) {                                                                             
-    for (; i >= 0 && i < (len2); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {     
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      double v, u = 0.0;                                                                            
-      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,i));                                
-      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {                                   
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) - ((int64_t)(getVectorDoubleValueFnLeft(left,i) / getVectorDoubleValueFnRight(right,i))) * getVectorDoubleValueFnRight(right,i));      
-    }                                                                                               
-  } else if (len1 == 1) {                                                                           
-    for (; i >= 0 && i < (len2); i += step, output += 1) {                                           
-      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {       
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      double v, u = 0.0;                                                                            
-      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,i));                                
-      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {                                   
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) - ((int64_t)(getVectorDoubleValueFnLeft(left,0) / getVectorDoubleValueFnRight(right,i))) * getVectorDoubleValueFnRight(right,i));      
-    }                                                                                               
-  } else if ((len2) == 1) {                                                                         
-    for (; i >= 0 && i < len1; i += step, output += 1) {                                             
-      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {       
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      double v, u = 0.0;                                                                            
-      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,0));                                
-      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {                                   
-        SET_DOUBLE_NULL(output);                                                                       
-        continue;                                                                                   
-      }                                                                                             
-      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) - ((int64_t)(getVectorDoubleValueFnLeft(left,i) / getVectorDoubleValueFnRight(right,0))) * getVectorDoubleValueFnRight(right,0));      
-    }                                                                                               
-  }                                                                                                 
+
+  if (len1 == (len2)) {
+    for (; i >= 0 && i < (len2); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      double v, u = 0.0;
+      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,i));
+      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) - ((int64_t)(getVectorDoubleValueFnLeft(left,i) / getVectorDoubleValueFnRight(right,i))) * getVectorDoubleValueFnRight(right,i));
+    }
+  } else if (len1 == 1) {
+    for (; i >= 0 && i < (len2); i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,0), _left_type) || isNull(getVectorValueAddrFnRight(right,i), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      double v, u = 0.0;
+      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,i));
+      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,0) - ((int64_t)(getVectorDoubleValueFnLeft(left,0) / getVectorDoubleValueFnRight(right,i))) * getVectorDoubleValueFnRight(right,i));
+    }
+  } else if ((len2) == 1) {
+    for (; i >= 0 && i < len1; i += step, output += 1) {
+      if (isNull(getVectorValueAddrFnLeft(left,i), _left_type) || isNull(getVectorValueAddrFnRight(right,0), _right_type)) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      double v, u = 0.0;
+      GET_TYPED_DATA(v, double, _right_type, getVectorValueAddrFnRight(right,0));
+      if (getComparFunc(TSDB_DATA_TYPE_DOUBLE, 0)(&v, &u) == 0) {
+        SET_DOUBLE_NULL(output);
+        continue;
+      }
+      SET_DOUBLE_VAL(output,getVectorDoubleValueFnLeft(left,i) - ((int64_t)(getVectorDoubleValueFnLeft(left,i) / getVectorDoubleValueFnRight(right,0))) * getVectorDoubleValueFnRight(right,0));
+    }
+  }
 }
 
 _arithmetic_operator_fn_t getArithmeticOperatorFn(int32_t arithmeticOptr) {