Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public class Metrics implements IMetrics {
public long[] localReadBytes;
public long[] ramReadBytes;
public long[] preloadSplits;
public long[] pageLoadTime;
public long[] dataSourceAddSplitTime;
public long[] dataSourceReadTime;

Expand Down Expand Up @@ -101,6 +102,7 @@ public Metrics(
long[] localReadBytes,
long[] ramReadBytes,
long[] preloadSplits,
long[] pageLoadTime,
long[] dataSourceAddSplitTime,
long[] dataSourceReadTime,
long[] physicalWrittenBytes,
Expand Down Expand Up @@ -142,6 +144,7 @@ public Metrics(
this.localReadBytes = localReadBytes;
this.ramReadBytes = ramReadBytes;
this.preloadSplits = preloadSplits;
this.pageLoadTime = pageLoadTime;
this.dataSourceAddSplitTime = dataSourceAddSplitTime;
this.dataSourceReadTime = dataSourceReadTime;

Expand Down Expand Up @@ -191,6 +194,7 @@ public OperatorMetrics getOperatorMetrics(int index) {
localReadBytes[index],
ramReadBytes[index],
preloadSplits[index],
pageLoadTime[index],
dataSourceAddSplitTime[index],
dataSourceReadTime[index],
physicalWrittenBytes[index],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public class OperatorMetrics implements IOperatorMetrics {
public long localReadBytes;
public long ramReadBytes;
public long preloadSplits;
public long pageLoadTime;
public long dataSourceAddSplitTime;
public long dataSourceReadTime;

Expand Down Expand Up @@ -94,6 +95,7 @@ public OperatorMetrics(
long localReadBytes,
long ramReadBytes,
long preloadSplits,
long pageLoadTime,
long dataSourceAddSplitTime,
long dataSourceReadTime,
long physicalWrittenBytes,
Expand Down Expand Up @@ -133,6 +135,7 @@ public OperatorMetrics(
this.localReadBytes = localReadBytes;
this.ramReadBytes = ramReadBytes;
this.preloadSplits = preloadSplits;
this.pageLoadTime = pageLoadTime;
this.dataSourceAddSplitTime = dataSourceAddSplitTime;
this.dataSourceReadTime = dataSourceReadTime;
this.physicalWrittenBytes = physicalWrittenBytes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ class VeloxMetricsApi extends MetricsApi with Logging {
"skippedSplits" -> SQLMetrics.createMetric(sparkContext, "number of skipped splits"),
"processedSplits" -> SQLMetrics.createMetric(sparkContext, "number of processed splits"),
"preloadSplits" -> SQLMetrics.createMetric(sparkContext, "number of preloaded splits"),
"pageLoadTime" -> SQLMetrics.createNanoTimingMetric(sparkContext, "page load time"),
"dataSourceAddSplitTime" -> SQLMetrics.createNanoTimingMetric(
sparkContext,
"data source add split time"),
Expand Down Expand Up @@ -158,6 +159,7 @@ class VeloxMetricsApi extends MetricsApi with Logging {
"skippedSplits" -> SQLMetrics.createMetric(sparkContext, "number of skipped splits"),
"processedSplits" -> SQLMetrics.createMetric(sparkContext, "number of processed splits"),
"preloadSplits" -> SQLMetrics.createMetric(sparkContext, "number of preloaded splits"),
"pageLoadTime" -> SQLMetrics.createNanoTimingMetric(sparkContext, "page load time"),
"dataSourceAddSplitTime" -> SQLMetrics.createNanoTimingMetric(
sparkContext,
"data source add split time"),
Expand Down Expand Up @@ -208,6 +210,7 @@ class VeloxMetricsApi extends MetricsApi with Logging {
"skippedSplits" -> SQLMetrics.createMetric(sparkContext, "number of skipped splits"),
"processedSplits" -> SQLMetrics.createMetric(sparkContext, "number of processed splits"),
"preloadSplits" -> SQLMetrics.createMetric(sparkContext, "number of preloaded splits"),
"pageLoadTime" -> SQLMetrics.createNanoTimingMetric(sparkContext, "page load time"),
"dataSourceAddSplitTime" -> SQLMetrics.createNanoTimingMetric(
sparkContext,
"data source add split time"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class BatchScanMetricsUpdater(val metrics: Map[String, SQLMetric]) extends Metri
metrics("localReadBytes") += operatorMetrics.localReadBytes
metrics("ramReadBytes") += operatorMetrics.ramReadBytes
metrics("preloadSplits") += operatorMetrics.preloadSplits
metrics("pageLoadTime") += operatorMetrics.pageLoadTime
metrics("dataSourceAddSplitTime") += operatorMetrics.dataSourceAddSplitTime
metrics("dataSourceReadTime") += operatorMetrics.dataSourceReadTime
metrics("loadLazyVectorTime") += operatorMetrics.loadLazyVectorTime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class FileSourceScanMetricsUpdater(@transient val metrics: Map[String, SQLMetric
val skippedSplits: SQLMetric = metrics("skippedSplits")
val processedSplits: SQLMetric = metrics("processedSplits")
val preloadSplits: SQLMetric = metrics("preloadSplits")
val pageLoadTime: SQLMetric = metrics("pageLoadTime")
val dataSourceAddSplitTime: SQLMetric = metrics("dataSourceAddSplitTime")
val dataSourceReadTime: SQLMetric = metrics("dataSourceReadTime")
val skippedStrides: SQLMetric = metrics("skippedStrides")
Expand Down Expand Up @@ -83,6 +84,7 @@ class FileSourceScanMetricsUpdater(@transient val metrics: Map[String, SQLMetric
localReadBytes += operatorMetrics.localReadBytes
ramReadBytes += operatorMetrics.ramReadBytes
preloadSplits += operatorMetrics.preloadSplits
pageLoadTime += operatorMetrics.pageLoadTime
dataSourceAddSplitTime += operatorMetrics.dataSourceAddSplitTime
dataSourceReadTime += operatorMetrics.dataSourceReadTime
loadLazyVectorTime += operatorMetrics.loadLazyVectorTime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class HiveTableScanMetricsUpdater(@transient val metrics: Map[String, SQLMetric]
val skippedSplits: SQLMetric = metrics("skippedSplits")
val processedSplits: SQLMetric = metrics("processedSplits")
val preloadSplits: SQLMetric = metrics("preloadSplits")
val pageLoadTime: SQLMetric = metrics("pageLoadTime")
val dataSourceAddSplitTime: SQLMetric = metrics("dataSourceAddSplitTime")
val dataSourceReadTime: SQLMetric = metrics("dataSourceReadTime")
val skippedStrides: SQLMetric = metrics("skippedStrides")
Expand Down Expand Up @@ -78,6 +79,7 @@ class HiveTableScanMetricsUpdater(@transient val metrics: Map[String, SQLMetric]
localReadBytes += operatorMetrics.localReadBytes
ramReadBytes += operatorMetrics.ramReadBytes
preloadSplits += operatorMetrics.preloadSplits
pageLoadTime += operatorMetrics.pageLoadTime
dataSourceAddSplitTime += operatorMetrics.dataSourceAddSplitTime
dataSourceReadTime += operatorMetrics.dataSourceReadTime
loadLazyVectorTime += operatorMetrics.loadLazyVectorTime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ object MetricsUtil extends Logging {
var localReadBytes: Long = 0
var ramReadBytes: Long = 0
var preloadSplits: Long = 0
var pageLoadTime: Long = 0
var dataSourceAddSplitTime: Long = 0
var dataSourceReadTime: Long = 0
var numWrittenFiles: Long = 0
Expand Down Expand Up @@ -166,6 +167,7 @@ object MetricsUtil extends Logging {
localReadBytes += metrics.localReadBytes
ramReadBytes += metrics.ramReadBytes
preloadSplits += metrics.preloadSplits
pageLoadTime += metrics.pageLoadTime
dataSourceAddSplitTime += metrics.dataSourceAddSplitTime
dataSourceReadTime += metrics.dataSourceReadTime
numWrittenFiles += metrics.numWrittenFiles
Expand Down Expand Up @@ -206,6 +208,7 @@ object MetricsUtil extends Logging {
localReadBytes,
ramReadBytes,
preloadSplits,
pageLoadTime,
dataSourceAddSplitTime,
dataSourceReadTime,
physicalWrittenBytes,
Expand Down
3 changes: 2 additions & 1 deletion cpp/core/jni/JniWrapper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
env,
metricsBuilderClass,
"<init>",
"([J[J[J[J[J[J[J[J[J[JJ[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[JLjava/lang/String;)V");
"([J[J[J[J[J[J[J[J[J[JJ[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[J[JLjava/lang/String;)V");

nativeColumnarToRowInfoClass =
createGlobalClassReferenceOrError(env, "Lorg/apache/gluten/vectorized/NativeColumnarToRowInfo;");
Expand Down Expand Up @@ -585,6 +585,7 @@ JNIEXPORT jobject JNICALL Java_org_apache_gluten_metrics_IteratorMetricsJniWrapp
longArray[Metrics::kLocalReadBytes],
longArray[Metrics::kRamReadBytes],
longArray[Metrics::kPreloadSplits],
longArray[Metrics::kPageLoadTime],
longArray[Metrics::kDataSourceAddSplitWallNanos],
longArray[Metrics::kDataSourceReadWallNanos],
longArray[Metrics::kPhysicalWrittenBytes],
Expand Down
1 change: 1 addition & 0 deletions cpp/core/utils/Metrics.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ struct Metrics {
kLocalReadBytes,
kRamReadBytes,
kPreloadSplits,
kPageLoadTime,
kDataSourceAddSplitWallNanos,
kDataSourceReadWallNanos,

Expand Down
2 changes: 2 additions & 0 deletions cpp/velox/compute/WholeStageResultIterator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const std::string kStorageReadBytes = "storageReadBytes";
const std::string kLocalReadBytes = "localReadBytes";
const std::string kRamReadBytes = "ramReadBytes";
const std::string kPreloadSplits = "readyPreloadedSplits";
const std::string kPageLoadTime = "pageLoadTimeNs";
const std::string kDataSourceAddSplitWallNanos = "dataSourceAddSplitWallNanos";
const std::string kDataSourceReadWallNanos = "dataSourceReadWallNanos";
const std::string kNumWrittenFiles = "numWrittenFiles";
Expand Down Expand Up @@ -496,6 +497,7 @@ void WholeStageResultIterator::collectMetrics() {
metrics_->get(Metrics::kRamReadBytes)[metricIndex] = runtimeMetric("sum", second->customStats, kRamReadBytes);
metrics_->get(Metrics::kPreloadSplits)[metricIndex] =
runtimeMetric("sum", entry.second->customStats, kPreloadSplits);
metrics_->get(Metrics::kPageLoadTime)[metricIndex] = runtimeMetric("sum", second->customStats, kPageLoadTime);
metrics_->get(Metrics::kDataSourceAddSplitWallNanos)[metricIndex] =
runtimeMetric("sum", second->customStats, kDataSourceAddSplitWallNanos);
metrics_->get(Metrics::kDataSourceReadWallNanos)[metricIndex] =
Expand Down