Optimize to use meta tables

Signed-off-by: Zhaoyuan (Ryan) Fu <fuzhaoyuan@gmail.com>

Author: fuzhaoyuan

src/main/resources/mappers/clickhouse/studyview/ClickhouseStudyViewFilterMapper.xml

@@ -435,12 +435,13 @@
         (
         WITH <include refid="org.cbioportal.infrastructure.repository.clickhouse.studyview.ClickhouseStudyViewFilterMapper.studyAttributeFilterCTEs"/>,
         study_attribute_levels AS (
-            SELECT DISTINCT cancer_study_identifier
-            FROM clinical_data_derived
-            WHERE attribute_name = #{clinicalDataFilter.attributeId}
-                AND type='${type}'
+            SELECT DISTINCT cs.cancer_study_identifier as cancer_study_identifier
+            FROM clinical_attribute_meta cam
+            INNER JOIN cancer_study cs ON cam.cancer_study_id = cs.cancer_study_id
+            WHERE cam.attr_id = #{clinicalDataFilter.attributeId}
+                AND cam.patient_attribute = IF('${type}' = 'patient', 1, 0)
                 <if test="studyViewFilterContext.customDataFilterCancerStudies != null and !studyViewFilterContext.customDataFilterCancerStudies.isEmpty()">
-                    AND cancer_study_identifier IN
+                    AND cs.cancer_study_identifier IN
                     <foreach item="studyId" collection="studyViewFilterContext.customDataFilterCancerStudies" open="(" separator="," close=")">
                         #{studyId}
                     </foreach>
@@ -512,22 +513,23 @@
 
     <sql id="studyAttributeFilterCTEs">
         study_with_attribute AS (
-            SELECT DISTINCT cancer_study_identifier
-            FROM clinical_data_derived
-            WHERE attribute_name = #{clinicalDataFilter.attributeId}
+            SELECT DISTINCT cs.cancer_study_identifier as cancer_study_identifier
+            FROM clinical_attribute_meta cam
+            INNER JOIN cancer_study cs ON cam.cancer_study_id = cs.cancer_study_id
+            WHERE cam.attr_id = #{clinicalDataFilter.attributeId}
                 <if test="studyViewFilterContext.customDataFilterCancerStudies != null and !studyViewFilterContext.customDataFilterCancerStudies.isEmpty()">
-                    AND cancer_study_identifier IN
+                    AND cs.cancer_study_identifier IN
                     <foreach item="studyId" collection="studyViewFilterContext.customDataFilterCancerStudies" open="(" separator="," close=")">
                         #{studyId}
                     </foreach>
                 </if>
         ),
         study_without_attribute AS (
-            SELECT DISTINCT cancer_study_identifier
-            FROM sample_derived
-            WHERE cancer_study_identifier NOT IN (SELECT cancer_study_identifier FROM study_with_attribute)
+            SELECT DISTINCT cs.cancer_study_identifier as cancer_study_identifier
+            FROM cancer_study cs
+            WHERE cs.cancer_study_identifier NOT IN (SELECT cancer_study_identifier FROM study_with_attribute)
                 <if test="studyViewFilterContext.customDataFilterCancerStudies != null and !studyViewFilterContext.customDataFilterCancerStudies.isEmpty()">
-                    AND cancer_study_identifier IN
+                    AND cs.cancer_study_identifier IN
                     <foreach item="studyId" collection="studyViewFilterContext.customDataFilterCancerStudies" open="(" separator="," close=")">
                         #{studyId}
                     </foreach>
@@ -553,12 +555,13 @@
         (
         WITH <include refid="org.cbioportal.infrastructure.repository.clickhouse.studyview.ClickhouseStudyViewFilterMapper.studyAttributeFilterCTEs"/>,
         study_attribute_levels AS (
-            SELECT DISTINCT cancer_study_identifier
-            FROM clinical_data_derived
-            WHERE attribute_name = #{clinicalDataFilter.attributeId}
-                AND type='${type}'
+            SELECT DISTINCT cs.cancer_study_identifier as cancer_study_identifier
+            FROM clinical_attribute_meta cam
+            INNER JOIN cancer_study cs ON cam.cancer_study_id = cs.cancer_study_id
+            WHERE cam.attr_id = #{clinicalDataFilter.attributeId}
+                AND cam.patient_attribute = IF('${type}' = 'patient', 1, 0)
                 <if test="studyViewFilterContext.customDataFilterCancerStudies != null and !studyViewFilterContext.customDataFilterCancerStudies.isEmpty()">
-                    AND cancer_study_identifier IN
+                    AND cs.cancer_study_identifier IN
                     <foreach item="studyId" collection="studyViewFilterContext.customDataFilterCancerStudies" open="(" separator="," close=")">
                         #{studyId}
                     </foreach>