to fix aggregate functions that should be scripted

Author: fupelaqu

bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala

@@ -159,7 +159,14 @@ object ElasticAggregation {
         val script = Script(s"$context$scriptSrc").lang("painless")
         buildScript(aggName, script)
       } else {
-        buildField(aggName, sourceField)
+        aggType match {
+          case th: WindowFunction if th.shouldBeScripted =>
+            val context = PainlessContext()
+            val scriptSrc = th.identifier.painless(Some(context))
+            val script = Script(s"$context$scriptSrc").lang("painless")
+            buildScript(aggName, script)
+          case _ => buildField(aggName, sourceField)
+        }
       }
     }
 

es6/bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala

@@ -159,7 +159,14 @@ object ElasticAggregation {
         val script = Script(s"$context$scriptSrc").lang("painless")
         buildScript(aggName, script)
       } else {
-        buildField(aggName, sourceField)
+        aggType match {
+          case th: WindowFunction if th.shouldBeScripted =>
+            val context = PainlessContext()
+            val scriptSrc = th.identifier.painless(Some(context))
+            val script = Script(s"$context$scriptSrc").lang("painless")
+            buildScript(aggName, script)
+          case _ => buildField(aggName, sourceField)
+        }
       }
     }
 

sql/src/main/scala/app/softnetwork/elastic/sql/function/package.scala

@@ -37,6 +37,8 @@ package object function {
 
   trait FunctionWithIdentifier extends Function {
     def identifier: Identifier
+
+    override def shouldBeScripted: Boolean = identifier.shouldBeScripted
   }
 
   trait FunctionWithValue[+T] extends Function with TokenValue {