andygrove opened a new issue, #2701:
URL: https://github.com/apache/datafusion-comet/issues/2701

   ### Describe the bug
   
   I am following the instructions at 
https://datafusion.apache.org/comet/user-guide/latest/iceberg.html, and I get 
errors when applying the current Iceberg 1.8.1 diff:
   
   ```
   $ git apply ../datafusion-comet/dev/diffs/iceberg/1.8.1.diff
   error: patch failed: build.gradle:780
   error: build.gradle: patch does not apply
   error: patch failed: gradle/libs.versions.toml:34
   error: gradle/libs.versions.toml: patch does not apply
   error: parquet/src/main/java/org/apache/iceberg/parquet/CometTypeUtils.java: 
already exists in working directory
   error: 
parquet/src/main/java/org/apache/iceberg/parquet/CometVectorizedParquetReader.java:
 already exists in working directory
   error: patch failed: 
parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java:1075
   error: parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java: patch 
does not apply
   error: patch failed: 
parquet/src/main/java/org/apache/iceberg/parquet/ReadConf.java:157
   error: parquet/src/main/java/org/apache/iceberg/parquet/ReadConf.java: patch 
does not apply
   error: patch failed: spark/v3.5/build.gradle:75
   error: spark/v3.5/build.gradle: patch does not apply
   error: patch failed: 
spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/ExtensionsTestBase.java:57
   error: 
spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/ExtensionsTestBase.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java:56
   error: 
spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/action/DeleteOrphanFilesBenchmark.java:179
   error: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/action/DeleteOrphanFilesBenchmark.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/action/IcebergSortCompactionBenchmark.java:392
   error: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/action/IcebergSortCompactionBenchmark.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/source/DVReaderBenchmark.java:239
   error: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/source/DVReaderBenchmark.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/source/DVWriterBenchmark.java:223
   error: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/source/DVWriterBenchmark.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceBenchmark.java:94
   error: 
spark/v3.5/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceBenchmark.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java:20
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnarBatchReader.java:22
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnarBatchReader.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometConstantColumnReader.java:21
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometConstantColumnReader.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometDeleteColumnReader.java:51
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometDeleteColumnReader.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometPositionColumnReader.java:20
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometPositionColumnReader.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometVectorizedReaderBuilder.java:142
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometVectorizedReaderBuilder.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/BaseBatchReader.java:109
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/BaseBatchReader.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatch.java:172
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatch.java: 
patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/SparkScan.java:23
   error: 
spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/SparkScan.java: 
patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/SparkDistributedDataScanTestBase.java:90
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/SparkDistributedDataScanTestBase.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanDeletes.java:73
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanDeletes.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanFilterFiles.java:62
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanFilterFiles.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanReporting.java:63
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanReporting.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/TestBase.java:77
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/TestBase.java: patch 
does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetDictionaryEncodedVectorizedReads.java:59
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/parquet/vectorized/TestParquetDictionaryEncodedVectorizedReads.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/ScanTestBase.java:54
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/ScanTestBase.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestCompressionSettings.java:144
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestCompressionSettings.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestDataSourceOptions.java:75
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestDataSourceOptions.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestFilteredScan.java:110
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestFilteredScan.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java:93
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSpark.java:46
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSpark.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestPartitionPruning.java:112
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestPartitionPruning.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestPartitionValues.java:107
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestPartitionValues.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSnapshotSelection.java:87
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSnapshotSelection.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataFile.java:120
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataFile.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataWrite.java:96
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataWrite.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java:83
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReaderDeletes.java:136
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReaderDeletes.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReaderWithBloomFilter.java:182
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReaderWithBloomFilter.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestStructuredStreaming.java:65
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestStructuredStreaming.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestTimestampWithoutZone.java:75
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestTimestampWithoutZone.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestWriteMetricsConfig.java:80
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestWriteMetricsConfig.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestAggregatePushDown.java:60
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestAggregatePushDown.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestFilterPushDown.java:598
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestFilterPushDown.java:
 patch does not apply
   error: patch failed: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestStoragePartitionedJoins.java:616
   error: 
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestStoragePartitionedJoins.java:
 patch does not apply
   ```
   
   ### Steps to reproduce
   
   _No response_
   
   ### Expected behavior
   
   _No response_
   
   ### Additional context
   
   _No response_


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to