fix metric

apache · Jul 2, 2024 · f68aaca · f68aaca
1 parent 70fb353
commit f68aaca
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 29 deletions.
diff --git a/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/StorageJoinBuilder.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/StorageJoinBuilder.java
@@ -77,9 +77,9 @@ public static long build(
 
     int joinType;
     if (broadCastContext.buildHashTableId().startsWith("BuiltBNLJBroadcastTable-")) {
-      joinType = SubstraitUtil.toSubstrait(broadCastContext.joinType()).ordinal();
-    } else {
       joinType = SubstraitUtil.toCrossRelSubstrait(broadCastContext.joinType()).ordinal();
+    } else {
+      joinType = SubstraitUtil.toSubstrait(broadCastContext.joinType()).ordinal();
     }
 
     return nativeBuild(

diff --git a/...nds-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHMetricsApi.scala b/...nds-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHMetricsApi.scala
@@ -357,10 +357,6 @@ class CHMetricsApi extends MetricsApi with Logging with LogLevelUtil {
     "extraTime" -> SQLMetrics.createTimingMetric(sparkContext, "extra operators time"),
     "inputWaitTime" -> SQLMetrics.createTimingMetric(sparkContext, "time of waiting for data"),
     "outputWaitTime" -> SQLMetrics.createTimingMetric(sparkContext, "time of waiting for output"),
-    "streamPreProjectionTime" ->
-      SQLMetrics.createTimingMetric(sparkContext, "time of stream side preProjection"),
-    "buildPreProjectionTime" ->
-      SQLMetrics.createTimingMetric(sparkContext, "time of build side preProjection"),
     "postProjectTime" ->
       SQLMetrics.createTimingMetric(sparkContext, "time of postProjection"),
     "probeTime" ->

diff --git a/...ouse/src/main/scala/org/apache/gluten/metrics/BroadcastNestedLoopJoinMetricsUpdater.scala b/...ouse/src/main/scala/org/apache/gluten/metrics/BroadcastNestedLoopJoinMetricsUpdater.scala
@@ -32,24 +32,6 @@ class BroadcastNestedLoopJoinMetricsUpdater(val metrics: Map[String, SQLMetric])
           var currentIdx = operatorMetrics.metricsList.size() - 1
           var totalTime = 0L
 
-          // build side pre projection
-          if (joinParams.buildPreProjectionNeeded) {
-            metrics("buildPreProjectionTime") +=
-              (operatorMetrics.metricsList.get(currentIdx).time / 1000L).toLong
-            metrics("outputVectors") += operatorMetrics.metricsList.get(currentIdx).outputVectors
-            totalTime += operatorMetrics.metricsList.get(currentIdx).time
-            currentIdx -= 1
-          }
-
-          // stream side pre projection
-          if (joinParams.streamPreProjectionNeeded) {
-            metrics("streamPreProjectionTime") +=
-              (operatorMetrics.metricsList.get(currentIdx).time / 1000L).toLong
-            metrics("outputVectors") += operatorMetrics.metricsList.get(currentIdx).outputVectors
-            totalTime += operatorMetrics.metricsList.get(currentIdx).time
-            currentIdx -= 1
-          }
-
           // update fillingRightJoinSideTime
           MetricsUtil
             .getAllProcessorList(operatorMetrics.metricsList.get(currentIdx))
@@ -76,6 +58,8 @@ class BroadcastNestedLoopJoinMetricsUpdater(val metrics: Map[String, SQLMetric])
                 }
                 if (processor.name.equalsIgnoreCase("FilterTransform")) {
                   metrics("conditionTime") += (processor.time / 1000L).toLong
+                  metrics("numOutputRows") += processor.outputRows - processor.inputRows
+                  metrics("outputBytes") += processor.outputBytes - processor.inputBytes
                 }
                 if (processor.name.equalsIgnoreCase("JoiningTransform")) {
                   metrics("probeTime") += (processor.time / 1000L).toLong

diff --git a/...house/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSAbstractSuite.scala b/...house/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCDSAbstractSuite.scala
@@ -56,14 +56,11 @@ abstract class GlutenClickHouseTPCDSAbstractSuite
             Seq("q" + "%d".format(queryNum))
           }
           val noFallBack = queryNum match {
-            case i
-                if i == 10 || i == 16 || i == 35 || i == 45 || i == 77 ||
-                  i == 94 =>
+            case i if i == 10 || i == 16 || i == 35 || i == 45 || i == 94 =>
               // Q10 BroadcastHashJoin, ExistenceJoin
               // Q16 ShuffledHashJoin, NOT condition
               // Q35 BroadcastHashJoin, ExistenceJoin
               // Q45 BroadcastHashJoin, ExistenceJoin
-              // Q77 CartesianProduct
               // Q94 BroadcastHashJoin, LeftSemi, NOT condition
               (false, false)
             case j if j == 38 || j == 87 =>

diff --git a/...e/src/main/scala/org/apache/gluten/execution/BroadcastNestedLoopJoinExecTransformer.scala b/...e/src/main/scala/org/apache/gluten/execution/BroadcastNestedLoopJoinExecTransformer.scala
@@ -54,7 +54,7 @@ abstract class BroadcastNestedLoopJoinExecTransformer(
 
   // Hint substrait to switch the left and right,
   // since we assume always build right side in substrait.
-  protected lazy val needSwitchChildren: Boolean = buildSide match {
+  private lazy val needSwitchChildren: Boolean = buildSide match {
     case BuildLeft => true
     case BuildRight => false
   }