rebase to master solve conflict

apache · May 5, 2022 · 95f64ce · 95f64ce
1 parent cc16ca0
commit 95f64ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/be/src/vec/aggregate_functions/aggregate_function_window.h b/be/src/vec/aggregate_functions/aggregate_function_window.h
@@ -439,9 +439,10 @@ static IAggregateFunction* create_function_single_value(const String& name,
     }
     if (which.is_string_or_fixed_string()) {
         return new AggregateFunctionTemplate<
-                Data<LeadAndLagData<StringRef, result_is_nullable, true, StoreType>>>(argument_types);
+                Data<LeadAndLagData<StringRef, result_is_nullable, true, StoreType>>>(
+                argument_types);
     }
-    DCHECK(false) << "with unknowed type, failed in  create_aggregate_function_leadlag";
+    DCHECK(false) << "with unknowed type, failed in  create_aggregate_function_" << name;
     return nullptr;
 }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyticExpr.java
@@ -710,13 +710,13 @@ private void standardize(Analyzer analyzer) throws AnalysisException {
             resetWindow = true;
         }
 
-       // Change first_value RANGE windows to ROWS 
-       if ((analyticFnName.getFunction().equalsIgnoreCase(FIRSTVALUE))
+        // Change first_value RANGE windows to ROWS 
+        if ((analyticFnName.getFunction().equalsIgnoreCase(FIRSTVALUE))
                 && window != null
                 && window.getType() == AnalyticWindow.Type.RANGE) {
             window = new AnalyticWindow(AnalyticWindow.Type.ROWS, window.getLeftBoundary(),
                         window.getRightBoundary());
-        } 
+        }
     }
 
     /**