Merge lp:~nwilliams/akiban-server/simplify-builder-get into lp:~akiban-technologies/akiban-server/trunk

[Nathan Williams]

Expand BuilderResource rows before returning them.

This was trivial to do on the client side, but requires every client to do it. Ever so slight overlap with ExternalDataService functionality, but not enough in common to warrant a refactor.

Also ignore README from license check to quiet warning.

[Thomas Jones-Low (tjoneslo)]

As described.

review: Approve

=== modified file 'pom.xml'
--- pom.xml	2013-04-11 05:51:16 +0000
+++ pom.xml	2013-04-15 22:00:35 +0000
@@ -393,6 +393,7 @@
                         <exclude>bin/akserver</exclude>
                         <exclude>**/*.options</exclude>
                         <!-- Files requiring a specific format (packaging control, test output, etc) -->
+                        <exclude>README.md</exclude>
                         <exclude>debian/**</exclude>
                         <exclude>redhat/**</exclude>
                         <exclude>macosx/**</exclude>

=== modified file 'src/main/java/com/akiban/rest/resources/BuilderResource.java'
--- src/main/java/com/akiban/rest/resources/BuilderResource.java	2013-04-03 23:03:25 +0000
+++ src/main/java/com/akiban/rest/resources/BuilderResource.java	2013-04-15 22:00:35 +0000
@@ -77,8 +77,7 @@
                 .body(new RestResponseBuilder.BodyGenerator() {
                     @Override
                     public void write(PrintWriter writer) throws Exception {
-                        modelBuilder.create(tableName);
-                        restDMLService.getAllEntities(writer, tableName, 0);
+                        modelBuilder.getAll(writer, tableName);
                     }
                 })
                 .build();
@@ -97,8 +96,7 @@
                 .body(new RestResponseBuilder.BodyGenerator() {
                     @Override
                     public void write(PrintWriter writer) throws Exception {
-                        modelBuilder.create(tableName);
-                        restDMLService.getEntities(writer, tableName, 0, getPKString(uri));
+                        modelBuilder.getKeys(writer, tableName, getPKString(uri));
                     }
                 })
                 .build();

=== modified file 'src/main/java/com/akiban/server/service/restdml/ModelBuilder.java'
--- src/main/java/com/akiban/server/service/restdml/ModelBuilder.java	2013-03-26 20:32:58 +0000
+++ src/main/java/com/akiban/server/service/restdml/ModelBuilder.java	2013-04-15 22:00:35 +0000
@@ -47,6 +47,8 @@
 import com.akiban.server.service.transaction.TransactionService;
 import com.akiban.server.service.tree.TreeService;
 import com.akiban.server.store.Store;
+import com.akiban.server.types3.mcompat.mtypes.MString;
+import com.akiban.server.types3.pvalue.PValue;
 import com.akiban.sql.optimizer.rule.PlanGenerator;
 import com.akiban.util.AkibanAppender;
 import com.akiban.util.JsonUtils;
@@ -57,6 +59,7 @@
 import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import static com.akiban.server.service.transaction.TransactionService.CloseableTransaction;
@@ -104,6 +107,42 @@
         }
     }
 
+    public void getAll(PrintWriter writer, TableName tableName) throws IOException {
+        try (Session session = sessionService.createSession();
+             CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
+             createInternal(session, tableName);
+            Cursor cursor = groupScanCursor(session, tableName);
+            writer.append('[');
+            scanCursor(writer, cursor, true);
+            writer.append(']');
+        }
+    }
+
+    public void getKeys(PrintWriter writer, TableName tableName, String identifiers) throws IOException {
+        try (Session session = sessionService.createSession();
+             CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
+            createInternal(session, tableName);
+            AkibanInformationSchema ais = ddlFunctions.getAIS(session);
+            UserTable table = ais.getUserTable(tableName);
+            List<List<String>> keys = PrimaryKeyParser.parsePrimaryKeys(identifiers, table.getPrimaryKey().getIndex());
+            Operator plan = PlanGenerator.generateBranchPlan(ais, table);
+            QueryContext context = queryContext(session, ais);
+            Cursor cursor = API.cursor(plan, context);
+            boolean first = true;
+            writer.append('[');
+            for(List<String> pk : keys) {
+                for(int i = 0; i < pk.size(); i++) {
+                    PValue pvalue = new PValue(MString.varchar());
+                    pvalue.putString(pk.get(i), null);
+                    context.setPValue(i, pvalue);
+                }
+                first = scanCursor(writer, cursor, first);
+            }
+            writer.append(']');
+            txn.commit();
+        }
+    }
+
     public void insert(PrintWriter writer, TableName tableName, String data) {
         try (Session session = sessionService.createSession();
              CloseableTransaction txn = txnService.beginCloseableTransaction(session)) {
@@ -260,12 +299,36 @@
         }
     }
 
+    private QueryContext queryContext(Session session, AkibanInformationSchema ais) {
+        PersistitAdapter adapter = new PersistitAdapter(SchemaCache.globalSchema(ais), store, treeService, session, configService);
+        return new SimpleQueryContext(adapter);
+    }
+
     private Cursor groupScanCursor(Session session, TableName tableName) {
         UserTable table = ddlFunctions.getUserTable(session, tableName);
         Operator plan = PlanGenerator.generateScanPlan(table.getAIS(), table);
-        PersistitAdapter adapter = new PersistitAdapter(SchemaCache.globalSchema(table.getAIS()), store, treeService, session, configService);
-        QueryContext queryContext = new SimpleQueryContext(adapter);
-        return API.cursor(plan, queryContext);
+        return API.cursor(plan, queryContext(session, table.getAIS()));
+    }
+
+    private boolean scanCursor(PrintWriter writer, Cursor cursor, boolean first) throws IOException {
+        Row row;
+        cursor.open();
+        try {
+            while((row = cursor.next()) != null) {
+                if(!first) {
+                    writer.append(",\n");
+                }
+                first = false;
+                long id = row.pvalue(0).getInt64();
+                String json = row.pvalue(1).getString();
+                ObjectNode node = (ObjectNode)JsonUtils.readTree(json);
+                node.put(EntityParser.PK_COL_NAME, id);
+                writer.write(node.toString());
+            }
+        } finally {
+            cursor.close();
+        }
+        return first;
     }
 
 

=== modified file 'src/test/java/com/akiban/server/service/restdml/ModelBuilderIT.java'
--- src/test/java/com/akiban/server/service/restdml/ModelBuilderIT.java	2013-03-26 17:58:15 +0000
+++ src/test/java/com/akiban/server/service/restdml/ModelBuilderIT.java	2013-04-15 22:00:35 +0000
@@ -24,12 +24,16 @@
 import com.akiban.server.error.NoSuchTableException;
 import com.akiban.server.service.servicemanager.GuicedServiceManager;
 import com.akiban.server.test.it.ITBase;
+import com.akiban.util.JsonUtils;
 import com.akiban.util.Strings;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.node.ArrayNode;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Arrays;
 import java.util.Map;
@@ -247,6 +251,46 @@
         expectFullRows(tid, createNewRow(tid, 1L, expected));
     }
 
+    @Test
+    public void getAll() throws IOException {
+        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
+        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
+
+        StringWriter writer = new StringWriter();
+        PrintWriter pw = new PrintWriter(writer);
+        builder.getAll(pw, TABLE_NAME);
+
+        String output = writer.toString();
+        JsonNode node = JsonUtils.readTree(output);
+        assertTrue("Array node type", node.isArray());
+        assertEquals("Array size", 2, node.size());
+        for(int i = 0; i < node.size(); ++i) {
+            JsonNode subNode = node.get(i);
+            assertEquals("field count", 2, subNode.size());
+            assertEquals("id value", i+1, subNode.get(EntityParser.PK_COL_NAME).asInt());
+            assertEquals("name value", "foo", subNode.get("name").asText());
+        }
+    }
+
+    @Test
+    public void getKeys() throws IOException {
+        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
+        builder.insert(NULL_WRITER, TABLE_NAME, SIMPLE_JSON_1);
+
+        StringWriter writer = new StringWriter();
+        PrintWriter pw = new PrintWriter(writer);
+        builder.getKeys(pw, TABLE_NAME, "2");
+
+        String output = writer.toString();
+        JsonNode node = JsonUtils.readTree(output);
+        assertTrue("Array node type", node.isArray());
+        assertEquals("Array size", 1, node.size());
+        JsonNode subNode = node.get(0);
+        assertEquals("field count", 2, subNode.size());
+        assertEquals("id value", 2, subNode.get(EntityParser.PK_COL_NAME).asInt());
+        assertEquals("name value", "foo", subNode.get("name").asText());
+    }
+
     @Test(expected=ModelBuilderException.class)
     public void implodeBuilderTable() {
         builder.create(TABLE_NAME);

=== modified file 'src/test/resources/com/akiban/rest/caoi/builder-implode.check_expected'
--- src/test/resources/com/akiban/rest/caoi/builder-implode.check_expected	2013-03-26 20:32:58 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-implode.check_expected	2013-04-15 22:00:35 +0000
@@ -1,10 +1,68 @@
 [
     {
-        "_id": 1,
-        "_data": "{\"cid\":1,\"first_name\":\"John\",\"last_name\":\"Smith\",\"addresses\":[{\"aid\":101,\"cid\":1,\"state\":\"MA\",\"city\":\"Boston\"}],\"orders\":[{\"oid\":101,\"cid\":1,\"odate\":\"2011-03-01 00:00:00\",\"items\":[{\"iid\":1011,\"oid\":101,\"sku\":1234},{\"iid\":1012,\"oid\":101,\"sku\":4567}]},{\"oid\":102,\"cid\":1,\"odate\":\"2011-03-02 00:00:00\"}]}"
+        "cid": 1,
+        "first_name": "John",
+        "last_name": "Smith",
+        "addresses": [
+            {
+                "aid": 101,
+                "cid": 1,
+                "state": "MA",
+                "city": "Boston"
+            }
+        ],
+        "orders": [
+            {
+                "oid": 101,
+                "cid": 1,
+                "odate": "2011-03-01 00:00:00",
+                "items": [
+                    {
+                        "iid": 1011,
+                        "oid": 101,
+                        "sku": 1234
+                    },
+                    {
+                        "iid": 1012,
+                        "oid": 101,
+                        "sku": 4567
+                    }
+                ]
+            },
+            {
+                "oid": 102,
+                "cid": 1,
+                "odate": "2011-03-02 00:00:00"
+            }
+        ],
+        "_id": 1
     },
     {
-        "_id": 2,
-        "_data": "{\"cid\":2,\"first_name\":\"Willy\",\"last_name\":\"Jones\",\"addresses\":[{\"aid\":201,\"cid\":2,\"state\":\"NY\",\"city\":\"New York\"}],\"orders\":[{\"oid\":201,\"cid\":2,\"odate\":\"2011-03-03 00:00:00\",\"items\":[{\"iid\":2011,\"oid\":201,\"sku\":9876}]}]}"
+        "cid": 2,
+        "first_name": "Willy",
+        "last_name": "Jones",
+        "addresses": [
+            {
+                "aid": 201,
+                "cid": 2,
+                "state": "NY",
+                "city": "New York"
+            }
+        ],
+        "orders": [
+            {
+                "oid": 201,
+                "cid": 2,
+                "odate": "2011-03-03 00:00:00",
+                "items": [
+                    {
+                        "iid": 2011,
+                        "oid": 201,
+                        "sku": 9876
+                    }
+                ]
+            }
+        ],
+        "_id": 2
     }
 ]
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/rest/caoi/builder-insert.check'
--- src/test/resources/com/akiban/rest/caoi/builder-insert.check	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-insert.check	2013-04-15 22:00:35 +0000
@@ -0,0 +1,1 @@
+/builder/entity/test.foo/1
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/rest/caoi/builder-insert.check_expected'
--- src/test/resources/com/akiban/rest/caoi/builder-insert.check_expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/rest/caoi/builder-insert.check_expected	2013-04-15 22:00:35 +0000
@@ -0,0 +1,7 @@
+[
+    {
+        "_id": 1,
+        "name": "joe",
+        "age": 30
+    }
+]
\ No newline at end of file