Resolve conficts

Author: KSDaemon

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/dimension_symbol.rs

@@ -242,8 +242,8 @@ impl DimensionSymbol {
                 false
             }
         }) {
-            if let Some(pk) = &self.time_shift_pk {
-                return Some((pk.full_name(), ts.clone()));
+            if let Some(pk) = &self.time_shift_pk_full_name() {
+                return Some((pk.clone(), ts.clone()));
             }
         }
         None

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/symbols/measure_symbol.rs

@@ -574,12 +574,7 @@ impl SymbolFactory for MeasureSymbolFactory {
                 let interval = match &shift_ref.interval {
                     Some(raw) => {
                         let mut iv = raw.parse::<SqlInterval>()?;
-                        if shift_ref
-                            .shift_type
-                            .as_deref()
-                            .unwrap_or("prior")
-                            == "next"
-                        {
+                        if shift_ref.shift_type.as_deref().unwrap_or("prior") == "next" {
                             iv = -iv;
                         }