From 199ccad3e118e38abd1404b351ba3ff835f6c8bf Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 3 Apr 2018 02:11:49 -0700
Subject: [PATCH] ircd::m: Minor desc cleanup; minor cleanup exception rewrite.

---
 ircd/m/dbs.cc  | 11 ++++++++---
 ircd/m/room.cc |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ircd/m/dbs.cc b/ircd/m/dbs.cc
index c0f5019bf..cf80747f8 100644
--- a/ircd/m/dbs.cc
+++ b/ircd/m/dbs.cc
@@ -1420,9 +1420,6 @@ ircd::m::dbs::desc::events
 	// they are designed for fast sequential iterations.
 	//
 
-	// (state tree node id) => (state tree node)
-	events__state_node,
-
 	// (room_id, event_id) => (state_root)
 	// Sequence of all events for a room, ever.
 	events__room_events,
@@ -1434,4 +1431,12 @@ ircd::m::dbs::desc::events
 	// (room_id, type, state_key) => (event_id)
 	// Sequence of the PRESENT STATE of the room.
 	events__room_state,
+
+	////////
+	//
+	// Other columns
+	//
+
+	// (state tree node id) => (state tree node)
+	events__state_node,
 };
diff --git a/ircd/m/room.cc b/ircd/m/room.cc
index 6fd18e2c9..e864d0d69 100644
--- a/ircd/m/room.cc
+++ b/ircd/m/room.cc
@@ -410,7 +410,11 @@ catch(const db::not_found &e)
 {
 	throw m::NOT_FOUND
 	{
-		"(%s,%s) in %s :%s", type, state_key, room_id, e.what()
+		"(%s,%s) in %s :%s",
+		type,
+		state_key,
+		string_view{room_id},
+		e.what()
 	};
 }