Reworked skipping unused & dropped entries when initializing indices for temp table in temp pagespace

Author: AlexPeshkoff

src/jrd/Relation.cpp

@@ -376,17 +376,15 @@ RelationPages* RelationPermanent::getPagesInternal(thread_db* tdbb, TraNumber tr
 			QualifiedName idx_name;
 			auto* idp = this->lookupIndex(tdbb, idx.idx_id, CacheFlag::AUTOCREATE);
 			if (idp)
-			{
 				idx_name = idp->getName();
 
-				switch (idp->getState())
-				{
-				case Ods::irt_drop:
-				case Ods::irt_unused:
-					continue;
-				default:
-					break;
-				}
+			switch (idx.idx_state)
+			{
+			case Ods::irt_drop:
+			case Ods::irt_unused:
+				continue;
+			default:
+				break;
 			}
 
 			idx.idx_root = 0;

src/jrd/Relation.h

@@ -496,7 +496,7 @@ class IndexPermanent : public Firebird::PermanentStorage
 	RelationPermanent*	idp_relation;
 	MetaId				idp_id;
 	TraNumber			idp_tranum = 0;
-	UCHAR				idp_state = 0;
+	UCHAR				idp_state = 0;		// Makes sense only for expression/conditional indices
 	UCHAR				idp_formatNumber = 0;
 
 	[[noreturn]] void errIndexGone();

src/jrd/btr.cpp

@@ -1392,6 +1392,7 @@ bool BTR_description(thread_db* tdbb, Cached::Relation* relation, const index_ro
 	idx->idx_condition_node = nullptr;
 	idx->idx_condition_statement = nullptr;
 	idx->idx_fraction = 1.0;
+	idx->idx_state = irt_desc->getState();
 
 	// pick up field ids and type descriptions for each of the fields
 	const UCHAR* ptr = (UCHAR*) root + irt_desc->irt_desc;

src/jrd/btr.h

@@ -100,7 +100,8 @@ struct index_desc
 	Statement* idx_expression_statement;	// stored statement for expression evaluation
 	BoolExprNode* idx_condition_node;		// node tree for index condition
 	Statement* idx_condition_statement;		// stored statement for index condition
-	float idx_fraction;						// fraction of keys included in the index
+	float	idx_fraction;					// fraction of keys included in the index
+	UCHAR	idx_state;						// state from irt_rpt
 	// This structure should exactly match IRTD structure for current ODS
 	struct idx_repeat
 	{