Merge pull request #3932 from manticoresoftware/fix/lock-tables-buddy-daemon

Fix/lock tables buddy daemon

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 )
-		{
-		case IndexType_e::RT:
-		case IndexType_e::PERCOLATE:
+		auto pIndex = GetServed ( dPair.m_sName );
+		if ( ServedDesc_t::IsMutable ( pIndex ) )
 		{
-			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;
 		}
 	}
 
@@ -10886,20 +10886,18 @@ void UnlockTables(ClientSession_c* pSess)
 	pSess->m_dLockedTables.Reset();
 }
 
-void HandleMysqlLockTables ( RowBuffer_i & tOut, const SqlStmt_t & tStmt )
+void HandleMysqlLockTables ( RowBuffer_i & tOut, const SqlStmt_t & tStmt, CSphString& sWarningOut )
 {
 	StrVec_t dIndexes;
 	bool bHasWrite = false;
 	tStmt.m_dInsertValues.for_each ( [&] (const SqlInsert_t& tVal) {
-		bHasWrite |= tVal.m_iType>10;
-		dIndexes.Add(tVal.m_sVal);
+		if ( tVal.m_iType>10 )
+			bHasWrite = true;
+		else
+			dIndexes.Add(tVal.m_sVal);
 	});
 
-	if (bHasWrite)
-	{
-		tOut.Error ( "Write lock is not implemented." );
-		return;
-	}
+	sWarningOut = bHasWrite ? "Write lock is not implemented." : "";
 
 	if ( session::GetProto()!=Proto_e::MYSQL41 )
 	{
@@ -10932,7 +10930,7 @@ void HandleMysqlLockTables ( RowBuffer_i & tOut, const SqlStmt_t & tStmt )
 		sphLogDebug ( "Locked %s", sIndex.cstr() );
 	}
 
-	tOut.Ok ( 0 );
+	tOut.Ok ( 0, bHasWrite ? 1 : 0 );
 }
 
 void HandleMysqlUnlockTables ( RowBuffer_i & tOut )
@@ -11516,7 +11514,7 @@ bool ClientSession_c::Execute ( Str_t sQuery, RowBuffer_i & tOut )
 		return true;
 
 	case STMT_LOCK_TABLES:
-		HandleMysqlLockTables ( tOut, *pStmt );
+		HandleMysqlLockTables ( tOut, *pStmt, m_tLastMeta.m_sWarning );
 		return true;
 
 	case STMT_UNLOCK_TABLES:

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;
@@ -75,7 +76,11 @@ searchd
 	select * from a order by id asc;
 	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;
@@ -87,6 +92,7 @@ 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;
 	drop table a;
 	drop table b;
 </sphinxql>

test/test_316/test.xml

@@ -0,0 +1 @@
+a:1:{i:0;a:9:{i:0;a:2:{s:8:"sphinxql";s:23:"create table a(iid int)";s:14:"total_affected";i:0;}i:1;a:2:{s:8:"sphinxql";s:16:"create cluster c";s:14:"total_affected";i:0;}i:2;a:2:{s:8:"sphinxql";s:21:"alter cluster c add a";s:14:"total_affected";i:0;}i:3;a:3:{s:8:"sphinxql";s:18:"lock tables a read";s:5:"errno";i:1064;s:5:"error";s:53:"Table a is member of a cluster; not suitable for lock";}i:4;a:3:{s:8:"sphinxql";s:20:"lock tables c:a read";s:5:"errno";i:1064;s:5:"error";s:42:"Table c:a absent, or not suitable for lock";}i:5;a:2:{s:8:"sphinxql";s:22:"alter cluster c drop a";s:14:"total_affected";i:0;}i:6;a:2:{s:8:"sphinxql";s:16:"delete cluster c";s:14:"total_affected";i:0;}i:7;a:2:{s:8:"sphinxql";s:12:"drop table a";s:14:"total_affected";i:0;}i:8;a:3:{s:8:"sphinxql";s:12:"drop table b";s:5:"errno";i:1064;s:5:"error";s:36:"DROP TABLE failed: unknown table 'b'";}}}

test/test_387/model.bin

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<test>
+
+<name>cluster table lock</name>
+
+<requires>
+<replication/>
+<non-windows/>
+<force-rt/>
+</requires>
+<skip_indexer/>
+
+<config>
+searchd
+{
+	<searchd_Settings/>
+	data_dir = <data_path/>
+}
+</config>
+
+<queries>
+<sphinxql>
+	create table a(iid int);
+	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>
+</queries>
+
+</test>