Updates to examples queries. Improve real-timeness of lfta aggregation

[com/gs-lite.git] / src / ftacmp / analyze_fta.cc

diff --git a/src/ftacmp/analyze_fta.cc b/src/ftacmp/analyze_fta.cc
index d793577..b4a091c 100644 (file)
--- a/src/ftacmp/analyze_fta.cc
+++ b/src/ftacmp/analyze_fta.cc
@@ -4291,6 +4291,7 @@ query_summary_class *analyze_fta(table_exp_t *fta_tree, table_list *schema,
                        int tblvar=infer_tablevar_from_colref(qs->mvars[cv],fta_tree->fm,schema);
                        if(tblvar<0){
                                fprintf(stderr,"ERROR, Merge column %d (%s) was not found in any of the tables.\n",cv,qs->mvars[cv]->to_string().c_str());
+                               exit(1);
                        }
                        refd_sources.insert(tblvar);
                        tmp_crl[tblvar] = qs->mvars[cv];
@@ -5252,7 +5253,7 @@ void gather_pr_opcmp_fcns(predicate_t *pr, set<string> &fcn_set){
        case PRED_IN:
                ldt = pr->get_left_se()->get_data_type();
                if(ldt->complex_comparison(ldt) ){
-                       fcn_set.insert( ldt->get_comparison_fcn(ldt) );
+                       fcn_set.insert( ldt->get_equals_fcn(ldt) );
                }
                gather_se_opcmp_fcns(pr->get_left_se(), fcn_set);
                return;
@@ -5260,7 +5261,7 @@ void gather_pr_opcmp_fcns(predicate_t *pr, set<string> &fcn_set){
                ldt = pr->get_left_se()->get_data_type();
                rdt = pr->get_right_se()->get_data_type();
                if(ldt->complex_comparison(rdt) ){
-                       fcn_set.insert( ldt->get_comparison_fcn(rdt) );
+                       fcn_set.insert( ldt->get_comparison_fcn(ldt) );
                }
                gather_se_opcmp_fcns(pr->get_left_se(),fcn_set) ;
                gather_se_opcmp_fcns(pr->get_right_se(),fcn_set) ;