More error handling goodness

Author: mikera

convex-benchmarks/src/main/java/convex/benchmarks/LocalPeerBenchmark.java

@@ -107,9 +107,10 @@ public void readWriteTransaction() throws TimeoutException, InterruptedException
 	 * Benchmark to test a single small op in a query. Basically the fastest we can
 	 * get a single query result.
 	 * @throws TimeoutException If client times out
+	 * @throws InterruptedException 
 	 */
 	@Benchmark
-	public void constantOpQuery() throws TimeoutException {
+	public void constantOpQuery() throws InterruptedException {
 		Result r=CONVEX.querySync(Constant.create(CVMLong.ONE));
 		if (r.isError()) {
 			throw new Error("Query Failed: "+r.toString());
@@ -121,9 +122,10 @@ public void constantOpQuery() throws TimeoutException {
 	 * get a k/v store query result.
 	 * @throws TimeoutException If client times out
 	 * @throws IOException In case of IO error
+	 * @throws InterruptedException 
 	 */
 	@Benchmark
-	public void readWriteOpQuery() throws TimeoutException, IOException {
+	public void readWriteOpQuery() throws InterruptedException {
 		Result r=CONVEX.querySync(readWriteCmd);
 		if (r.isError()) {
 			throw new Error("Query Failed: "+r.toString());

convex-cli/src/main/java/convex/cli/account/AccountInformation.java

@@ -1,12 +1,9 @@
 package convex.cli.account;
 
-import java.util.concurrent.TimeoutException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import convex.api.Convex;
-import convex.cli.CLIError;
 import convex.cli.Constants;
 import convex.cli.Main;
 import convex.core.Result;
@@ -65,8 +62,8 @@ public void run() {
 		try {
 			result = convex.querySync(message);
 			mainParent.printResult(result);
-		} catch (TimeoutException e) {
-			throw new CLIError("Timeout",e);
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
 		} 
 	}
 }

convex-cli/src/main/java/convex/cli/client/Query.java

@@ -1,9 +1,6 @@
 package convex.cli.client;
 
-import java.util.concurrent.TimeoutException;
-
 import convex.api.Convex;
-import convex.cli.CLIError;
 import convex.core.Result;
 import convex.core.data.ACell;
 import convex.core.lang.Reader;
@@ -45,8 +42,8 @@ public void run() {
 					break;
 				}
 			}
-		} catch (TimeoutException e) {
-			throw new CLIError("Query timed out. Perhaps there is a network problem, or the host is not an operational Convex peer?");
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
 		}
 	}
 }

convex-cli/src/main/java/convex/cli/client/Transact.java

@@ -1,7 +1,5 @@
 package convex.cli.client;
 
-import java.util.concurrent.TimeoutException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,8 +50,6 @@ public void run() {
 		try {
 			Result result = convex.transactSync(transaction);
 			mainParent.printResult(result);
-		} catch (TimeoutException e) {
-			throw new CLIError(ExitCodes.TEMPFAIL,"Timeout executing transaction",e);
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 		}

convex-core/src/main/java/convex/core/Result.java

@@ -368,6 +368,11 @@ public RecordFormat getFormat() {
 		return RESULT_FORMAT;
 	}
 
+	/**
+	 * Constructs a result from a caught exception 
+	 * @param e Exception caught
+	 * @return
+	 */
 	public static Result fromException(Throwable e) {
 		if (e instanceof TimeoutException) {
 			String msg=e.getMessage();
@@ -384,9 +389,23 @@ public static Result fromException(Throwable e) {
 		if (e instanceof ResultException) {
 			return ((ResultException) e).getResult();
 		}
+		if (e instanceof InterruptedException) {
+			return interruptThread();
+		}
 		return Result.create(null, ErrorCodes.EXCEPTION,Strings.create(e.getMessage()));
 	}
 
+	private static final Result INTERRUPTED_RESULT=Result.error(ErrorCodes.INTERRUPTED,Strings.create("Interrupted!"));
+	
+	/**
+	 * Returns a Result representing a thread interrup, AND sets the interrupt status on the current thread
+	 * @return
+	 */
+	public static Result interruptThread() {
+		Thread.currentThread().interrupt();
+		return INTERRUPTED_RESULT;
+	}
+