Skip to content

File.deleteOnExit() #3923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gianm merged 3 commits into from
Feb 13, 2017
Merged

File.deleteOnExit() #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3d1f53
Less use of File.deleteOnExit()
akashdw Feb 9, 2017
798296a
Formatting.
akashdw Feb 9, 2017
7bbd802
Revert DeterminePartitionsJobTest, remove cleanup method from IOPeon
akashdw Feb 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions benchmarks/src/main/java/io/druid/benchmark/FilterPartitionBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.google.common.collect.Lists;
import com.google.common.hash.Hashing;
import com.google.common.io.Files;

import io.druid.benchmark.datagen.BenchmarkDataGenerator;
import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
import io.druid.benchmark.datagen.BenchmarkSchemas;
Expand Down Expand Up @@ -76,6 +75,7 @@
import io.druid.segment.incremental.IncrementalIndexSchema;
import io.druid.segment.incremental.OnheapIncrementalIndex;
import io.druid.segment.serde.ComplexMetrics;
import org.apache.commons.io.FileUtils;
import org.joda.time.Interval;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All @@ -87,6 +87,7 @@
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.Warmup;
import org.openjdk.jmh.infra.Blackhole;

Expand Down Expand Up @@ -118,6 +119,7 @@ public class FilterPartitionBenchmark
private IncrementalIndex incIndex;
private QueryableIndex qIndex;
private File indexFile;
private File tmpDir;

private Filter timeFilterNone;
private Filter timeFilterHalf;
Expand Down Expand Up @@ -172,13 +174,12 @@ public void setup() throws IOException
incIndex.add(row);
}

File tmpFile = Files.createTempDir();
log.info("Using temp dir: " + tmpFile.getAbsolutePath());
tmpFile.deleteOnExit();
tmpDir = Files.createTempDir();
log.info("Using temp dir: " + tmpDir.getAbsolutePath());

indexFile = INDEX_MERGER_V9.persist(
incIndex,
tmpFile,
tmpDir,
new IndexSpec()
);
qIndex = INDEX_IO.loadIndex(indexFile);
Expand Down Expand Up @@ -219,6 +220,12 @@ public void setup() throws IOException
));
}

@TearDown
public void tearDown() throws IOException
{
FileUtils.deleteDirectory(tmpDir);
}

private IncrementalIndex makeIncIndex()
{
return new OnheapIncrementalIndex(
Expand Down
17 changes: 12 additions & 5 deletions benchmarks/src/main/java/io/druid/benchmark/FilteredAggregatorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.google.common.collect.Maps;
import com.google.common.hash.Hashing;
import com.google.common.io.Files;

import io.druid.benchmark.datagen.BenchmarkDataGenerator;
import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
import io.druid.benchmark.datagen.BenchmarkSchemas;
Expand Down Expand Up @@ -77,6 +76,7 @@
import io.druid.segment.incremental.IncrementalIndexSchema;
import io.druid.segment.incremental.OnheapIncrementalIndex;
import io.druid.segment.serde.ComplexMetrics;
import org.apache.commons.io.FileUtils;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
Expand All @@ -87,6 +87,7 @@
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.Warmup;
import org.openjdk.jmh.infra.Blackhole;

Expand Down Expand Up @@ -124,6 +125,7 @@ public class FilteredAggregatorBenchmark
private QueryRunnerFactory factory;
private BenchmarkSchemaInfo schemaInfo;
private TimeseriesQuery query;
private File tmpDir;

private static String JS_FN = "function(str) { return 'super-' + str; }";
private static ExtractionFn JS_EXTRACTION_FN = new JavaScriptExtractionFn(JS_FN, false, JavaScriptConfig.getDefault());
Expand Down Expand Up @@ -187,13 +189,12 @@ public void setup() throws IOException
inputRows.add(row);
}

File tmpFile = Files.createTempDir();
log.info("Using temp dir: " + tmpFile.getAbsolutePath());
tmpFile.deleteOnExit();
tmpDir = Files.createTempDir();
log.info("Using temp dir: " + tmpDir.getAbsolutePath());

indexFile = INDEX_MERGER_V9.persist(
incIndex,
tmpFile,
tmpDir,
new IndexSpec()
);
qIndex = INDEX_IO.loadIndex(indexFile);
Expand All @@ -220,6 +221,12 @@ public void setup() throws IOException
.build();
}

@TearDown
public void tearDown() throws IOException
{
FileUtils.deleteDirectory(tmpDir);
}

private IncrementalIndex makeIncIndex(AggregatorFactory[] metrics)
{
return new OnheapIncrementalIndex(
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/src/main/java/io/druid/benchmark/FloatCompressionBenchmarkFileGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public OutputStream openStream() throws IOException
output.write(ByteBuffer.wrap(baos.toByteArray()));
}
finally {
iopeon.cleanup();
iopeon.close();
br.close();
}
System.out.print(compFile.length() / 1024 + "\n");
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/src/main/java/io/druid/benchmark/LongCompressionBenchmarkFileGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public OutputStream openStream() throws IOException
output.write(ByteBuffer.wrap(baos.toByteArray()));
}
finally {
iopeon.cleanup();
iopeon.close();
br.close();
}
System.out.print(compFile.length() / 1024 + "\n");
Expand Down
56 changes: 41 additions & 15 deletions benchmarks/src/main/java/io/druid/benchmark/indexing/IndexMergeBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.hash.Hashing;
import com.google.common.io.Files;

import io.druid.benchmark.datagen.BenchmarkDataGenerator;
import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
import io.druid.benchmark.datagen.BenchmarkSchemas;
Expand All @@ -42,6 +41,7 @@
import io.druid.segment.incremental.IncrementalIndexSchema;
import io.druid.segment.incremental.OnheapIncrementalIndex;
import io.druid.segment.serde.ComplexMetrics;
import org.apache.commons.io.FileUtils;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
Expand All @@ -52,6 +52,7 @@
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.Warmup;
import org.openjdk.jmh.infra.Blackhole;

Expand Down Expand Up @@ -88,6 +89,7 @@ public class IndexMergeBenchmark

private List<QueryableIndex> indexesToMerge;
private BenchmarkSchemaInfo schemaInfo;
private File tmpDir;

static {
JSON_MAPPER = new DefaultObjectMapper();
Expand Down Expand Up @@ -137,13 +139,12 @@ public void setup() throws IOException
incIndex.add(row);
}

File tmpFile = Files.createTempDir();
log.info("Using temp dir: " + tmpFile.getAbsolutePath());
tmpFile.deleteOnExit();
tmpDir = Files.createTempDir();
log.info("Using temp dir: " + tmpDir.getAbsolutePath());

File indexFile = INDEX_MERGER_V9.persist(
incIndex,
tmpFile,
tmpDir,
new IndexSpec()
);

Expand All @@ -152,6 +153,12 @@ public void setup() throws IOException
}
}

@TearDown
public void tearDown() throws IOException
{
FileUtils.deleteDirectory(tmpDir);
}

private IncrementalIndex makeIncIndex()
{
return new OnheapIncrementalIndex(
Expand All @@ -176,14 +183,23 @@ public void merge(Blackhole blackhole) throws Exception
File tmpFile = File.createTempFile("IndexMergeBenchmark-MERGEDFILE-" + System.currentTimeMillis(), ".TEMPFILE");
tmpFile.delete();
tmpFile.mkdirs();
log.info(tmpFile.getAbsolutePath() + " isFile: " + tmpFile.isFile() + " isDir:" + tmpFile.isDirectory());
tmpFile.deleteOnExit();
try {
log.info(tmpFile.getAbsolutePath() + " isFile: " + tmpFile.isFile() + " isDir:" + tmpFile.isDirectory());

File mergedFile = INDEX_MERGER.mergeQueryableIndex(indexesToMerge, rollup, schemaInfo.getAggsArray(), tmpFile, new IndexSpec());
File mergedFile = INDEX_MERGER.mergeQueryableIndex(
indexesToMerge,
rollup,
schemaInfo.getAggsArray(),
tmpFile,
new IndexSpec()
);

blackhole.consume(mergedFile);
blackhole.consume(mergedFile);
}
finally {
tmpFile.delete();
}

tmpFile.delete();
}

@Benchmark
Expand All @@ -194,13 +210,23 @@ public void mergeV9(Blackhole blackhole) throws Exception
File tmpFile = File.createTempFile("IndexMergeBenchmark-MERGEDFILE-V9-" + System.currentTimeMillis(), ".TEMPFILE");
tmpFile.delete();
tmpFile.mkdirs();
log.info(tmpFile.getAbsolutePath() + " isFile: " + tmpFile.isFile() + " isDir:" + tmpFile.isDirectory());
tmpFile.deleteOnExit();
try {
log.info(tmpFile.getAbsolutePath() + " isFile: " + tmpFile.isFile() + " isDir:" + tmpFile.isDirectory());

File mergedFile = INDEX_MERGER_V9.mergeQueryableIndex(indexesToMerge, rollup, schemaInfo.getAggsArray(), tmpFile, new IndexSpec());
File mergedFile = INDEX_MERGER_V9.mergeQueryableIndex(
indexesToMerge,
rollup,
schemaInfo.getAggsArray(),
tmpFile,
new IndexSpec()
);

blackhole.consume(mergedFile);
blackhole.consume(mergedFile);
}
finally {
tmpFile.delete();

}

tmpFile.delete();
}
}
52 changes: 28 additions & 24 deletions benchmarks/src/main/java/io/druid/benchmark/indexing/IndexPersistBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.hash.Hashing;
import com.google.common.io.Files;

import io.druid.benchmark.datagen.BenchmarkDataGenerator;
import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
import io.druid.benchmark.datagen.BenchmarkSchemas;
Expand All @@ -41,6 +40,7 @@
import io.druid.segment.incremental.IncrementalIndexSchema;
import io.druid.segment.incremental.OnheapIncrementalIndex;
import io.druid.segment.serde.ComplexMetrics;
import org.apache.commons.io.FileUtils;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
Expand Down Expand Up @@ -174,38 +174,42 @@ private IncrementalIndex makeIncIndex()
@OutputTimeUnit(TimeUnit.MICROSECONDS)
public void persist(Blackhole blackhole) throws Exception
{
File tmpFile = Files.createTempDir();
log.info("Using temp dir: " + tmpFile.getAbsolutePath());
tmpFile.deleteOnExit();

File indexFile = INDEX_MERGER.persist(
incIndex,
tmpFile,
new IndexSpec()
);

blackhole.consume(indexFile);
File tmpDir = Files.createTempDir();
log.info("Using temp dir: " + tmpDir.getAbsolutePath());
try {
File indexFile = INDEX_MERGER.persist(
incIndex,
tmpDir,
new IndexSpec()
);

blackhole.consume(indexFile);
}
finally {
FileUtils.deleteDirectory(tmpDir);
}

tmpFile.delete();
}

@Benchmark
@BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(TimeUnit.MICROSECONDS)
public void persistV9(Blackhole blackhole) throws Exception
{
File tmpFile = Files.createTempDir();
log.info("Using temp dir: " + tmpFile.getAbsolutePath());
tmpFile.deleteOnExit();;

File indexFile = INDEX_MERGER_V9.persist(
incIndex,
tmpFile,
new IndexSpec()
);
File tmpDir = Files.createTempDir();
log.info("Using temp dir: " + tmpDir.getAbsolutePath());
try {
File indexFile = INDEX_MERGER_V9.persist(
incIndex,
tmpDir,
new IndexSpec()
);

blackhole.consume(indexFile);
blackhole.consume(indexFile);

tmpFile.delete();
}
finally {
FileUtils.deleteDirectory(tmpDir);
}
}
}
16 changes: 12 additions & 4 deletions benchmarks/src/main/java/io/druid/benchmark/query/SearchBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
import io.druid.segment.incremental.IncrementalIndexSchema;
import io.druid.segment.incremental.OnheapIncrementalIndex;
import io.druid.segment.serde.ComplexMetrics;
import org.apache.commons.io.FileUtils;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
Expand All @@ -89,6 +90,7 @@
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.Warmup;
import org.openjdk.jmh.infra.Blackhole;

Expand Down Expand Up @@ -132,6 +134,7 @@ public class SearchBenchmark
private BenchmarkSchemaInfo schemaInfo;
private Druids.SearchQueryBuilder queryBuilder;
private SearchQuery query;
private File tmpDir;

private ExecutorService executorService;

Expand Down Expand Up @@ -351,15 +354,14 @@ public void setup() throws IOException
incIndexes.add(incIndex);
}

File tmpFile = Files.createTempDir();
log.info("Using temp dir: " + tmpFile.getAbsolutePath());
tmpFile.deleteOnExit();
tmpDir = Files.createTempDir();
log.info("Using temp dir: " + tmpDir.getAbsolutePath());

qIndexes = new ArrayList<>();
for (int i = 0; i < numSegments; i++) {
File indexFile = INDEX_MERGER_V9.persist(
incIndexes.get(i),
tmpFile,
tmpDir,
new IndexSpec()
);

Expand All @@ -378,6 +380,12 @@ public void setup() throws IOException
);
}

@TearDown
public void tearDown() throws IOException
{
FileUtils.deleteDirectory(tmpDir);
}

private IncrementalIndex makeIncIndex()
{
return new OnheapIncrementalIndex(
Expand Down
Loading