Changeset 203


Ignore:
Timestamp:
Sep 7, 2009, 4:44:23 PM (11 years ago)
Author:
marchulsman
Message:

Solve copy bugs in join code and set code

Location:
container
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • container/container.py

    r202 r203  
    270270        if(not nprops):        nprops = None
    271271        else:                  nprops = tuple(nprops)
    272         return (nprops,nactives,nfieldids)
     272        return (nprops,nactives)
    273273   
    274274    def _activateProps(self,props,actives,new_active_fieldids=False):
  • container/engine.py

    r197 r203  
    2020#prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
    2121prepare_query_pm.register(qg_transform.ConsolidationPass)
    22 #prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
     22prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
    2323prepare_query_pm.register(qg_transform.PeepHoleOptimizerPass)
    24 #prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
     24prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
    2525prepare_query_pm.register(qg_translate.ExecutionPlannerPass)
    2626#prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
    2727prepare_query_pm.register(qg_transform.UsedFieldInferencePass)
    28 #prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
     28prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
    2929
    3030prepare_query_pm.register(qg_transform.CalcFieldTransformPass)
    31 #prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
     31prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
    3232prepare_query_pm.register(qg_translate.SQLPass)
    33 #prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
     33prepare_query_pm.register(qgraph_py.DrawNodeTreeVisitor)
    3434execute_query_pm = PassManager()
    3535execute_query_pm.register(qg_translate.PyExecutePass)
  • container/opcon.py

    r202 r203  
    7171
    7272            #determining if extra field-combinations can be added
    73             if(not lprops is None or rprops is None):
     73            if(not lprops is None and not rprops is None):
    7474                rpropidx = dict([(prop.id,(prop,active)) for prop,active in zip(rprops,ractive)])
    7575                for lp,la in zip(lprops,lactive):
     
    8181
    8282                       
    83             lfields = [None] * len(nfieldids)
    84             rfields = [None] * len(nfieldids)
     83            lfields = [None] * len(fieldcomb_pos_dict)
     84            rfields = [None] * len(fieldcomb_pos_dict)
    8585            leftpos =left._fieldpos
    8686            rightpos = right._fieldpos
  • container/postgres.py

    r199 r203  
    122122
    123123       t1 = time.time()
    124      
     124
     125       print "XXXX:",query
    125126       if(args != None and len(args) > 0):
    126127           psycopg2.extensions.cursor.execute(self, query, args)
  • container/qg_translate.py

    r198 r203  
    822822            r = r.copy()
    823823            r.realias(ia)
     824        l = l.copy()
    824825        l.fields = numpy.hstack((l.fields,r.fields))
    825826        l.fieldtypes = numpy.hstack((l.fieldtypes,r.fieldtypes))
Note: See TracChangeset for help on using the changeset viewer.