Merge pull request #8586 from XaBbl4/gh-8139

Fix for #8139: Add lookup index name by constraint for correct resolve conflict on replica

Author: hvlad

src/jrd/irq.h

@@ -182,6 +182,7 @@ enum irq_type_t
 	irq_dbb_ss_definer,		// get database sql security value
 	irq_out_proc_param_dep,	// check output procedure parameter dependency
 	irq_l_pub_tab_state,	// lookup publication state for a table
+	irq_l_index_cnstrt,     // lookup index for constraint
 
 	irq_MAX
 };

src/jrd/met.epp

@@ -2079,6 +2079,37 @@ void MET_load_trigger(thread_db* tdbb,
 
 
 
+void MET_lookup_index_for_cnstrt(thread_db* tdbb,
+	MetaName& index_name,
+	const MetaName& constraint_name)
+{
+/**************************************
+*
+*      M E T _ l o o k u p _ i n d e x _ f o r _ c n s t r t
+*
+**************************************
+*
+* Functional description
+*      Lookup index name from constraint name, if one exists.
+*      index_name is output parameter.
+*
+**************************************/
+	SET_TDBB(tdbb);
+	Attachment* attachment = tdbb->getAttachment();
+
+	index_name = "";
+	AutoCacheRequest request(tdbb, irq_l_index_cnstrt, IRQ_REQUESTS);
+
+	FOR(REQUEST_HANDLE request)
+		X IN RDB$RELATION_CONSTRAINTS WITH X.RDB$CONSTRAINT_NAME EQ constraint_name.c_str()
+	{
+		if (!X.RDB$INDEX_NAME.NULL)
+			index_name = X.RDB$INDEX_NAME;
+	}
+	END_FOR
+}
+
+
 void MET_lookup_cnstrt_for_index(thread_db* tdbb,
 								 MetaName& constraint_name,
 								 const MetaName& index_name)
@@ -2091,7 +2122,7 @@ void MET_lookup_cnstrt_for_index(thread_db* tdbb,
  *
  * Functional description
  *      Lookup  constraint name from index name, if one exists.
- *      Calling routine must pass a buffer of at least 32 bytes.
+ *      constraint_name is output parameter.
  *
  **************************************/
 	SET_TDBB(tdbb);
@@ -2122,7 +2153,7 @@ void MET_lookup_cnstrt_for_trigger(thread_db* tdbb,
  *
  * Functional description
  *      Lookup  constraint name from trigger name, if one exists.
- *      Calling routine must pass a buffer of at least 32 bytes.
+ *      constraint_name and relation_name are output parameters.
  *
  **************************************/
 	SET_TDBB(tdbb);
@@ -2499,7 +2530,7 @@ void MET_lookup_index(thread_db* tdbb,
  *
  * Functional description
  *      Lookup index name from relation and index number.
- *      Calling routine must pass a buffer of at least 32 bytes.
+ *      index_name is output parameter.
  *
  **************************************/
 	SET_TDBB(tdbb);

src/jrd/met_proto.h

@@ -97,6 +97,7 @@ void		MET_load_db_triggers(Jrd::thread_db*, int);
 void		MET_load_ddl_triggers(Jrd::thread_db* tdbb);
 bool		MET_load_exception(Jrd::thread_db*, Jrd::ExceptionItem&);
 void		MET_load_trigger(Jrd::thread_db*, Jrd::jrd_rel*, const Jrd::MetaName&, Jrd::TrigVector**);
+void		MET_lookup_index_for_cnstrt(Jrd::thread_db*, Jrd::MetaName& index_name, const Jrd::MetaName& constraint);
 void		MET_lookup_cnstrt_for_index(Jrd::thread_db*, Jrd::MetaName& constraint, const Jrd::MetaName& index_name);
 void		MET_lookup_cnstrt_for_trigger(Jrd::thread_db*, Jrd::MetaName&, Jrd::MetaName&, const Jrd::MetaName&);
 void		MET_lookup_exception(Jrd::thread_db*, SLONG, /* OUT */ Jrd::MetaName&, /* OUT */ Firebird::string*);

src/jrd/replication/Applier.cpp

@@ -622,10 +622,18 @@ void Applier::insertRecord(thread_db* tdbb, TraNumber traNum,
 	fb_assert(error[2] == isc_arg_string);
 	fb_assert(error[3] != 0);
 
-	const char* idxName = reinterpret_cast<const char*>(error[3]);
+	const MetaName nameFromErr(reinterpret_cast<const char*>(error[3]));
+	MetaName idxName;
+	if (error[1] == isc_no_dup)
+		idxName = nameFromErr;
+	else if (!m_constraintIndexMap.get(nameFromErr, idxName))
+	{
+		MET_lookup_index_for_cnstrt(tdbb, idxName, nameFromErr);
+		m_constraintIndexMap.put(nameFromErr, idxName);
+	}
 
 	index_desc idx;
-	const auto indexed = lookupRecord(tdbb, relation, record, m_bitmap, idx, idxName);
+	const auto indexed = lookupRecord(tdbb, relation, record, m_bitmap, idx, &idxName);
 
 	AutoPtr<Record> cleanup;
 
@@ -1071,7 +1079,7 @@ bool Applier::compareKey(thread_db* tdbb, jrd_rel* relation, const index_desc& i
 bool Applier::lookupRecord(thread_db* tdbb,
 						   jrd_rel* relation, Record* record,
 						   RecordBitmap* bitmap,
-						   index_desc& idx, const char* idxName)
+						   index_desc& idx, const MetaName* idxName)
 {
 	RecordBitmap::reset(bitmap);
 
@@ -1083,16 +1091,16 @@ bool Applier::lookupRecord(thread_db* tdbb,
 	}
 
 	bool haveIdx = false;
-	if (idxName)
+	if (idxName && idxName->hasData())
 	{
 		SLONG foundRelId;
 		IndexStatus idxStatus;
-		SLONG idx_id = MET_lookup_index_name(tdbb, idxName, &foundRelId, &idxStatus);
+		SLONG idx_id = MET_lookup_index_name(tdbb, *idxName, &foundRelId, &idxStatus);
 
 		fb_assert(idxStatus == MET_object_active);
 		fb_assert(foundRelId == relation->rel_id);
 
-		haveIdx = (idxStatus == MET_object_active) && (foundRelId == relation->rel_id) &&
+		haveIdx = (idx_id >= 0) && (idxStatus == MET_object_active) && (foundRelId == relation->rel_id) &&
 			BTR_lookup(tdbb, relation, idx_id, &idx, relation->getPages(tdbb));
 	}
 

src/jrd/replication/Applier.h

@@ -37,6 +37,7 @@ namespace Jrd
 	{
 		typedef Firebird::GenericMap<Firebird::Pair<Firebird::NonPooled<TraNumber, jrd_tra*> > > TransactionMap;
 		typedef Firebird::HalfStaticArray<bid, 16> BlobList;
+		typedef Firebird::GenericMap<MetaNamePair> ConstraintIndexMap;
 /*
 		class ReplicatedTransaction : public Firebird::IReplicatedTransaction
 		{
@@ -128,7 +129,8 @@ namespace Jrd
 				Jrd::jrd_req* request)
 			: PermanentStorage(pool),
 			  m_txnMap(pool), m_database(pool, database),
-			  m_request(request), m_bitmap(FB_NEW_POOL(pool) RecordBitmap(pool)), m_record(NULL)
+			  m_request(request), m_bitmap(FB_NEW_POOL(pool) RecordBitmap(pool)), m_record(NULL),
+			  m_constraintIndexMap(pool)
 		{}
 
 		static Applier* create(thread_db* tdbb);
@@ -154,6 +156,7 @@ namespace Jrd
 		Firebird::AutoPtr<RecordBitmap> m_bitmap;
 		Record* m_record;
 		JReplicator* m_interface;
+		ConstraintIndexMap m_constraintIndexMap;
 
 		void startTransaction(thread_db* tdbb, TraNumber traNum);
 		void prepareTransaction(thread_db* tdbb, TraNumber traNum);
@@ -190,7 +193,7 @@ namespace Jrd
 						Record* record1, Record* record2);
 		bool lookupRecord(thread_db* tdbb, jrd_rel* relation,
 						  Record* record, RecordBitmap* bitmap,
-						  index_desc& idx, const char* idxName = nullptr);
+						  index_desc& idx, const MetaName* idxName = nullptr);
 
 		const Format* findFormat(thread_db* tdbb, jrd_rel* relation, ULONG length);