Fix #8290: 'Unique scan' is incorrectly reported in the explained pla…

…n for unique index and IS NULL predicate
FirebirdSQL · Oct 24, 2024 · a1167b4 · a1167b4
1 parent 7886c9c
commit a1167b4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/jrd/recsrc/RecordSource.cpp b/src/jrd/recsrc/RecordSource.cpp
@@ -203,6 +203,7 @@ void RecordSource::printInversion(thread_db* tdbb, const InversionNode* inversio
 				}
 
 				const index_desc& idx = retrieval->irb_desc;
+				const bool primaryIdx = (idx.idx_flags & idx_primary);
 				const bool uniqueIdx = (idx.idx_flags & idx_unique);
 				const USHORT segCount = idx.idx_count;
 
@@ -214,7 +215,13 @@ void RecordSource::printInversion(thread_db* tdbb, const InversionNode* inversio
 
 				const bool fullscan = (maxSegs == 0);
 				const bool list = (retrieval->irb_list != nullptr);
-				const bool unique = !list && uniqueIdx && equality && (minSegs == segCount);
+
+				bool unique = false;
+				if (!list && equality && minSegs == segCount)
+				{
+					unique = (retrieval->irb_generic & irb_ignore_null_value_key) ?
+						uniqueIdx : primaryIdx;
+				}
 
 				string bounds;
 				if (!unique && !fullscan)