Fixes to filter join and gcc 7.x compilation errors

[com/gs-lite.git] / src / ftacmp / query_plan.h

diff --git a/src/ftacmp/query_plan.h b/src/ftacmp/query_plan.h
index 3c7d3f4..8ba08a4 100644 (file)
--- a/src/ftacmp/query_plan.h
+++ b/src/ftacmp/query_plan.h
@@ -1620,7 +1620,7 @@ public:
 //             Ensure that any refs to interface params have been split away.
        int count_ifp_refs(std::set<std::string> &ifpnames);
 
-
+//             CONSTRUCTOR
        filter_join_qpn(){
        };
        filter_join_qpn(query_summary_class *qs,table_list *Schema){
@@ -1638,6 +1638,10 @@ public:
                        err_str += tmpstr;
                        error_code = 1;
                }
+               if(from[0]->get_interface() != from[1]->get_interface()){
+                       err_str += "Error building filter_join_qpn node: all range variables must be sourced from the same interface or interface set ("+from[0]->get_interface()+" vs. "+from[1]->get_interface()+")\n";
+                       error_code = 1;
+               }
 
 //                             Get the select list.
                select_list = qs->fta_tree->get_sl_vec();