feat: show read locks in show locks

related to #3047

Author: klirichek

src/coroutine.cpp

@@ -1167,6 +1167,11 @@ bool ReadTableLock_c::UnlockRead() noexcept
 	return true;
 }
 
+[[nodiscard]] DWORD ReadTableLock_c::GetReads() const noexcept
+{
+	return m_uReads;
+}
+
 ScopedWriteTable_c::ScopedWriteTable_c ( ReadTableLock_c& tTableLock )
 	: m_tTableLock { tTableLock }
 	, m_bCanWrite { tTableLock.TryWrite() }

src/coroutine.h

@@ -355,6 +355,7 @@ class ReadTableLock_c final
 	void WaitRead() noexcept;
 	void FinishWrite() noexcept;
 	[[nodiscard]] bool UnlockRead() noexcept;
+	[[nodiscard]] DWORD GetReads() const noexcept;
 };
 
 class ScopedWriteTable_c final

src/searchd.cpp

@@ -10842,32 +10842,32 @@ void HandleMysqlShowLocks ( RowBuffer_i & tOut )
 	if ( !tOut.HeadEnd () )
 		return;
 
+	auto fnLine = [&tOut](const NamedIndexType_t& dPair, int iLocks, const char* szType ) noexcept -> bool
+	{
+		tOut.PutString ( GetIndexTypeName ( dPair.m_eType ) );
+		tOut.PutString ( dPair.m_sName );
+		tOut.PutString ( szType );
+		tOut.PutStringf ( "Count: %d", iLocks );
+		return tOut.Commit ();
+	};
 
 	// collect local, rt, percolate
 	auto dIndexes = GetAllServedIndexes ();
 	for ( auto & dPair: dIndexes )
 	{
-		switch ( dPair.m_eType )
+		auto pIndex = GetServed ( dPair.m_sName );
+		if ( ServedDesc_t::IsMutable ( pIndex ) )
 		{
-		case IndexType_e::RT:
-		case IndexType_e::PERCOLATE:
-		{
-			auto pIndex = GetServed ( dPair.m_sName );
-			assert ( ServedDesc_t::IsMutable ( pIndex ) );
 			RIdx_T<RtIndex_i *> pRt { pIndex };
-			int iLocks = pRt->GetNumOfLocks ();
-			if ( iLocks>0 )
-			{
-				tOut.PutString ( GetIndexTypeName ( dPair.m_eType ) );
-				tOut.PutString ( dPair.m_sName );
-				tOut.PutString ( "freeze" );
-				tOut.PutStringf ( "Count: %d", iLocks );
-				if ( !tOut.Commit () )
-					return;
-			}
+			const int iLocks = pRt->GetNumOfLocks ();
+			if ( iLocks>0 && !fnLine ( dPair, iLocks, "freeze" ) )
+				return;
 		}
-		default:
-			break;
+		if ( ServedDesc_t::IsLocal ( pIndex ) )
+		{
+			const int iRLocks = pIndex->GetReadLocks();
+			if ( iRLocks>0 && !fnLine ( dPair, iRLocks, "read" ) )
+				return;
 		}
 	}
 

src/searchdaemon.cpp

@@ -1285,6 +1285,11 @@ void ServedIndex_c::LockRead() const noexcept
 	return m_tTableLock.UnlockRead();
 }
 
+[[nodiscard]] DWORD ServedIndex_c::GetReadLocks() const noexcept
+{
+	return m_tTableLock.GetReads();
+}
+
 [[nodiscard]] Threads::Coro::ReadTableLock_c& ServedIndex_c::Locker() const noexcept
 {
 	return m_tTableLock;

src/searchdaemon.h

@@ -741,6 +741,7 @@ class ServedIndex_c : public ServedDesc_t
 
 	void LockRead() const noexcept;
 	[[nodiscard]] bool UnlockRead() const noexcept;
+	[[nodiscard]] DWORD GetReadLocks() const noexcept;
 	[[nodiscard]] Threads::Coro::ReadTableLock_c& Locker() const noexcept;
 };
 

test/test_316/model.bin

@@ -59,6 +59,7 @@ searchd
 </sphinxql>
 <sphinxql conn="1">lock tables a read</sphinxql>
 <sphinxql>
+	show locks;
 	insert into a values (9, 1);
 	insert into b values (9, 2);
 	update a set iid=9 where id=1;
@@ -76,8 +77,10 @@ searchd
 	select * from b order by id asc;
 	lock tables a read, b write;
 	show warnings;
+	show locks;
 	lock tables a read, b read;
 	show warnings;
+	show locks;
 	insert into a values (6, 1);
 	insert into b values (6, 2);
 	update a set iid=6 where id=1;
@@ -89,6 +92,13 @@ searchd
 	update b set iid=7 where id=1;
 	select * from a order by id asc;
 	select * from b order by id asc;
+	show locks;
+	create cluster c;
+	alter cluster c add a;
+	lock tables a read;
+	lock tables c:a read;
+	alter cluster c drop a;
+	delete cluster c;
 	drop table a;
 	drop table b;
 </sphinxql>