Github user davies commented on a diff in the pull request:
https://github.com/apache/spark/pull/12007#discussion_r57670804
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/ExistingRDD.scala ---
@@ -241,73 +256,89 @@ private[sql] case class DataSourceScan(
// TODO: The abstractions between this class and SqlNewHadoopRDD makes
it difficult to know
// here which path to use. Fix this.
- ctx.currentVars = null
- val columns1 = (output zip colVars).map { case (attr, colVar) =>
- genCodeColumnVector(ctx, colVar, rowidx, attr.dataType,
attr.nullable) }
- val scanBatches = ctx.freshName("processBatches")
- ctx.addNewFunction(scanBatches,
- s"""
- | private void $scanBatches() throws java.io.IOException {
- | while (true) {
- | int numRows = $batch.numRows();
- | if ($idx == 0) {
- | ${columnAssigns.mkString("", "\n", "\n")}
- | $numOutputRows.add(numRows);
- | }
- |
- | // this loop is very perf sensitive and changes to it should
be measured carefully
- | while ($idx < numRows) {
- | int $rowidx = $idx++;
- | ${consume(ctx, columns1).trim}
- | if (shouldStop()) return;
- | }
- |
- | if (!$input.hasNext()) {
- | $batch = null;
- | break;
- | }
- | $batch = ($columnarBatchClz)$input.next();
- | $idx = 0;
- | }
- | }""".stripMargin)
-
val exprRows =
- output.zipWithIndex.map(x => new BoundReference(x._2, x._1.dataType,
x._1.nullable))
+ output.zipWithIndex.map(x => new BoundReference(x._2,
x._1.dataType, x._1.nullable))
ctx.INPUT_ROW = row
ctx.currentVars = null
- val columns2 = exprRows.map(_.gen(ctx))
+ val columnsRowInput = exprRows.map(_.gen(ctx))
val inputRow = if (outputUnsafeRows) row else null
val scanRows = ctx.freshName("processRows")
ctx.addNewFunction(scanRows,
s"""
- | private void $scanRows(InternalRow $row) throws
java.io.IOException {
- | boolean firstRow = true;
- | while (firstRow || $input.hasNext()) {
- | if (firstRow) {
- | firstRow = false;
- | } else {
- | $row = (InternalRow) $input.next();
- | }
- | $numOutputRows.add(1);
- | ${consume(ctx, columns2, inputRow).trim}
- | if (shouldStop()) return;
- | }
- | }""".stripMargin)
-
- val value = ctx.freshName("value")
- s"""
- | if ($batch != null) {
- | $scanBatches();
- | } else if ($input.hasNext()) {
- | Object $value = $input.next();
- | if ($value instanceof $columnarBatchClz) {
- | $batch = ($columnarBatchClz)$value;
- | $scanBatches();
- | } else {
- | $scanRows((InternalRow) $value);
- | }
- | }
- """.stripMargin
+ | private void $scanRows(InternalRow $row) throws
java.io.IOException {
+ | boolean firstRow = true;
+ | while (!shouldStop() && (firstRow || $input.hasNext())) {
+ | if (firstRow) {
+ | firstRow = false;
+ | } else {
+ | $row = (InternalRow) $input.next();
+ | }
+ | $numOutputRows.add(1);
+ | ${consume(ctx, columnsRowInput, inputRow).trim}
+ | }
+ | }""".stripMargin)
+
+ // Timers for how long we spent inside the scan. We can only maintain
this when using batches,
+ // otherwise the overhead is too high.
+ if (canProcessBatches()) {
+ val scanTimeMetric = metricTerm(ctx, "scanTime")
+ val getBatchStart = ctx.freshName("scanStart")
+ val scanTimeTotalNs = ctx.freshName("scanTime")
+ ctx.currentVars = null
+ val columnsBatchInput = (output zip colVars).map { case (attr,
colVar) =>
+ genCodeColumnVector(ctx, colVar, rowidx, attr.dataType,
attr.nullable) }
+ val scanBatches = ctx.freshName("processBatches")
+ ctx.addMutableState("long", scanTimeTotalNs, s"$scanTimeTotalNs =
0;")
+
+ ctx.addNewFunction(scanBatches,
+ s"""
+ | private void $scanBatches() throws java.io.IOException {
+ | while (true) {
+ | int numRows = $batch.numRows();
+ | if ($idx == 0) {
+ | ${columnAssigns.mkString("", "\n", "\n")}
+ | $numOutputRows.add(numRows);
+ | }
+ |
+ | while (!shouldStop() && $idx < numRows) {
+ | int $rowidx = $idx++;
+ | ${consume(ctx, columnsBatchInput).trim}
+ | }
+ | if (shouldStop()) return;
+ |
+ | long $getBatchStart = System.nanoTime();
+ | if (!$input.hasNext()) {
+ | $batch = null;
+ | $scanTimeMetric.add($scanTimeTotalNs / (1000 * 1000));
+ | break;
+ | }
+ | $batch = ($columnarBatchClz)$input.next();
+ | $scanTimeTotalNs += System.nanoTime() - $getBatchStart;
+ | $idx = 0;
+ | }
+ | }""".stripMargin)
+
+ val value = ctx.freshName("value")
+ s"""
+ | if ($batch != null) {
+ | $scanBatches();
+ | } else if ($input.hasNext()) {
+ | Object $value = $input.next();
+ | if ($value instanceof $columnarBatchClz) {
--- End diff --
Should we remove this runtime check now?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
