{"id":815903,"url":"http://patchwork.ozlabs.org/api/patches/815903/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-51-blp@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919220125.32535-51-blp@ovn.org>","list_archive_url":null,"date":"2017-09-19T22:01:23","name":"[ovs-dev,RFC,50/52] ovsdb-client: Add new \"query\" command.","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"85972e4290cb3423224a042fb4ee4c7c7527f876","submitter":{"id":67603,"url":"http://patchwork.ozlabs.org/api/people/67603/?format=json","name":"Ben Pfaff","email":"blp@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-51-blp@ovn.org/mbox/","series":[{"id":3975,"url":"http://patchwork.ozlabs.org/api/series/3975/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=3975","date":"2017-09-19T22:00:34","name":"clustering implementation","version":1,"mbox":"http://patchwork.ozlabs.org/series/3975/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815903/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815903/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=)","Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxcvF3r76z9sBW\n\tfor ;\n\tWed, 20 Sep 2017 08:27:37 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 62470D65;\n\tTue, 19 Sep 2017 22:03:02 +0000 (UTC)","from smtp2.linuxfoundation.org (smtp2.linux-foundation.org\n\t[172.17.192.36])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 864D1D57\n\tfor ; Tue, 19 Sep 2017 22:02:59 +0000 (UTC)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby smtp2.linuxfoundation.org (Postfix) with ESMTPS id 0A7691DCE2\n\tfor ; Tue, 19 Sep 2017 22:02:59 +0000 (UTC)","from sigabrt.benpfaff.org (unknown [208.91.2.3])\n\t(Authenticated sender: blp@ovn.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id B6CE9172098;\n\tWed, 20 Sep 2017 00:02:56 +0200 (CEST)"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","X-Originating-IP":"208.91.2.3","From":"Ben Pfaff ","To":"dev@openvswitch.org","Date":"Tue, 19 Sep 2017 15:01:23 -0700","Message-Id":"<20170919220125.32535-51-blp@ovn.org>","X-Mailer":"git-send-email 2.10.2","In-Reply-To":"<20170919220125.32535-1-blp@ovn.org>","References":"<20170919220125.32535-1-blp@ovn.org>","X-Spam-Status":"No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW\n\tautolearn=ham version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp2.linux-foundation.org","Cc":"Ben Pfaff ","Subject":"[ovs-dev] [PATCH RFC 50/52] ovsdb-client: Add new \"query\" command.","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"Signed-off-by: Ben Pfaff \n---\n NEWS | 2 +-\n ovsdb/ovsdb-client.c | 42 ++++++++++++++++++++++++++++++++++++------\n 2 files changed, 37 insertions(+), 7 deletions(-)","diff":"diff --git a/NEWS b/NEWS\nindex 9782818a1b0d..fc8db4965737 100644\n--- a/NEWS\n+++ b/NEWS\n@@ -7,7 +7,7 @@ Post-v2.8.0\n \"ovsdb-client convert\".\n * ovsdb-server now always hosts a built-in database named _Server. See\n ovsdb-server(5) for more details.\n- * ovsdb-client: New \"get-schema-cksum\" command.\n+ * ovsdb-client: New \"get-schema-cksum\" and \"query\" commands.\n * ovsdb-client: New \"backup\" and \"restore\" commands.\n - ovs-vsctl and other commands that display data in tables now support a\n --max-column-width option to limit column width.\ndiff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c\nindex 056aa25c8983..c153a978385a 100644\n--- a/ovsdb/ovsdb-client.c\n+++ b/ovsdb/ovsdb-client.c\n@@ -294,8 +294,11 @@ usage(void)\n \"\\n list-columns [SERVER] [DATABASE] [TABLE]\\n\"\n \" list columns in TABLE (or all tables) in DATABASE on SERVER\\n\"\n \"\\n transact [SERVER] TRANSACTION\\n\"\n- \" run TRANSACTION (a JSON array of operations) on SERVER\\n\"\n+ \" run TRANSACTION (params for \\\"transact\\\" request) on SERVER\\n\"\n \" and print the results as JSON on stdout\\n\"\n+ \"\\n query [SERVER] TRANSACTION\\n\"\n+ \" run TRANSACTION (params for \\\"transact\\\" request) on SERVER,\\n\"\n+ \" as read-only, and print the results as JSON on stdout\\n\"\n \"\\n monitor [SERVER] [DATABASE] TABLE [COLUMN,...]...\\n\"\n \" monitor contents of COLUMNs in TABLE in DATABASE on SERVER.\\n\"\n \" COLUMNs may include !initial, !insert, !delete, !modify\\n\"\n@@ -584,13 +587,9 @@ send_db_change_aware(struct jsonrpc *rpc)\n }\n \n static void\n-do_transact(struct jsonrpc *rpc, const char *database OVS_UNUSED,\n- int argc OVS_UNUSED, char *argv[])\n+do_transact__(struct jsonrpc *rpc, struct json *transaction)\n {\n struct jsonrpc_msg *request, *reply;\n- struct json *transaction;\n-\n- transaction = parse_json(argv[0]);\n \n if (db_change_aware == 1) {\n send_db_change_aware(rpc);\n@@ -605,6 +604,36 @@ do_transact(struct jsonrpc *rpc, const char *database OVS_UNUSED,\n putchar('\\n');\n jsonrpc_msg_destroy(reply);\n }\n+\n+static void\n+do_transact(struct jsonrpc *rpc, const char *database OVS_UNUSED,\n+ int argc OVS_UNUSED, char *argv[])\n+{\n+ do_transact__(rpc, parse_json(argv[0]));\n+}\n+\n+static void\n+do_query(struct jsonrpc *rpc, const char *database OVS_UNUSED,\n+ int argc OVS_UNUSED, char *argv[])\n+{\n+ struct json *transaction = parse_json(argv[0]);\n+\n+ /* Ensure that 'transaction' is a 2-element array, whose second element is\n+ * also an array. The second element is the array of operations in the\n+ * query. */\n+ if (transaction->type != JSON_ARRAY\n+ || transaction->u.array.n != 2\n+ || transaction->u.array.elems[1]->type != JSON_ARRAY) {\n+ ovs_fatal(0, \"not a valid OVSDB query\");\n+ }\n+\n+ /* Append an \"abort\" operation to the query. */\n+ struct json *abort_op = json_object_create();\n+ json_object_put_string(abort_op, \"op\", \"abort\");\n+ json_array_add(transaction->u.array.elems[1], abort_op);\n+\n+ do_transact__(rpc, transaction);\n+}\n \f\n /* \"monitor\" command. */\n \n@@ -1922,6 +1951,7 @@ static const struct ovsdb_client_command all_commands[] = {\n { \"list-tables\", NEED_DATABASE, 0, 0, do_list_tables },\n { \"list-columns\", NEED_DATABASE, 0, 1, do_list_columns },\n { \"transact\", NEED_RPC, 1, 1, do_transact },\n+ { \"query\", NEED_RPC, 1, 1, do_query },\n { \"monitor\", NEED_DATABASE, 1, INT_MAX, do_monitor },\n { \"monitor-cond\", NEED_DATABASE, 2, 3, do_monitor_cond },\n { \"convert\", NEED_RPC, 1, 1, do_convert },\n","prefixes":["ovs-dev","RFC","50/52"]}