yujunjun/openspg
1
0
Fork 0
mirror of https://github.com/OpenSPG/openspg.git synced 2025-06-27 03:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(reasoner): bugfix in AggregationPlanner (#80)

Browse Source
This commit is contained in:
FishJoy 2024-01-11 14:44:13 +08:00 committed by GitHub
parent 92e4209fd2
commit 5a43c1c0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.scalafmt.conf Normal file
View File

@ -0,0 +1,12 @@
version = 2.7.5
align = none
align.openParenDefnSite = false
align.openParenCallSite = false
align.tokens = []
optIn = {
configStyleArguments = false
}
danglingParentheses = false
docstrings = JavaDoc
maxColumn = 98
newlines.topLevelStatements = [before,after]

9
reasoner/lube-logical/src/main/scala/com/antgroup/openspg/reasoner/lube/logical/planning/AggregationPlanner.scala
View File

@ -22,11 +22,7 @@ import com.antgroup.openspg.reasoner.lube.catalog.struct.Field
import com.antgroup.openspg.reasoner.lube.common.expr.Aggregator import com.antgroup.openspg.reasoner.lube.common.expr.Aggregator
import com.antgroup.openspg.reasoner.lube.common.graph._ import com.antgroup.openspg.reasoner.lube.common.graph._
import com.antgroup.openspg.reasoner.lube.logical._ import com.antgroup.openspg.reasoner.lube.logical._
import com.antgroup.openspg.reasoner.lube.logical.operators.{ import com.antgroup.openspg.reasoner.lube.logical.operators.{Aggregate, LogicalLeafOperator, LogicalOperator}
Aggregate,
LogicalOperator,
StackingLogicalOperator
}
import com.antgroup.openspg.reasoner.lube.utils.ExprUtils import com.antgroup.openspg.reasoner.lube.utils.ExprUtils
import org.apache.commons.lang3.StringUtils import org.apache.commons.lang3.StringUtils
@ -108,7 +104,8 @@ class AggregationPlanner(group: List[String], aggregations: Aggregations) {
private def getTargetAlias(aliasSet: Set[String], dependency: LogicalOperator): String = { private def getTargetAlias(aliasSet: Set[String], dependency: LogicalOperator): String = {
val aliasOrder = dependency.transform[String] { val aliasOrder = dependency.transform[String] {
case (stackOp: StackingLogicalOperator, list) => case (leafOp: LogicalLeafOperator, _) => ""
case (stackOp: LogicalOperator, list) =>
if (StringUtils.isEmpty(list.head)) { if (StringUtils.isEmpty(list.head)) {
val curAliasSet = stackOp.fields.map(_.name).toSet val curAliasSet = stackOp.fields.map(_.name).toSet
if (aliasSet.diff(curAliasSet).isEmpty) { if (aliasSet.diff(curAliasSet).isEmpty) {