From c97439830295339a53af833f61b179e462a320a2 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Sun, 24 Mar 2024 08:47:13 +0200
Subject: [PATCH] reorder ExecuteMultiFetchAsDBA and
 ExecuteMultiFetchAsDBARequest lexicographically

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
---
 proto/vtctldata.proto    | 18 +++++++++---------
 proto/vtctlservice.proto |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/proto/vtctldata.proto b/proto/vtctldata.proto
index 4b496838f4b..5f6b78bdd92 100644
--- a/proto/vtctldata.proto
+++ b/proto/vtctldata.proto
@@ -683,6 +683,15 @@ message ExecuteFetchAsDBAResponse {
   query.QueryResult result = 1;
 }
 
+message ExecuteHookRequest {
+  topodata.TabletAlias tablet_alias = 1;
+  tabletmanagerdata.ExecuteHookRequest tablet_hook_request = 2;
+}
+
+message ExecuteHookResponse {
+  tabletmanagerdata.ExecuteHookResponse hook_result = 1;
+}
+
 message ExecuteMultiFetchAsDBARequest {
   topodata.TabletAlias tablet_alias = 1;
   // SQL could have potentially multiple queries separated by semicolons.
@@ -706,15 +715,6 @@ message ExecuteMultiFetchAsDBAResponse {
   repeated query.QueryResult results = 1;
 }
 
-message ExecuteHookRequest {
-  topodata.TabletAlias tablet_alias = 1;
-  tabletmanagerdata.ExecuteHookRequest tablet_hook_request = 2;
-}
-
-message ExecuteHookResponse {
-  tabletmanagerdata.ExecuteHookResponse hook_result = 1;
-}
-
 message FindAllShardsInKeyspaceRequest {
   string keyspace = 1;
 }
diff --git a/proto/vtctlservice.proto b/proto/vtctlservice.proto
index a079d21598b..6307150f669 100644
--- a/proto/vtctlservice.proto
+++ b/proto/vtctlservice.proto
@@ -98,10 +98,10 @@ service Vtctld {
   rpc ExecuteFetchAsApp(vtctldata.ExecuteFetchAsAppRequest) returns (vtctldata.ExecuteFetchAsAppResponse) {};
   // ExecuteFetchAsDBA executes a SQL query on the remote tablet as the DBA user.
   rpc ExecuteFetchAsDBA(vtctldata.ExecuteFetchAsDBARequest) returns (vtctldata.ExecuteFetchAsDBAResponse) {};
-  // ExecuteMultiFetchAsDBA executes one or more SQL queries on the remote tablet as the DBA user.
-  rpc ExecuteMultiFetchAsDBA(vtctldata.ExecuteMultiFetchAsDBARequest) returns (vtctldata.ExecuteMultiFetchAsDBAResponse) {};
   // ExecuteHook runs the hook on the tablet.
   rpc ExecuteHook(vtctldata.ExecuteHookRequest) returns (vtctldata.ExecuteHookResponse);
+  // ExecuteMultiFetchAsDBA executes one or more SQL queries on the remote tablet as the DBA user.
+  rpc ExecuteMultiFetchAsDBA(vtctldata.ExecuteMultiFetchAsDBARequest) returns (vtctldata.ExecuteMultiFetchAsDBAResponse) {};
   // FindAllShardsInKeyspace returns a map of shard names to shard references
   // for a given keyspace.
   rpc FindAllShardsInKeyspace(vtctldata.FindAllShardsInKeyspaceRequest) returns (vtctldata.FindAllShardsInKeyspaceResponse) {};