Add entry to parquet metadata cache on file modificationTime

agrawalreetika · agrawalreetika · commit faa3a55794b1 · 2024-05-23T10:21:56.000+05:30
diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/parquet/AbstractTestParquetReader.java b/presto-hive/src/test/java/com/facebook/presto/hive/parquet/AbstractTestParquetReader.java
@@ -1701,8 +1701,8 @@ public void testCaching()
                     parquetMetadataSource,
                     tempFile.getFile(),
                     tempFileModificationTime);
-            assertEquals(parquetFileMetadataCache.stats().missCount(), 3);
-            assertEquals(parquetFileMetadataCache.stats().hitCount(), 4);
+            assertEquals(parquetFileMetadataCache.stats().missCount(), 2);
+            assertEquals(parquetFileMetadataCache.stats().hitCount(), 5);
         }
     }
 
diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/cache/CachingParquetMetadataSource.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/cache/CachingParquetMetadataSource.java
@@ -54,12 +54,12 @@ public ParquetFileMetadata getParquetMetadata(
                 ParquetFileMetadata fileMetadataCache = cache.get(
                         parquetDataSource.getId(),
                         () -> delegate.getParquetMetadata(parquetDataSource, fileSize, cacheable, modificationTime, fileDecryptor, readMaskedValue));
-                if (fileMetadataCache.getModificationTime() == modificationTime) {
-                    return fileMetadataCache;
-                }
-                else {
+                if (fileMetadataCache.getModificationTime() != modificationTime) {
                     cache.invalidate(parquetDataSource.getId());
+                    fileMetadataCache = delegate.getParquetMetadata(parquetDataSource, fileSize, cacheable, modificationTime, fileDecryptor, readMaskedValue);
+                    cache.put(parquetDataSource.getId(), fileMetadataCache);
                 }
+                return fileMetadataCache;
             }
             return delegate.getParquetMetadata(parquetDataSource, fileSize, cacheable, modificationTime, fileDecryptor, readMaskedValue);
         }

Original file line number	Diff line number	Diff line change
`@@ -1701,8 +1701,8 @@ public void testCaching()`
`1701`	`1701`	`parquetMetadataSource,`
`1702`	`1702`	`tempFile.getFile(),`
`1703`	`1703`	`tempFileModificationTime);`
`1704`		`- assertEquals(parquetFileMetadataCache.stats().missCount(), 3);`
`1705`		`- assertEquals(parquetFileMetadataCache.stats().hitCount(), 4);`
	`1704`	`+ assertEquals(parquetFileMetadataCache.stats().missCount(), 2);`
	`1705`	`+ assertEquals(parquetFileMetadataCache.stats().hitCount(), 5);`
`1706`	`1706`	`}`
`1707`	`1707`	`}`
`1708`	`1708`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ public ParquetFileMetadata getParquetMetadata(`
`54`	`54`	`ParquetFileMetadata fileMetadataCache = cache.get(`
`55`	`55`	`parquetDataSource.getId(),`
`56`	`56`	`() -> delegate.getParquetMetadata(parquetDataSource, fileSize, cacheable, modificationTime, fileDecryptor, readMaskedValue));`
`57`		`- if (fileMetadataCache.getModificationTime() == modificationTime) {`
`58`		`- return fileMetadataCache;`
`59`		`- }`
`60`		`- else {`
	`57`	`+ if (fileMetadataCache.getModificationTime() != modificationTime) {`
`61`	`58`	`cache.invalidate(parquetDataSource.getId());`
	`59`	`+ fileMetadataCache = delegate.getParquetMetadata(parquetDataSource, fileSize, cacheable, modificationTime, fileDecryptor, readMaskedValue);`
	`60`	`+ cache.put(parquetDataSource.getId(), fileMetadataCache);`
`62`	`61`	`}`
	`62`	`+ return fileMetadataCache;`
`63`	`63`	`}`
`64`	`64`	`return delegate.getParquetMetadata(parquetDataSource, fileSize, cacheable, modificationTime, fileDecryptor, readMaskedValue);`
`65`	`65`	`}`