prettify lock_rec_has_to_wait()

storage/innobase/lock/lock0lock.cc

@@ -738,7 +738,7 @@ lock_rec_get_insert_intention(
 Checks if a lock request for a new lock has to wait for request lock2.
 @return TRUE if new lock has to wait for lock2 to be removed */
 UNIV_INLINE
-ibool
+bool
 lock_rec_has_to_wait(
 /*=================*/
 	bool		for_locking,
@@ -761,10 +761,12 @@ lock_rec_has_to_wait(
 	ut_ad(trx && lock2);
 	ut_ad(lock_get_type_low(lock2) == LOCK_REC);
 
-	if (trx != lock2->trx
-	    && !lock_mode_compatible(static_cast<lock_mode>(
-			             LOCK_MODE_MASK & type_mode),
+	if (trx == lock2->trx
+	    || lock_mode_compatible(
+		       static_cast<lock_mode>(LOCK_MODE_MASK & type_mode),
 		       lock_get_mode(lock2))) {
+		return(false);
+	}
 
 	/* We have somewhat complex rules when gap type record locks
 	cause waits */
@@ -777,25 +779,23 @@ lock_rec_has_to_wait(
 		different users can have conflicting lock types
 		on gaps. */
 
-			return(FALSE);
+		return(false);
 	}
 
-		if (!(type_mode & LOCK_INSERT_INTENTION)
-		    && lock_rec_get_gap(lock2)) {
+	if (!(type_mode & LOCK_INSERT_INTENTION) && lock_rec_get_gap(lock2)) {
 
 		/* Record lock (LOCK_ORDINARY or LOCK_REC_NOT_GAP
 		does not need to wait for a gap type lock */
 
-			return(FALSE);
+		return(false);
 	}
 
-		if ((type_mode & LOCK_GAP)
-		    && lock_rec_get_rec_not_gap(lock2)) {
+	if ((type_mode & LOCK_GAP) && lock_rec_get_rec_not_gap(lock2)) {
 
 		/* Lock on gap does not need to wait for
 		a LOCK_REC_NOT_GAP type lock */
 
-			return(FALSE);
+		return(false);
 	}
 
 	if (lock_rec_get_insert_intention(lock2)) {
@@ -811,12 +811,11 @@ lock_rec_has_to_wait(
 		Also, insert intention locks do not disturb each
 		other. */
 
-			return(FALSE);
+		return(false);
 	}
 
-		if ((type_mode & LOCK_GAP || lock_rec_get_gap(lock2)) &&
-		    !thd_need_ordering_with(trx->mysql_thd,
-					    lock2->trx->mysql_thd)) {
+	if ((type_mode & LOCK_GAP || lock_rec_get_gap(lock2))
+	    && !thd_need_ordering_with(trx->mysql_thd, lock2->trx->mysql_thd)) {
 		/* If the upper server layer has already decided on the
 		commit order between the transaction requesting the
 		lock and the transaction owning the lock, we do not
@@ -837,46 +836,49 @@ lock_rec_has_to_wait(
 		transaction and retry it. But it can save some
 		unnecessary rollbacks and retries. */
 
-			return (FALSE);
+		return(false);
 	}
 
 #ifdef WITH_WSREP
 	/* if BF thread is locking and has conflict with another BF
 	   thread, we need to look at trx ordering and lock types */
-		if (wsrep_thd_is_BF(trx->mysql_thd, FALSE)         &&
-		    wsrep_thd_is_BF(lock2->trx->mysql_thd, TRUE)) {
+	if (wsrep_thd_is_BF(trx->mysql_thd, FALSE)
+	    && wsrep_thd_is_BF(lock2->trx->mysql_thd, TRUE)) {
 
 		if (wsrep_debug) {
-				ib::info() <<
-					"BF-BF lock conflict, locking: " << for_locking;
+			ib::info() << "BF-BF lock conflict, locking: "
+				   << for_locking;
 			lock_rec_print(stderr, lock2);
-				ib::info() << " SQL1: "
-					   << wsrep_thd_query(trx->mysql_thd);
-				ib::info() << " SQL2: "
+			ib::info()
+				<< " SQL1: " << wsrep_thd_query(trx->mysql_thd)
+				<< " SQL2: "
 				<< wsrep_thd_query(lock2->trx->mysql_thd);
 		}
 
 		if (wsrep_trx_order_before(trx->mysql_thd,
-						   lock2->trx->mysql_thd) &&
-			    (type_mode & LOCK_MODE_MASK) == LOCK_X        &&
-			    (lock2->type_mode & LOCK_MODE_MASK) == LOCK_X) {
+					   lock2->trx->mysql_thd)
+		    && (type_mode & LOCK_MODE_MASK) == LOCK_X
+		    && (lock2->type_mode & LOCK_MODE_MASK) == LOCK_X) {
 			if (for_locking || wsrep_debug) {
 				/* exclusive lock conflicts are not
 				   accepted */
-					ib::info() <<
-						"BF-BF X lock conflict,"
-						"mode: " << type_mode <<
-						" supremum: " << lock_is_on_supremum;
-					ib::info() <<
-						"conflicts states: my "
-						   << wsrep_thd_conflict_state(trx->mysql_thd, FALSE)
+				ib::info()
+					<< "BF-BF X lock conflict,mode: "
+					<< type_mode
+					<< " supremum: " << lock_is_on_supremum
+					<< "conflicts states: my "
+					<< wsrep_thd_conflict_state(
+						   trx->mysql_thd, FALSE)
 					<< " locked "
-						   << wsrep_thd_conflict_state(lock2->trx->mysql_thd, FALSE);
+					<< wsrep_thd_conflict_state(
+						   lock2->trx->mysql_thd,
+						   FALSE);
 				lock_rec_print(stderr, lock2);
 				ib::info() << " SQL1: "
-						   << wsrep_thd_query(trx->mysql_thd);
-					ib::info() << " SQL2: "
-						   << wsrep_thd_query(lock2->trx->mysql_thd);
+					   << wsrep_thd_query(trx->mysql_thd)
+					   << " SQL2: "
+					   << wsrep_thd_query(
+						      lock2->trx->mysql_thd);
 
 				if (for_locking) {
 					return FALSE;
@@ -888,27 +890,27 @@ lock_rec_has_to_wait(
 			   operation is on uniq index
 			*/
 			if (wsrep_debug) {
-					ib::info() <<
-						"BF conflict, modes: "
-						   << type_mode << ":" << lock2->type_mode
+				ib::info()
+					<< "BF conflict, modes: " << type_mode
+					<< ":" << lock2->type_mode
 					<< " idx: " << lock2->index->name()
-						   << " table: " << lock2->index->table->name.m_name
+					<< " table: "
+					<< lock2->index->table->name.m_name
 					<< " n_uniq: " << lock2->index->n_uniq
-						   << " n_user: " << lock2->index->n_user_defined_cols;
-					ib::info() << " SQL1: "
-						   << wsrep_thd_query(trx->mysql_thd);
-					ib::info() << " SQL2: "
-						   << wsrep_thd_query(lock2->trx->mysql_thd);
+					<< " n_user: "
+					<< lock2->index->n_user_defined_cols
+					<< " SQL1: "
+					<< wsrep_thd_query(trx->mysql_thd)
+					<< " SQL2: "
+					<< wsrep_thd_query(
+						   lock2->trx->mysql_thd);
 			}
 			return FALSE;
 		}
 	}
 #endif /* WITH_WSREP */
 
-		return(TRUE);
-	}
-
-	return(FALSE);
+	return(true);
 }
 
 /*********************************************************************//**