Merge pull request #17 from topicus-ini/feature-trigger-data-in-db

fixes various bugs + allow specifying the directory to store lastrun …

Author: DennisPallett

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>nl.topicus.mssql2monetdb</groupId>
 	<artifactId>mssql2monetdb</artifactId>
 	<packaging>jar</packaging>
-	<version>0.7</version>
+	<version>0.8</version>
 	<name>mssql2monetdb</name>
 	<url>http://maven.apache.org</url>
 

src/main/java/nl/topicus/mssql2monetdb/CONFIG_KEYS.java

@@ -20,6 +20,7 @@ public enum CONFIG_KEYS
 	TRIGGER_SOURCE("trigger.source", false),
 	TRIGGER_TABLE("trigger.table", false),
 	TRIGGER_COLUMN("trigger.column", false),
+	TRIGGER_DIR("trigger.directory", false),
 	BATCH_SIZE("batch.size", false),
 	TEMP_DIR("temp.directory", false);
 

src/main/java/nl/topicus/mssql2monetdb/CopyTool.java

@@ -9,6 +9,7 @@
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStreamWriter;
@@ -221,6 +222,9 @@ private void doCopy () throws CopyToolException
 
 					// load new data into MonetDB
 					loadData(table);
+					
+					// remove temp data from disk
+					removeTempData(table);
 				}
 			} catch (Exception e) {
 				anyErrors = true;
@@ -297,10 +301,7 @@ private void doCopy () throws CopyToolException
 
 			// phase 4: remove temp data from disk and target database
 			for (CopyTable copyTable : tablesToCopy.values())
-			{
-				// remove temp data from disk
-				removeTempData(copyTable);
-				
+			{				
 				// remove old versions of view-based tables
 				// that are no longer needed
 				try {
@@ -326,19 +327,15 @@ private void doCopy () throws CopyToolException
 
 		LOG.info("Finished!");
 	}
-	
-	public File getUserDir ()
-	{
-		return new File(System.getProperty("user.dir"));
-	}
-	
+		
 	/**
 	 * Returns the file that stores the lastrun info
 	 * @return
 	 */
 	public File getLastRunFile () 
 	{
-		return new File(getUserDir().getAbsolutePath() + "/" + config.getJobId() + "_lastrun.txt");
+		LOG.info("Reading lastrun file located in directory '" + config.getTriggerDirectory() + "'");
+		return new File(config.getTriggerDirectory() + "/" + config.getJobId() + "_lastrun.txt");
 	}
 
 	/**
@@ -986,7 +983,12 @@ private boolean loadDataFromStdin (MonetDBTable monetDBTable, File dataFile,
 		long startTime = System.currentTimeMillis();
 		long insertCount = 0;
 
-		BufferedReader br = new BufferedReader(new FileReader(dataFile));
+		BufferedReader br = new BufferedReader(
+			new InputStreamReader(
+				new FileInputStream(dataFile), 
+				"UTF8"
+			)
+		);
 
 		String line;
 		while((line = br.readLine()) != null)
@@ -1011,12 +1013,6 @@ private boolean loadDataFromStdin (MonetDBTable monetDBTable, File dataFile,
 
 		out.writeLine("");
 
-		error = in.waitForPrompt();
-		if (error != null)
-			throw new Exception(error);
-
-		out.writeLine(""); // server wants more, we're going to tell it, this is it
-
 		error = in.waitForPrompt();
 		if (error != null)
 			throw new Exception(error);

src/main/java/nl/topicus/mssql2monetdb/CopyToolConfig.java

@@ -50,6 +50,8 @@ public class CopyToolConfig
 
 	private String triggerColumn;
 
+	private String triggerDirectory;
+	
 	private File configFile;
 
 	private String tempDirectory;
@@ -333,6 +335,7 @@ private void findTriggerProperties (Properties config)
 		String source = config.getProperty(CONFIG_KEYS.TRIGGER_SOURCE.toString());
 		String table = config.getProperty(CONFIG_KEYS.TRIGGER_TABLE.toString());
 		String column = config.getProperty(CONFIG_KEYS.TRIGGER_COLUMN.toString());
+		String triggerDir = config.getProperty(CONFIG_KEYS.TRIGGER_DIR.toString());
 
 		if (StringUtils.isEmpty(source))
 		{
@@ -371,9 +374,59 @@ private void findTriggerProperties (Properties config)
 			return;
 		}
 
+		// no custom directory specified?
+		// then use home directory
+		if (StringUtils.isEmpty(triggerDir))
+			triggerDir = System.getProperty("user.dir");
+		
+		// make sure directory does not end with slash
+		while(triggerDir.endsWith("/"))
+		{
+			triggerDir = triggerDir.substring(0, triggerDir.length()-1);
+		}
+		
+		
+		File dir = new File(triggerDir);
+		
+		if (dir.exists() && dir.isFile())
+		{
+			LOG.error("Unable to use '" + triggerDir + "' as directory for trigger. Already exists as file. Trigger disabled!");
+			triggerEnabled = false;
+			return;
+		}
+		
+		if (!dir.exists())
+		{
+			if (!dir.mkdir())
+			{
+				LOG.error("Unable to create directory '" + triggerDir + "'. Trigger disabled!.");
+				triggerEnabled = false;
+				return;
+			}
+		}
+		
+		// check if we can write to trigger directory
+		File sample = new File(triggerDir, "test.txt");
+		
+		try {
+			if (!sample.createNewFile())
+			{
+				LOG.error("Unable to write to trigger directory '" + triggerDir + "'.Trigger disabled!");
+				triggerEnabled = false;
+				return;
+			}
+			
+			sample.delete();
+		} catch (IOException e) {
+			LOG.error("Unable to write to trigger directory '" + triggerDir + "'. Trigger disabled!");
+			 triggerEnabled = false;
+			return;
+		}
+		
 		triggerSource = source;
 		triggerTable = table;
 		triggerColumn = column;
+		triggerDirectory = triggerDir;
 
 		LOG.info("Trigger enabled, monitoring " + source +"." + table + "." + column + " for indication of new data");
 	}
@@ -847,6 +900,11 @@ public String getTriggerColumn()
 		return triggerColumn;
 	}
 
+	public String getTriggerDirectory() 
+	{
+		return triggerDirectory;
+	}
+	
 	public String getTempDirectory ()
 	{
 		return tempDirectory;