Skip to content

Commit

Permalink
Spark 3.4: Display more read metrics on Spark SQL UI (apache#9009)
Browse files Browse the repository at this point in the history
This change cherry-picks PR apache#8717 to Spark 3.4.
  • Loading branch information
karuppayya authored Nov 9, 2023
1 parent af132c7 commit f00d309
Show file tree
Hide file tree
Showing 26 changed files with 1,017 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,39 @@
import org.apache.iceberg.spark.Spark3Util;
import org.apache.iceberg.spark.SparkReadConf;
import org.apache.iceberg.spark.SparkSchemaUtil;
import org.apache.iceberg.spark.source.metrics.EqualityDeleteFiles;
import org.apache.iceberg.spark.source.metrics.IndexedDeleteFiles;
import org.apache.iceberg.spark.source.metrics.NumDeletes;
import org.apache.iceberg.spark.source.metrics.NumSplits;
import org.apache.iceberg.spark.source.metrics.ScannedDataFiles;
import org.apache.iceberg.spark.source.metrics.PositionalDeleteFiles;
import org.apache.iceberg.spark.source.metrics.ResultDataFiles;
import org.apache.iceberg.spark.source.metrics.ResultDeleteFiles;
import org.apache.iceberg.spark.source.metrics.ScannedDataManifests;
import org.apache.iceberg.spark.source.metrics.ScannedDeleteManifests;
import org.apache.iceberg.spark.source.metrics.SkippedDataFiles;
import org.apache.iceberg.spark.source.metrics.SkippedDataManifests;
import org.apache.iceberg.spark.source.metrics.TaskScannedDataFiles;
import org.apache.iceberg.spark.source.metrics.SkippedDeleteFiles;
import org.apache.iceberg.spark.source.metrics.SkippedDeleteManifests;
import org.apache.iceberg.spark.source.metrics.TaskEqualityDeleteFiles;
import org.apache.iceberg.spark.source.metrics.TaskIndexedDeleteFiles;
import org.apache.iceberg.spark.source.metrics.TaskPositionalDeleteFiles;
import org.apache.iceberg.spark.source.metrics.TaskResultDataFiles;
import org.apache.iceberg.spark.source.metrics.TaskResultDeleteFiles;
import org.apache.iceberg.spark.source.metrics.TaskScannedDataManifests;
import org.apache.iceberg.spark.source.metrics.TaskScannedDeleteManifests;
import org.apache.iceberg.spark.source.metrics.TaskSkippedDataFiles;
import org.apache.iceberg.spark.source.metrics.TaskSkippedDataManifests;
import org.apache.iceberg.spark.source.metrics.TaskTotalFileSize;
import org.apache.iceberg.spark.source.metrics.TaskSkippedDeleteFiles;
import org.apache.iceberg.spark.source.metrics.TaskSkippedDeleteManifests;
import org.apache.iceberg.spark.source.metrics.TaskTotalDataFileSize;
import org.apache.iceberg.spark.source.metrics.TaskTotalDataManifests;
import org.apache.iceberg.spark.source.metrics.TaskTotalDeleteFileSize;
import org.apache.iceberg.spark.source.metrics.TaskTotalDeleteManifests;
import org.apache.iceberg.spark.source.metrics.TaskTotalPlanningDuration;
import org.apache.iceberg.spark.source.metrics.TotalFileSize;
import org.apache.iceberg.spark.source.metrics.TotalDataFileSize;
import org.apache.iceberg.spark.source.metrics.TotalDataManifests;
import org.apache.iceberg.spark.source.metrics.TotalDeleteFileSize;
import org.apache.iceberg.spark.source.metrics.TotalDeleteManifests;
import org.apache.iceberg.spark.source.metrics.TotalPlanningDuration;
import org.apache.iceberg.types.Types;
import org.apache.iceberg.util.PropertyUtil;
Expand Down Expand Up @@ -200,27 +220,68 @@ public CustomTaskMetric[] reportDriverMetrics() {
}

List<CustomTaskMetric> driverMetrics = Lists.newArrayList();
driverMetrics.add(TaskTotalFileSize.from(scanReport));

// common
driverMetrics.add(TaskTotalPlanningDuration.from(scanReport));
driverMetrics.add(TaskSkippedDataFiles.from(scanReport));
driverMetrics.add(TaskScannedDataFiles.from(scanReport));
driverMetrics.add(TaskSkippedDataManifests.from(scanReport));

// data manifests
driverMetrics.add(TaskTotalDataManifests.from(scanReport));
driverMetrics.add(TaskScannedDataManifests.from(scanReport));
driverMetrics.add(TaskSkippedDataManifests.from(scanReport));

// data files
driverMetrics.add(TaskResultDataFiles.from(scanReport));
driverMetrics.add(TaskSkippedDataFiles.from(scanReport));
driverMetrics.add(TaskTotalDataFileSize.from(scanReport));

// delete manifests
driverMetrics.add(TaskTotalDeleteManifests.from(scanReport));
driverMetrics.add(TaskScannedDeleteManifests.from(scanReport));
driverMetrics.add(TaskSkippedDeleteManifests.from(scanReport));

// delete files
driverMetrics.add(TaskTotalDeleteFileSize.from(scanReport));
driverMetrics.add(TaskResultDeleteFiles.from(scanReport));
driverMetrics.add(TaskEqualityDeleteFiles.from(scanReport));
driverMetrics.add(TaskIndexedDeleteFiles.from(scanReport));
driverMetrics.add(TaskPositionalDeleteFiles.from(scanReport));
driverMetrics.add(TaskSkippedDeleteFiles.from(scanReport));

return driverMetrics.toArray(new CustomTaskMetric[0]);
}

@Override
public CustomMetric[] supportedCustomMetrics() {
return new CustomMetric[] {
// task metrics
new NumSplits(),
new NumDeletes(),
new TotalFileSize(),

// common
new TotalPlanningDuration(),

// data manifests
new TotalDataManifests(),
new ScannedDataManifests(),
new SkippedDataManifests(),
new ScannedDataFiles(),
new SkippedDataFiles()

// data files
new ResultDataFiles(),
new SkippedDataFiles(),
new TotalDataFileSize(),

// delete manifests
new TotalDeleteManifests(),
new ScannedDeleteManifests(),
new SkippedDeleteManifests(),

// delete files
new TotalDeleteFileSize(),
new ResultDeleteFiles(),
new EqualityDeleteFiles(),
new IndexedDeleteFiles(),
new PositionalDeleteFiles(),
new SkippedDeleteFiles()
};
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.iceberg.spark.source.metrics;

import org.apache.spark.sql.connector.metric.CustomSumMetric;

public class EqualityDeleteFiles extends CustomSumMetric {

static final String NAME = "equalityDeleteFiles";

@Override
public String name() {
return NAME;
}

@Override
public String description() {
return "number of equality delete files";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.iceberg.spark.source.metrics;

import org.apache.spark.sql.connector.metric.CustomSumMetric;

public class IndexedDeleteFiles extends CustomSumMetric {

static final String NAME = "indexedDeleteFiles";

@Override
public String name() {
return NAME;
}

@Override
public String description() {
return "number of indexed delete files";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.iceberg.spark.source.metrics;

import org.apache.spark.sql.connector.metric.CustomSumMetric;

public class PositionalDeleteFiles extends CustomSumMetric {

static final String NAME = "positionalDeleteFiles";

@Override
public String name() {
return NAME;
}

@Override
public String description() {
return "number of positional delete files";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

import org.apache.spark.sql.connector.metric.CustomSumMetric;

public class ScannedDataFiles extends CustomSumMetric {
public class ResultDataFiles extends CustomSumMetric {

static final String NAME = "scannedDataFiles";
static final String NAME = "resultDataFiles";

@Override
public String name() {
Expand All @@ -31,6 +31,6 @@ public String name() {

@Override
public String description() {
return "number of scanned data files";
return "number of result data files";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.iceberg.spark.source.metrics;

import org.apache.spark.sql.connector.metric.CustomSumMetric;

public class ResultDeleteFiles extends CustomSumMetric {

static final String NAME = "resultDeleteFiles";

@Override
public String name() {
return NAME;
}

@Override
public String description() {
return "number of result delete files";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.iceberg.spark.source.metrics;

import org.apache.spark.sql.connector.metric.CustomSumMetric;

public class ScannedDeleteManifests extends CustomSumMetric {

static final String NAME = "scannedDeleteManifests";

@Override
public String name() {
return NAME;
}

@Override
public String description() {
return "number of scanned delete manifests";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.iceberg.spark.source.metrics;

import org.apache.spark.sql.connector.metric.CustomSumMetric;

public class SkippedDeleteFiles extends CustomSumMetric {

static final String NAME = "skippedDeleteFiles";

@Override
public String name() {
return NAME;
}

@Override
public String description() {
return "number of skipped delete files";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.iceberg.spark.source.metrics;

import org.apache.spark.sql.connector.metric.CustomSumMetric;

public class SkippedDeleteManifests extends CustomSumMetric {

static final String NAME = "skippedDeleteManifests";

@Override
public String name() {
return NAME;
}

@Override
public String description() {
return "number of skipped delete manifest";
}
}
Loading

0 comments on commit f00d309

Please sign in to comment.