Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some minor potential resource leaks.

This commit is contained in:
Ian Brandt 2012-10-30 23:26:21 -07:00
parent 0d24df7628
commit 35f04b4df6
2 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
server/src/main/java/com/metamx/TsvToJson.java
View File

@ -67,42 +67,51 @@ public class TsvToJson
}
}
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8));
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8));
String line = null;
int count = 0;
long currTime = System.currentTimeMillis();
long startTime = currTime;
while ((line = in.readLine()) != null) {
if (count % 1000000 == 0) {
long nowTime = System.currentTimeMillis();
System.out.printf("Processed [%,d] lines in %,d millis. Incremental time %,d millis.%n", count, nowTime - startTime, nowTime - currTime);
currTime = nowTime;
}
++count;
String[] splits = line.split("\t");
BufferedReader in = null;
BufferedWriter out = null;
try {
in = new BufferedReader(new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8));
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8));
String line = null;
int count = 0;
long currTime = System.currentTimeMillis();
long startTime = currTime;
while ((line = in.readLine()) != null) {
if (count % 1000000 == 0) {
long nowTime = System.currentTimeMillis();
System.out.printf("Processed [%,d] lines in %,d millis. Incremental time %,d millis.%n", count, nowTime - startTime, nowTime - currTime);
currTime = nowTime;
}
++count;
String[] splits = line.split("\t");
if (splits.length == 30) {
continue;
}
if (splits.length == 30) {
continue;
}
if (splits.length != handlers.length) {
throw new IAE("splits.length[%d] != handlers.length[%d]; line[%s]", splits.length, handlers.length, line);
}
if (splits.length != handlers.length) {
throw new IAE("splits.length[%d] != handlers.length[%d]; line[%s]", splits.length, handlers.length, line);
}
Map<String, Object> jsonMap = Maps.newLinkedHashMap();
for (int i = 0; i < handlers.length; ++i) {
jsonMap.put(handlers[i].getFieldName(), handlers[i].process(splits[i]));
}
Map<String, Object> jsonMap = Maps.newLinkedHashMap();
for (int i = 0; i < handlers.length; ++i) {
jsonMap.put(handlers[i].getFieldName(), handlers[i].process(splits[i]));
}
final String str = mapper.writeValueAsString(jsonMap);
out.write(str);
out.write("\n");
final String str = mapper.writeValueAsString(jsonMap);
out.write(str);
out.write("\n");
}
System.out.printf("Completed %,d lines in %,d millis.%n", count, System.currentTimeMillis() - startTime);
out.flush();
} finally {
if (out != null) {
out.close();
}
if (in != null) {
in.close();
}
}
System.out.printf("Completed %,d lines in %,d millis.%n", count, System.currentTimeMillis() - startTime);
out.flush();
out.close();
in.close();
}
public static interface FieldHandler

6
server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java
View File

@ -416,9 +416,11 @@ public class IndexMerger
long startTime = System.currentTimeMillis();
File indexFile = new File(outDir, "index.drd");
FileOutputStream fileOutputStream = null;
FileChannel channel = null;
try {
channel = new FileOutputStream(indexFile).getChannel();
fileOutputStream = new FileOutputStream(indexFile);
channel = fileOutputStream.getChannel();
channel.write(ByteBuffer.wrap(new byte[]{IndexIO.CURRENT_VERSION_ID}));
GenericIndexed.fromIterable(mergedDimensions, GenericIndexed.stringStrategy).writeToChannel(channel);
@ -438,6 +440,8 @@ public class IndexMerger
finally {
Closeables.closeQuietly(channel);
channel = null;
Closeables.closeQuietly(fileOutputStream);
fileOutputStream = null;
}
IndexIO.checkFileSize(indexFile);
log.info("outDir[%s] completed index.drd in %,d millis.", outDir, System.currentTimeMillis() - startTime);