Merge lp:~mmcm/akiban-server/direct-timestamp into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

Add TIMESTAMP as a parameter type for Direct REST endpoints.

Also fix the auto-commit part of bug #1168547, which is blocking.

[Nathan Williams (nwilliams)]

Do we want encourage DATETIME instead? TIMESTAMP has funnier limitations.

review: Needs Information

[Mike McMahon (mmcm)]

Are we okay saying that datetime is passed an instance of java.sql.Timestamp? I don't otherwise have issues with the name. But Date & Timestamp are the two basic types in the Java "primitive" world shared between JDBC and scripts.

Someday we can make SQL TIMESTAMP standard with fractional seconds and not some MySQL madness.

[Nathan Williams (nwilliams)]

I'm not sure what you my by OK, internal support? I was mainly thinking about how we actively limit TIMESTAMP to the 1970-2038 range. Giving someone that for, say, birthdays won't work very well.

++ to getting rid of the madness someday.

[Mike McMahon (mmcm)]

Well, these values don't go into places that have that limitation. They are parsed from the URI and passed to the script. So, competing arguments I can see are (1) "timestamp" because that's SQL- and Java-standard and (2) "datetime" because in general that's the name of the type in Akiban that behaves rationally.

[Nathan Williams (nwilliams)]

I see, misunderstood the ramification of this particular path.

review: Approve

=== modified file 'src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java'
--- src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java	2013-04-11 23:16:55 +0000
+++ src/main/java/com/akiban/server/service/restdml/DirectServiceImpl.java	2013-04-12 21:18:37 +0000
@@ -336,6 +336,8 @@
             final byte[] content, final MediaType[] responseType) throws Exception {
         try (JDBCConnection conn = jdbcConnection(request, procName.getSchemaName());) {
 
+            conn.setAutoCommit(false);
+
             boolean completed = false;
             boolean repeat = true;
 

=== modified file 'src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java'
--- src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java	2013-04-08 14:53:42 +0000
+++ src/main/java/com/akiban/server/service/restdml/EndpointMetadata.java	2013-04-12 21:18:37 +0000
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.sql.Date;
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -63,12 +64,13 @@
     final static String X_TYPE_DOUBLE = "double";
     final static String X_TYPE_STRING = "string";
     final static String X_TYPE_DATE = "date";
+    final static String X_TYPE_TIMESTAMP = "timestamp";
     final static String X_TYPE_BYTEARRAY = "bytearray";
     final static String X_TYPE_JSON = "json";
     final static String X_TYPE_VOID = "void";
 
     final static List<String> X_TYPES = Arrays.asList(new String[] { X_TYPE_INT, X_TYPE_LONG, X_TYPE_FLOAT,
-            X_TYPE_DOUBLE, X_TYPE_STRING, X_TYPE_DATE, X_TYPE_BYTEARRAY, X_TYPE_JSON, X_TYPE_VOID });
+            X_TYPE_DOUBLE, X_TYPE_STRING, X_TYPE_DATE, X_TYPE_TIMESTAMP, X_TYPE_BYTEARRAY, X_TYPE_JSON, X_TYPE_VOID });
 
     private final static Charset UTF8 = Charset.forName("UTF8");
 
@@ -133,6 +135,8 @@
             return asString(pm, v);
         case EndpointMetadata.X_TYPE_DATE:
             return asDate(pm, v);
+        case EndpointMetadata.X_TYPE_TIMESTAMP:
+            return asTimestamp(pm, v);
         case EndpointMetadata.X_TYPE_BYTEARRAY:
             assert v instanceof byte[];
             return v;
@@ -184,6 +188,14 @@
         return Date.valueOf(s);
     }
 
+    private static Timestamp asTimestamp(ParamMetadata pm, Object v) throws ParseException {
+        String s = asString(pm, v);
+        if ("now".equalsIgnoreCase(s)) {
+            return new Timestamp(System.currentTimeMillis());
+        }
+        return Timestamp.valueOf(s);
+    }
+
     static EndpointMetadata createEndpointMetadata(final String schema, final String routineName,
             final String specification) throws Exception {
         EndpointMetadata em = new EndpointMetadata();