rename function

delta-io · Dec 12, 2024 · 07c5d49 · 07c5d49
1 parent f6099c3
commit 07c5d49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/spark/src/main/scala/org/apache/spark/sql/delta/Snapshot.scala b/spark/src/main/scala/org/apache/spark/sql/delta/Snapshot.scala
@@ -579,13 +579,13 @@ class Snapshot(
       .orElse(Option.when(_computedStateTriggered)(domainMetadata)),
     numDeletedRecordsOpt = checksumOpt.flatMap(_.numDeletedRecordsOpt)
       .orElse(Option.when(_computedStateTriggered)(numDeletedRecordsOpt).flatten)
-      .filter(_ => deletionVectorMetricsEnabled),
+      .filter(_ => deletionVectorsReadableAndMetricsEnabled),
     numDeletionVectorsOpt = checksumOpt.flatMap(_.numDeletionVectorsOpt)
       .orElse(Option.when(_computedStateTriggered)(numDeletionVectorsOpt).flatten)
-      .filter(_ => deletionVectorMetricsEnabled),
+      .filter(_ => deletionVectorsReadableAndMetricsEnabled),
     deletedRecordCountsHistogramOpt = checksumOpt.flatMap(_.deletedRecordCountsHistogramOpt)
       .orElse(Option.when(_computedStateTriggered)(deletedRecordCountsHistogramOpt).flatten)
-      .filter(_ => deletionVectorMetricsEnabled && deletionVectorHistogramEnabled),
+      .filter(_ => deletionVectorsReadableAndHistogramEnabled),
     histogramOpt = checksumOpt.flatMap(_.histogramOpt)
   )
 

diff --git a/spark/src/main/scala/org/apache/spark/sql/delta/SnapshotState.scala b/spark/src/main/scala/org/apache/spark/sql/delta/SnapshotState.scala
@@ -213,17 +213,17 @@ trait SnapshotStateManager extends DeltaLogging { self: Snapshot =>
   def deletedRecordCountsHistogramOpt: Option[DeletedRecordCountsHistogram] =
     computedState.deletedRecordCountsHistogramOpt
 
-  protected def deletionVectorMetricsEnabled: Boolean = {
+  protected def deletionVectorsReadableAndMetricsEnabled: Boolean = {
     val checksumDVMetricsEnabled =
       spark.sessionState.conf.getConf(DeltaSQLConf.DELTA_CHECKSUM_DV_METRICS_ENABLED)
     val dvsReadable = DeletionVectorUtils.deletionVectorsReadable(snapshotToScan)
     checksumDVMetricsEnabled && dvsReadable
   }
 
-  protected def deletionVectorHistogramEnabled: Boolean = {
+  protected def deletionVectorsReadableAndHistogramEnabled: Boolean = {
     val deletedRecordCountsHistogramEnabled =
       spark.sessionState.conf.getConf(DeltaSQLConf.DELTA_DELETED_RECORD_COUNTS_HISTOGRAM_ENABLED)
-    deletionVectorMetricsEnabled && deletedRecordCountsHistogramEnabled
+    deletionVectorsReadableAndMetricsEnabled && deletedRecordCountsHistogramEnabled
   }
 
   /** Generate a default SnapshotState of a new table given the table metadata and the protocol. */