@query-doctor/core 0.7.1 → 0.7.2

package/dist/index.cjs

@@ -1926,120 +1926,120 @@ var Statistics = class Statistics {
 		const processedTables = /* @__PURE__ */ new Set();
 		let columnStatsUpdatePromise;
 		const columnStatsValues = [];
-		if (this.exportedMetadata) {
-			for (const table of this.ownMetadata) {
-				if (!table.columns) continue;
-				for (const column of table.columns) {
-					const { stats } = column;
-					if (!stats) {
-						columnStatsValues.push({
-							schema_name: table.schemaName,
-							table_name: table.tableName,
-							column_name: column.columnName,
-							stainherit: false,
-							stanullfrac: .1,
-							stawidth: 20,
-							stadistinct: .1,
-							stakind1: 0,
-							stakind2: 0,
-							stakind3: 0,
-							stakind4: 0,
-							stakind5: 0,
-							stacoll1: "",
-							stacoll2: "",
-							stacoll3: "",
-							stacoll4: "",
-							stacoll5: "",
-							staop1: "",
-							staop2: "",
-							staop3: "",
-							staop4: "",
-							staop5: "",
-							stanumbers1: null,
-							stanumbers2: null,
-							stanumbers3: null,
-							stanumbers4: null,
-							stanumbers5: null,
-							stavalues1: null,
-							stavalues2: null,
-							stavalues3: null,
-							stavalues4: null,
-							stavalues5: null,
-							_value_type1: "real",
-							_value_type2: "real",
-							_value_type3: "real",
-							_value_type4: "real",
-							_value_type5: "real"
-						});
-						continue;
-					}
+		for (const table of this.ownMetadata) {
+			const target = (this.exportedMetadata?.find((m) => m.tableName === table.tableName && m.schemaName === table.schemaName))?.columns ?? table.columns;
+			if (!target) continue;
+			for (const column of target) {
+				const { stats } = column;
+				if (!stats || this.mode.kind === "fromAssumption") {
 					columnStatsValues.push({
 						schema_name: table.schemaName,
 						table_name: table.tableName,
 						column_name: column.columnName,
-						stainherit: stats.stainherit ?? false,
-						stanullfrac: stats.stanullfrac,
-						stawidth: stats.stawidth,
-						stadistinct: stats.stadistinct,
-						stakind1: stats.stakind1,
-						stakind2: stats.stakind2,
-						stakind3: stats.stakind3,
-						stakind4: stats.stakind4,
-						stakind5: stats.stakind5,
-						staop1: stats.staop1,
-						staop2: stats.staop2,
-						staop3: stats.staop3,
-						staop4: stats.staop4,
-						staop5: stats.staop5,
-						stacoll1: stats.stacoll1,
-						stacoll2: stats.stacoll2,
-						stacoll3: stats.stacoll3,
-						stacoll4: stats.stacoll4,
-						stacoll5: stats.stacoll5,
-						stanumbers1: stats.stanumbers1,
-						stanumbers2: stats.stanumbers2,
-						stanumbers3: stats.stanumbers3,
-						stanumbers4: stats.stanumbers4,
-						stanumbers5: stats.stanumbers5,
-						stavalues1: Statistics.safeStavalues(stats.stavalues1),
-						stavalues2: Statistics.safeStavalues(stats.stavalues2),
-						stavalues3: Statistics.safeStavalues(stats.stavalues3),
-						stavalues4: Statistics.safeStavalues(stats.stavalues4),
-						stavalues5: Statistics.safeStavalues(stats.stavalues5),
-						_value_type1: this.stavalueKind(Statistics.safeStavalues(stats.stavalues1)),
-						_value_type2: this.stavalueKind(Statistics.safeStavalues(stats.stavalues2)),
-						_value_type3: this.stavalueKind(Statistics.safeStavalues(stats.stavalues3)),
-						_value_type4: this.stavalueKind(Statistics.safeStavalues(stats.stavalues4)),
-						_value_type5: this.stavalueKind(Statistics.safeStavalues(stats.stavalues5))
+						stainherit: false,
+						stanullfrac: .04,
+						stawidth: stats?.stawidth ?? 32,
+						stadistinct: -.9,
+						stakind1: 0,
+						stakind2: 0,
+						stakind3: 3,
+						stakind4: 0,
+						stakind5: 0,
+						stacoll1: "0",
+						stacoll2: "0",
+						stacoll3: "0",
+						stacoll4: "0",
+						stacoll5: "0",
+						staop1: "0",
+						staop2: "0",
+						staop3: "0",
+						staop4: "0",
+						staop5: "0",
+						stanumbers1: null,
+						stanumbers2: null,
+						stanumbers3: [.9],
+						stanumbers4: null,
+						stanumbers5: null,
+						stavalues1: null,
+						stavalues2: null,
+						stavalues3: null,
+						stavalues4: null,
+						stavalues5: null,
+						_value_type1: "real",
+						_value_type2: "real",
+						_value_type3: "real",
+						_value_type4: "real",
+						_value_type5: "real"
 					});
+					continue;
 				}
+				columnStatsValues.push({
+					schema_name: table.schemaName,
+					table_name: table.tableName,
+					column_name: column.columnName,
+					stainherit: stats.stainherit ?? false,
+					stanullfrac: stats.stanullfrac,
+					stawidth: stats.stawidth,
+					stadistinct: stats.stadistinct,
+					stakind1: stats.stakind1,
+					stakind2: stats.stakind2,
+					stakind3: stats.stakind3,
+					stakind4: stats.stakind4,
+					stakind5: stats.stakind5,
+					staop1: stats.staop1,
+					staop2: stats.staop2,
+					staop3: stats.staop3,
+					staop4: stats.staop4,
+					staop5: stats.staop5,
+					stacoll1: stats.stacoll1,
+					stacoll2: stats.stacoll2,
+					stacoll3: stats.stacoll3,
+					stacoll4: stats.stacoll4,
+					stacoll5: stats.stacoll5,
+					stanumbers1: stats.stanumbers1,
+					stanumbers2: stats.stanumbers2,
+					stanumbers3: stats.stanumbers3,
+					stanumbers4: stats.stanumbers4,
+					stanumbers5: stats.stanumbers5,
+					stavalues1: Statistics.safeStavalues(stats.stavalues1),
+					stavalues2: Statistics.safeStavalues(stats.stavalues2),
+					stavalues3: Statistics.safeStavalues(stats.stavalues3),
+					stavalues4: Statistics.safeStavalues(stats.stavalues4),
+					stavalues5: Statistics.safeStavalues(stats.stavalues5),
+					_value_type1: this.stavalueKind(Statistics.safeStavalues(stats.stavalues1)),
+					_value_type2: this.stavalueKind(Statistics.safeStavalues(stats.stavalues2)),
+					_value_type3: this.stavalueKind(Statistics.safeStavalues(stats.stavalues3)),
+					_value_type4: this.stavalueKind(Statistics.safeStavalues(stats.stavalues4)),
+					_value_type5: this.stavalueKind(Statistics.safeStavalues(stats.stavalues5))
+				});
 			}
-			/**
-			* Postgres has 5 different slots for storing statistics per column and a potentially unlimited
-			* number of statistic types to choose from. Each code in `stakindN` can mean different things.
-			* Some statistics are just numerical values such as `n_distinct` and `correlation`, meaning
-			* they're only derived from `stanumbersN` and the value of `stanumbersN` is never read.
-			* Others take advantage of the `stavaluesN` columns which use `anyarray` type to store
-			* concrete values internally for things like histogram bounds.
-			* Unfortunately we cannot change anyarrays without a C extension.
-			*
-			* (1) = most common values
-			* (2) = scalar histogram
-			* (3) = correlation <- can change
-			* (4) = most common elements
-			* (5) = distinct elem count histogram <- can change
-			* (6) = length histogram (?) These don't appear in pg_stats
-			* (7) = bounds histogram (?) These don't appear in pg_stats
-			* (N) = potentially many more kinds of statistics. But postgres <=18 only uses these 7.
-			*
-			* What we're doing here is setting ANY statistic we cannot directly control
-			* (anything that relies on stavaluesN) to 0 to make sure the planner isn't influenced by what
-			* what the db collected from the test data.
-			* Because we do our tests with `generic_plan` it seems it's already unlikely that the planner will be
-			* using things like common values or histogram bounds to make the planning decisions we care about.
-			* This is a just in case.
-			*/
-			const sql = dedent.default`
+		}
+		/**
+		* Postgres has 5 different slots for storing statistics per column and a potentially unlimited
+		* number of statistic types to choose from. Each code in `stakindN` can mean different things.
+		* Some statistics are just numerical values such as `n_distinct` and `correlation`, meaning
+		* they're only derived from `stanumbersN` and the value of `stanumbersN` is never read.
+		* Others take advantage of the `stavaluesN` columns which use `anyarray` type to store
+		* concrete values internally for things like histogram bounds.
+		* Unfortunately we cannot change anyarrays without a C extension.
+		*
+		* (1) = most common values
+		* (2) = scalar histogram
+		* (3) = correlation <- can change
+		* (4) = most common elements
+		* (5) = distinct elem count histogram <- can change
+		* (6) = length histogram (?) These don't appear in pg_stats
+		* (7) = bounds histogram (?) These don't appear in pg_stats
+		* (N) = potentially many more kinds of statistics. But postgres <=18 only uses these 7.
+		*
+		* What we're doing here is setting ANY statistic we cannot directly control
+		* (anything that relies on stavaluesN) to 0 to make sure the planner isn't influenced by what
+		* what the db collected from the test data.
+		* Because we do our tests with `generic_plan` it seems it's already unlikely that the planner will be
+		* using things like common values or histogram bounds to make the planning decisions we care about.
+		* This is a just in case.
+		*/
+		const sql = dedent.default`
     WITH input AS (
       SELECT
         c.oid AS starelid,
@@ -2222,30 +2222,29 @@ var Statistics = class Statistics {
       returning starelid, staattnum, stainherit, stakind1, stakind2, stakind3, stakind4, stakind5
     )
     select * from updated union all (select * from inserted); -- @qd_introspection`;
-			columnStatsUpdatePromise = tx.exec(sql, [columnStatsValues]).catch((err) => {
-				console.error("Something wrong wrong updating column stats");
-				console.error(err);
-				throw err;
-			});
-		}
+		columnStatsUpdatePromise = tx.exec(sql, [columnStatsValues]).catch((err) => {
+			console.error("Something wrong wrong updating column stats");
+			console.error(err);
+			throw err;
+		});
 		const reltuplesValues = [];
 		for (const table of this.ownMetadata) {
-			if (!table.columns) continue;
 			processedTables.add(`${table.schemaName}.${table.tableName}`);
 			let targetTable;
 			if (this.exportedMetadata) targetTable = this.exportedMetadata.find((m) => m.tableName === table.tableName && m.schemaName === table.schemaName);
+			else targetTable = table;
 			let reltuples;
 			let relpages;
 			let relallvisible = 0;
 			let relallfrozen;
-			if (targetTable) {
+			if (this.mode.kind === "fromAssumption") {
+				reltuples = this.mode.reltuples;
+				relpages = this.mode.relpages;
+			} else if (targetTable) {
 				reltuples = targetTable.reltuples;
 				relpages = targetTable.relpages;
 				relallvisible = targetTable.relallvisible;
 				relallfrozen = targetTable.relallfrozen;
-			} else if (this.mode.kind === "fromAssumption") {
-				reltuples = this.mode.reltuples;
-				relpages = this.mode.relpages;
 			} else {
 				warnings.tablesNotInExports.push(`${table.schemaName}.${table.tableName}`);
 				reltuples = DEFAULT_RELTUPLES;
@@ -2259,7 +2258,15 @@ var Statistics = class Statistics {
 				relallfrozen,
 				relallvisible
 			});
-			if (targetTable && targetTable.indexes) for (const index of targetTable.indexes) reltuplesValues.push({
+			if (this.mode.kind === "fromAssumption") for (const index of table.indexes) reltuplesValues.push({
+				relname: index.indexName,
+				schema_name: table.schemaName,
+				reltuples: this.mode.reltuples,
+				relpages: Math.ceil(this.mode.relpages * .2),
+				relallfrozen: 0,
+				relallvisible: this.mode.relpages
+			});
+			if (targetTable) for (const index of targetTable.indexes) reltuplesValues.push({
 				relname: index.indexName,
 				schema_name: targetTable.schemaName,
 				reltuples: index.reltuples,