Merge pull request #761 from ganisimov/analysis_1815

Move repeated subquery to temp table in analysis 1815
OHDSI · May 20, 2024 · de6aa90 · de6aa90
2 parents 56cebe5 + 246ce53
commit de6aa90
Showing 1 changed file with 105 additions and 73 deletions.
diff --git a/inst/sql/sql_server/analyses/1815.sql b/inst/sql/sql_server/analyses/1815.sql
@@ -1,106 +1,138 @@
 -- 1815  Distribution of numeric values, by measurement_concept_id and unit_concept_id
 
+--HINT DISTRIBUTE_ON_KEY(subject_id)
+SELECT
+	m.measurement_concept_id AS subject_id,
+	m.unit_concept_id,
+	CAST(m.value_as_number AS FLOAT) AS count_value
+INTO
+	#measurementView_1815
+FROM
+	@cdmDatabaseSchema.measurement m
+JOIN
+	@cdmDatabaseSchema.observation_period op ON
+		m.person_id = op.person_id
+		AND
+		m.measurement_date >= op.observation_period_start_date
+		AND
+		m.measurement_date <= op.observation_period_end_date
+WHERE
+	m.value_as_number IS NOT NULL
+;
+
 --HINT DISTRIBUTE_ON_KEY(stratum1_id)
-SELECT 
+SELECT
 	m.subject_id AS stratum1_id,
 	m.unit_concept_id AS stratum2_id,
 	m.count_value,
 	COUNT_BIG(*) AS total,
 	ROW_NUMBER() OVER (PARTITION BY m.subject_id,m.unit_concept_id ORDER BY m.count_value) AS rn
-INTO 
+INTO
 	#statsView_1815
-FROM (
-	SELECT 
-		m.measurement_concept_id AS subject_id,
-		m.unit_concept_id,
-		CAST(m.value_as_number AS FLOAT) AS count_value
-	FROM 
-		@cdmDatabaseSchema.measurement m
-	JOIN 
-		@cdmDatabaseSchema.observation_period op 
-	ON 
-		m.person_id = op.person_id
-	AND 
-		m.measurement_date >= op.observation_period_start_date
-	AND 
-		m.measurement_date <= op.observation_period_end_date		
-	WHERE 
-		m.value_as_number IS NOT NULL
-	) m
-GROUP BY 
-	m.subject_id, 
-	m.unit_concept_id, 
+FROM
+	#measurementView_1815 m
+GROUP BY
+	m.subject_id,
+	m.unit_concept_id,
 	m.count_value
 ;
 
 --HINT DISTRIBUTE_ON_KEY(stratum1_id)
-select 1815 as analysis_id,
-  CAST(o.stratum1_id AS VARCHAR(255)) AS stratum1_id,
-  CAST(o.stratum2_id AS VARCHAR(255)) AS stratum2_id,
-  o.total as count_value,
-  o.min_value,
-	o.max_value,
-	o.avg_value,
-	o.stdev_value,
-	MIN(case when p.accumulated >= .50 * o.total then count_value else o.max_value end) as median_value,
-	MIN(case when p.accumulated >= .10 * o.total then count_value else o.max_value end) as p10_value,
-	MIN(case when p.accumulated >= .25 * o.total then count_value else o.max_value end) as p25_value,
-	MIN(case when p.accumulated >= .75 * o.total then count_value else o.max_value end) as p75_value,
-	MIN(case when p.accumulated >= .90 * o.total then count_value else o.max_value end) as p90_value
-into #tempResults_1815
-from 
-(
-  select s.stratum1_id, s.stratum2_id, s.count_value, s.total, sum(p.total) as accumulated
-  from #statsView_1815 s
-  join #statsView_1815 p on s.stratum1_id = p.stratum1_id and s.stratum2_id = p.stratum2_id and p.rn <= s.rn
-  group by s.stratum1_id, s.stratum2_id, s.count_value, s.total, s.rn
-) p
-join 
-(
-	SELECT 
+with
+view_cte as (
+	select
+		s.stratum1_id,
+		s.stratum2_id,
+		s.count_value,
+		s.total,
+		sum(p.total) as accumulated
+	from
+		#statsView_1815 s
+		join
+		#statsView_1815 p on
+			s.stratum1_id = p.stratum1_id
+			and
+			s.stratum2_id = p.stratum2_id
+			and
+			p.rn <= s.rn
+	group by
+		s.stratum1_id,
+		s.stratum2_id,
+		s.count_value,
+		s.total,
+		s.rn
+),
+measurement_cte as (
+	SELECT
+		m.subject_id,
+		m.unit_concept_id,
+		m.count_value
+	FROM
+		#measurementView_1815 m
+	WHERE
+		m.unit_concept_id IS NOT NULL
+		-- AND
+		-- m.value_as_number IS NOT NULL
+),
+measurement_agg_cte as (
+	SELECT
 		m.subject_id AS stratum1_id,
 		m.unit_concept_id AS stratum2_id,
 		CAST(AVG(1.0 * m.count_value) AS FLOAT) AS avg_value,
 		CAST(stdev(m.count_value) AS FLOAT) AS stdev_value,
 		MIN(m.count_value) AS min_value,
 		MAX(m.count_value) AS max_value,
 		COUNT_BIG(*) AS total
-	FROM 
-	(
-		SELECT 
-			m.measurement_concept_id AS subject_id,
-			m.unit_concept_id,
-			CAST(m.value_as_number AS FLOAT) AS count_value
-		FROM 
-			@cdmDatabaseSchema.measurement m
-		JOIN 
-			@cdmDatabaseSchema.observation_period op 
-		ON 
-			m.person_id = op.person_id
-		AND 
-			m.measurement_date >= op.observation_period_start_date
-		AND 
-			m.measurement_date <= op.observation_period_end_date				
-		WHERE 
-			m.unit_concept_id IS NOT NULL
-		AND 
-			m.value_as_number IS NOT NULL
-	) m
-	GROUP BY 
-		m.subject_id, 
+	FROM
+		measurement_cte m
+	GROUP BY
+		m.subject_id,
 		m.unit_concept_id
-) o on p.stratum1_id = o.stratum1_id and p.stratum2_id = o.stratum2_id 
-GROUP BY o.stratum1_id, o.stratum2_id, o.total, o.min_value, o.max_value, o.avg_value, o.stdev_value
+)
+select
+	1815 as analysis_id,
+	CAST(o.stratum1_id AS VARCHAR(255)) AS stratum1_id,
+	CAST(o.stratum2_id AS VARCHAR(255)) AS stratum2_id,
+	o.total as count_value,
+	o.min_value,
+	o.max_value,
+	o.avg_value,
+	o.stdev_value,
+	MIN(case when p.accumulated >= .50 * o.total then count_value else o.max_value end) as median_value,
+	MIN(case when p.accumulated >= .10 * o.total then count_value else o.max_value end) as p10_value,
+	MIN(case when p.accumulated >= .25 * o.total then count_value else o.max_value end) as p25_value,
+	MIN(case when p.accumulated >= .75 * o.total then count_value else o.max_value end) as p75_value,
+	MIN(case when p.accumulated >= .90 * o.total then count_value else o.max_value end) as p90_value
+into
+	#tempResults_1815
+from
+	view_cte p
+	join
+	measurement_agg_cte o on
+		p.stratum1_id = o.stratum1_id
+		and
+		p.stratum2_id = o.stratum2_id
+GROUP BY
+	o.stratum1_id,
+	o.stratum2_id,
+	o.total,
+	o.min_value,
+	o.max_value,
+	o.avg_value,
+	o.stdev_value
 ;
 
 --HINT DISTRIBUTE_ON_KEY(stratum_1)
-select analysis_id, stratum1_id as stratum_1, stratum2_id as stratum_2, 
+select analysis_id, stratum1_id as stratum_1, stratum2_id as stratum_2,
 cast(null as varchar(255)) as stratum_3, cast(null as varchar(255)) as stratum_4, cast(null as varchar(255)) as stratum_5,
 count_value, min_value, max_value, avg_value, stdev_value, median_value, p10_value, p25_value, p75_value, p90_value
 into @scratchDatabaseSchema@schemaDelim@tempAchillesPrefix_dist_1815
 from #tempResults_1815
 ;
 
+truncate table #measurementView_1815;
+drop table #measurementView_1815;
+
 truncate table #statsView_1815;
 drop table #statsView_1815;