You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/11/27 08:25:08 UTC
phoenix git commit: PHOENIX-1486 Fix SpooledTmpFileDeleteIT by having
it use a different directory for spooling files (Samarth Jain)
Repository: phoenix
Updated Branches:
refs/heads/master aa7835dd9 -> edf5ec27c
PHOENIX-1486 Fix SpooledTmpFileDeleteIT by having it use a different directory for spooling files (Samarth Jain)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/edf5ec27
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/edf5ec27
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/edf5ec27
Branch: refs/heads/master
Commit: edf5ec27c1d697fb0153843e95c7652bef4774da
Parents: aa7835d
Author: James Taylor <jt...@salesforce.com>
Authored: Wed Nov 26 23:24:28 2014 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Wed Nov 26 23:24:28 2014 -0800
----------------------------------------------------------------------
.../phoenix/end2end/SpooledTmpFileDeleteIT.java | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/edf5ec27/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
index a117c51..810012a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java
@@ -26,20 +26,25 @@ import java.util.List;
import java.util.Properties;
import org.apache.phoenix.query.QueryServices;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.io.Files;
+
public class SpooledTmpFileDeleteIT extends BaseHBaseManagedTimeIT {
private Connection conn = null;
private Properties props = null;
+ private File spoolDir;
@Before
public void setup() throws SQLException {
props = new Properties();
- props.put(QueryServices.SPOOL_DIRECTORY, "/tmp");
- props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1));
+ spoolDir = Files.createTempDir();
+ props.put(QueryServices.SPOOL_DIRECTORY, spoolDir.getPath());
+ props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1));
conn = DriverManager.getConnection(getUrl(), props);
Statement stmt = conn.createStatement();
stmt.execute("CREATE TABLE test (ID varchar NOT NULL PRIMARY KEY) SPLIT ON ('EA','EZ')");
@@ -49,10 +54,17 @@ public class SpooledTmpFileDeleteIT extends BaseHBaseManagedTimeIT {
stmt.close();
conn.commit();
}
+
+ @After
+ public void tearDown() throws Exception {
+ if (spoolDir != null) {
+ spoolDir.delete();
+ }
+ }
@Test
public void testDeleteAllSpooledTmpFiles() throws SQLException, Throwable {
- File dir = new File("/tmp");
+ File dir = new File(spoolDir.getPath());
File[] files = null;
class FilenameFilter implements FileFilter {