fix priority/weight calculation for QD static sorting. refs yeti-swit…

…ch#1166
dmitry-sinina · Aug 29, 2022 · da79b2e · da79b2e
1 parent be788a8
commit da79b2e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/db/migrate/20220829195515_src_number_validation.rb b/db/migrate/20220829195515_src_number_validation.rb
@@ -1169,8 +1169,8 @@ def up
                   t_dp.locked as dp_locked,
                   t_dp.enabled as dp_enabled,
                   t_dp.force_hit_rate as dp_force_hit_rate,
-                  rpsr.priority as rpsr_priority,
-                  rpsr.weight as rpsr_weight
+                  COALESCE(rpsr.priority, t_dp.priority) as rpsr_priority,
+                  COALESCE(rpsr.weight, 100) as rpsr_weight
                 FROM class4.dialpeers t_dp
                   JOIN billing.accounts t_vendor_account ON t_dp.account_id=t_vendor_account.id
                   join public.contractors t_vendor on t_dp.vendor_id=t_vendor.id

diff --git a/db/structure.sql b/db/structure.sql
@@ -18868,8 +18868,8 @@ CREATE FUNCTION switch20.route(i_node_id integer, i_pop_id integer, i_protocol_i
                   t_dp.locked as dp_locked,
                   t_dp.enabled as dp_enabled,
                   t_dp.force_hit_rate as dp_force_hit_rate,
-                  rpsr.priority as rpsr_priority,
-                  rpsr.weight as rpsr_weight
+                  COALESCE(rpsr.priority, t_dp.priority) as rpsr_priority,
+                  COALESCE(rpsr.weight, 100) as rpsr_weight
                 FROM class4.dialpeers t_dp
                   JOIN billing.accounts t_vendor_account ON t_dp.account_id=t_vendor_account.id
                   join public.contractors t_vendor on t_dp.vendor_id=t_vendor.id
@@ -20126,8 +20126,8 @@ CREATE FUNCTION switch20.route_debug(i_node_id integer, i_pop_id integer, i_prot
                   t_dp.locked as dp_locked,
                   t_dp.enabled as dp_enabled,
                   t_dp.force_hit_rate as dp_force_hit_rate,
-                  rpsr.priority as rpsr_priority,
-                  rpsr.weight as rpsr_weight
+                  COALESCE(rpsr.priority, t_dp.priority) as rpsr_priority,
+                  COALESCE(rpsr.weight, 100) as rpsr_weight
                 FROM class4.dialpeers t_dp
                   JOIN billing.accounts t_vendor_account ON t_dp.account_id=t_vendor_account.id
                   join public.contractors t_vendor on t_dp.vendor_id=t_vendor.id
@@ -21257,8 +21257,8 @@ CREATE FUNCTION switch20.route_release(i_node_id integer, i_pop_id integer, i_pr
                   t_dp.locked as dp_locked,
                   t_dp.enabled as dp_enabled,
                   t_dp.force_hit_rate as dp_force_hit_rate,
-                  rpsr.priority as rpsr_priority,
-                  rpsr.weight as rpsr_weight
+                  COALESCE(rpsr.priority, t_dp.priority) as rpsr_priority,
+                  COALESCE(rpsr.weight, 100) as rpsr_weight
                 FROM class4.dialpeers t_dp
                   JOIN billing.accounts t_vendor_account ON t_dp.account_id=t_vendor_account.id
                   join public.contractors t_vendor on t_dp.vendor_id=t_vendor.id