Adapt prefetch logic for new request state transition

Author: aafemt

src/jrd/inf.cpp

@@ -1124,9 +1124,7 @@ ULONG INF_request_info(const Request* request,
 
 		case isc_info_message_number:
 		case isc_info_message_size:
-			if (!(request->req_flags & req_active) ||
-				(request->req_operation != Request::req_receive &&
-					request->req_operation != Request::req_send))
+			if (!(request->req_flags & req_active))
 			{
 				buffer_ptr[0] = item;
 				item = isc_info_error;

src/remote/server/server.cpp

@@ -4462,16 +4462,21 @@ static bool get_next_msg_no(Rrq* request, USHORT incarnation, USHORT * msg_numbe
 		switch (*info)
 		{
 		case isc_info_state:
-			if (n != isc_info_req_send)
-				return false;
+			// Request is in state req_send when it reached SuspendNode after start() or send()
+			// Request is in state req_stall when SuspendNode has just returned and generally
+			// it is unknown what next execution path can be. Still it is possible that it will
+			// lead to the next SuspendNode i.e. returning of the next record.
+			if (n == isc_info_req_send || n == isc_info_req_sql_stall)
+				result = true;
 			break;
 
 		case isc_info_message_number:
 			*msg_number = n;
-			result = true;
 			break;
 
 		default:
+			// Most likely this is isc_info_error which is returned for info_message_number
+			// if the request is inactive
 			return false;
 		}
 		info += 3 + l;