From 8ed5f33e7bc2e2a6fecfa27c10447f12f35e3a28 Mon Sep 17 00:00:00 2001 From: etherge Date: Fri, 18 Nov 2016 18:05:04 +0800 Subject: [PATCH] KYLIN-2208 fix unclosed FileReader --- .../java/org/apache/kylin/source/hive/HiveCmdBuilder.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java index 844cf12..4c8aeea 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java @@ -20,11 +20,12 @@ package org.apache.kylin.source.hive; import java.io.BufferedWriter; import java.io.File; -import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.nio.charset.Charset; import java.util.ArrayList; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.kylin.common.KylinConfig; import org.slf4j.Logger; @@ -63,23 +64,20 @@ public class HiveCmdBuilder { BufferedWriter bw = null; try { File tmpHql = File.createTempFile("beeline_", ".hql"); - StringBuffer hqlBuf = new StringBuffer(); bw = new BufferedWriter(new FileWriter(tmpHql)); for (String statement : statements) { bw.write(statement); bw.newLine(); - - hqlBuf.append(statement).append("\n"); } buf.append("beeline "); buf.append(kylinConfig.getHiveBeelineParams()); buf.append(" -f "); buf.append(tmpHql.getAbsolutePath()); - buf.append(";"); + buf.append(";rm -f "); + buf.append(tmpHql.getAbsolutePath()); - logger.info("The statements to execute in beeline: \n" + hqlBuf); if (logger.isDebugEnabled()) { - logger.debug("The SQL to execute in beeline: \n" + IOUtils.toString(new FileReader(tmpHql))); + logger.debug("The SQL to execute in beeline: \n" + FileUtils.readFileToString(tmpHql, Charset.defaultCharset())); } } catch (IOException e) { throw new RuntimeException(e); -- 2.7.4 (Apple Git-66)