Use inline constexpr as suggested by Adriano. Misc style changes.

Author: dyemanov

src/jrd/optimizer/Optimizer.h

@@ -46,30 +46,30 @@ namespace Jrd {
 
 // AB: 2005-11-05
 // Constants below needs some discussions and ideas
-constexpr double REDUCE_SELECTIVITY_FACTOR_EQUALITY = 0.001;
-constexpr double REDUCE_SELECTIVITY_FACTOR_BETWEEN = 0.0025;
-constexpr double REDUCE_SELECTIVITY_FACTOR_LESS = 0.05;
-constexpr double REDUCE_SELECTIVITY_FACTOR_GREATER = 0.05;
-constexpr double REDUCE_SELECTIVITY_FACTOR_STARTING = 0.01;
-constexpr double REDUCE_SELECTIVITY_FACTOR_OTHER = 0.01;
+inline constexpr double REDUCE_SELECTIVITY_FACTOR_EQUALITY = 0.001;
+inline constexpr double REDUCE_SELECTIVITY_FACTOR_BETWEEN = 0.0025;
+inline constexpr double REDUCE_SELECTIVITY_FACTOR_LESS = 0.05;
+inline constexpr double REDUCE_SELECTIVITY_FACTOR_GREATER = 0.05;
+inline constexpr double REDUCE_SELECTIVITY_FACTOR_STARTING = 0.01;
+inline constexpr double REDUCE_SELECTIVITY_FACTOR_OTHER = 0.01;
 
 // Cost of simple (CPU bound) operations is less than the page access cost
-constexpr double COST_FACTOR_MEMCOPY = 0.5;
-constexpr double COST_FACTOR_HASHING = 0.5;
-constexpr double COST_FACTOR_QUICKSORT = 0.1;
+inline constexpr double COST_FACTOR_MEMCOPY = 0.5;
+inline constexpr double COST_FACTOR_HASHING = 0.5;
+inline constexpr double COST_FACTOR_QUICKSORT = 0.1;
 
-constexpr double MAXIMUM_SELECTIVITY = 1.0;
-constexpr double DEFAULT_SELECTIVITY = 0.1;
+inline constexpr double MAXIMUM_SELECTIVITY = 1.0;
+inline constexpr double DEFAULT_SELECTIVITY = 0.1;
 
-constexpr double MINIMUM_CARDINALITY = 1.0;
-constexpr double THRESHOLD_CARDINALITY = 5.0;
-constexpr double DEFAULT_CARDINALITY = 1000.0;
+inline constexpr double MINIMUM_CARDINALITY = 1.0;
+inline constexpr double THRESHOLD_CARDINALITY = 5.0;
+inline constexpr double DEFAULT_CARDINALITY = 1000.0;
 
 // Default depth of an index tree (including one leaf page),
 // also representing the minimal cost of the index scan.
 // We assume that the root page would be always cached,
 // so it's not included here.
-const double DEFAULT_INDEX_COST = 3.0;
+inline const double DEFAULT_INDEX_COST = 3.0;
 
 
 struct index_desc;

src/jrd/optimizer/Retrieval.cpp

@@ -449,7 +449,7 @@ IndexTableScan* Retrieval::getNavigation(const InversionCandidate* candidate)
 			}
 
 			if (sortCost < navigationCost)
-				return NULL;
+				return nullptr;
 		}
 	}
 
@@ -458,13 +458,13 @@ IndexTableScan* Retrieval::getNavigation(const InversionCandidate* candidate)
 	// a navigational rsb for it.
 	scratch->index->idx_runtime_flags |= idx_navigate;
 
-	const USHORT key_length =
-		ROUNDUP(BTR_key_length(tdbb, relation, scratch->index), sizeof(SLONG));
+	const auto indexNode = makeIndexScanNode(scratch);
 
-	InversionNode* const index_node = makeIndexScanNode(scratch);
+	const USHORT keyLength =
+		ROUNDUP(BTR_key_length(tdbb, relation, scratch->index), sizeof(SLONG));
 
 	return FB_NEW_POOL(getPool())
-		IndexTableScan(csb, getAlias(), stream, relation, index_node, key_length,
+		IndexTableScan(csb, getAlias(), stream, relation, indexNode, keyLength,
 					   navigationCandidate->selectivity);
 }