This is an automated email from the ASF dual-hosted git repository.
kfaraz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 58a8d76b0aa Use try-with-reasources to avoid potential resource leak
(#18106)
58a8d76b0aa is described below
commit 58a8d76b0aafde9f32ca9ea9168499f21f23158c
Author: Xu Chengxin <[email protected]>
AuthorDate: Wed Jun 11 07:23:27 2025 +0800
Use try-with-reasources to avoid potential resource leak (#18106)
Changed files:
- `HdfsDataSegmentKiller`
- `HdfsFileVersionTimestampFinder`
- `DerbyConnector`
- `JettyServerModule`
---
.../apache/druid/storage/hdfs/HdfsDataSegmentKiller.java | 3 +--
.../storage/hdfs/HdfsFileTimestampVersionFinder.java | 16 ++++++++--------
.../druid/metadata/storage/derby/DerbyConnector.java | 15 ++++++++-------
.../server/initialization/jetty/JettyServerModule.java | 3 +--
4 files changed, 18 insertions(+), 19 deletions(-)
diff --git
a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKiller.java
b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKiller.java
index 7802d88331c..e135403973e 100644
---
a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKiller.java
+++
b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKiller.java
@@ -70,9 +70,8 @@ public class HdfsDataSegmentKiller implements
DataSegmentKiller
final Path segmentPath = getPath(segment);
log.info("Killing segment[%s] mapped to path[%s]", segment.getId(),
segmentPath);
- try {
+ try (final FileSystem fs = segmentPath.getFileSystem(config)) {
String filename = segmentPath.getName();
- final FileSystem fs = segmentPath.getFileSystem(config);
if (!filename.endsWith(".zip")) {
throw new SegmentLoadingException("Unknown file type[%s]",
segmentPath);
} else {
diff --git
a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java
b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java
index 4daa94a6b02..73631822548 100644
---
a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java
+++
b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsFileTimestampVersionFinder.java
@@ -54,17 +54,17 @@ public class HdfsFileTimestampVersionFinder extends
HdfsDataSegmentPuller implem
};
long modifiedTime = Long.MIN_VALUE;
URI mostRecentURI = null;
- final FileSystem fs = dir.getFileSystem(config);
- for (FileStatus status : fs.listStatus(dir, filter)) {
- if (status.isFile()) {
- final long thisModifiedTime = status.getModificationTime();
- if (thisModifiedTime >= modifiedTime) {
- modifiedTime = thisModifiedTime;
- mostRecentURI = status.getPath().toUri();
+ try (final FileSystem fs = dir.getFileSystem(config)) {
+ for (FileStatus status : fs.listStatus(dir, filter)) {
+ if (status.isFile()) {
+ final long thisModifiedTime = status.getModificationTime();
+ if (thisModifiedTime >= modifiedTime) {
+ modifiedTime = thisModifiedTime;
+ mostRecentURI = status.getPath().toUri();
+ }
}
}
}
-
return mostRecentURI;
}
diff --git
a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
index 0ee9779a190..97081d47ba3 100644
---
a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
+++
b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
@@ -192,13 +192,14 @@ public class DerbyConnector extends SQLMetadataConnector
try {
if (tableExists(handle, tableName)) {
DatabaseMetaData dbMetaData =
handle.getConnection().getMetaData();
- ResultSet columns = dbMetaData.getColumns(
- null,
- null,
- tableName.toUpperCase(Locale.ENGLISH),
- columnName.toUpperCase(Locale.ENGLISH)
- );
- return columns.next();
+ try (ResultSet columns = dbMetaData.getColumns(
+ null,
+ null,
+ tableName.toUpperCase(Locale.ENGLISH),
+ columnName.toUpperCase(Locale.ENGLISH)
+ )) {
+ return columns.next();
+ }
} else {
return false;
}
diff --git
a/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java
b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java
index a662ca00541..28381cbcafa 100644
---
a/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java
+++
b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java
@@ -500,8 +500,7 @@ public class JettyServerModule extends JerseyServletModule
private static int getTCPAcceptQueueSize()
{
if (SystemUtils.IS_OS_LINUX) {
- try {
- BufferedReader in =
Files.newBufferedReader(Paths.get("/proc/sys/net/core/somaxconn"));
+ try (BufferedReader in =
Files.newBufferedReader(Paths.get("/proc/sys/net/core/somaxconn"))) {
String acceptQueueSize = in.readLine();
if (acceptQueueSize != null) {
return Integer.parseInt(acceptQueueSize);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
