Merge pull request #381 from RunestoneInteractive/dbperformance

Dbperformance

Author: bnmnetp

runestone/activecode/activecode.py

@@ -122,11 +122,22 @@ def process_activcode_nodes(app, env, docname):
 def purge_activecodes(app, env, docname):
     pass
 
+database_connection = True
+try:
+    engine = create_engine(get_dburl(locals()))
+    meta = MetaData()
+    Source_code = Table('source_code', meta, autoload=True, autoload_with=engine)
+    Div = Table('div_ids', meta, autoload=True, autoload_with=engine)    
+except:
+    print("Cannot connect")
+    database_connection = False
+
 
 class ActiveCode(RunestoneDirective):
     """
 .. activecode:: uniqueid
    :nocanvas: do not create a canvas
+   :autograde: normally set this to unittest
    :nopre: do not create an output component
    :above: put the canvas above the code
    :autorun: run this activecode as soon as the page is loaded
@@ -183,12 +194,15 @@ class ActiveCode(RunestoneDirective):
         'available_files' : directives.unchanged,
     })
 
+
+
     def run(self):
 
         addQuestionToDB(self)
 
         env = self.state.document.settings.env
-        # keep track of how many activecodes we have.... could be used to automatically make a unique id for them.
+        # keep track of how many activecodes we have....
+        # could be used to automatically make a unique id for them.
         if not hasattr(env, 'activecodecounter'):
             env.activecodecounter = 0
         env.activecodecounter += 1
@@ -305,13 +319,12 @@ def run(self):
         else:
             source = '\n'
             suffix = '\n'
-        try:
-            engine = create_engine(get_dburl(locals()))
-            meta = MetaData()
-            course_name = env.config.html_context['course_id']
-            Source_code = Table('source_code', meta, autoload=True, autoload_with=engine)
-            divid = self.options['divid']
 
+
+        course_name = env.config.html_context['course_id']
+        divid = self.options['divid']
+
+        try:
             engine.execute(Source_code.delete().where(Source_code.c.acid == divid).where(Source_code.c.course_id == course_name))
             engine.execute(Source_code.insert().values(
                 acid = divid,
@@ -325,7 +338,7 @@ def run(self):
                 ch, sub_ch = env.docname.split('/')
             except:
                 ch, sub_ch = (env.docname, 'null subchapter')
-            Div = Table('div_ids', meta, autoload=True, autoload_with=engine)
+
             engine.execute(Div.delete()\
                            .where(Div.c.course_name == course_name)\
                            .where(Div.c.chapter == ch)\

runestone/server/componentdb.py

@@ -26,6 +26,12 @@
 if all(name in os.environ for name in ['DBHOST', 'DBPASS', 'DBUSER', 'DBNAME']):
     dburl = 'postgresql://{DBUSER}:{DBPASS}@{DBHOST}/{DBNAME}'.format(**os.environ)
     engine = create_engine(dburl)
+    meta = MetaData()
+    questions = Table('questions', meta, autoload=True, autoload_with=engine)
+    assignment_types = Table('assignment_types', meta, autoload=True, autoload_with=engine)
+    assignment_questions = Table('assignment_questions', meta, autoload=True, autoload_with=engine)
+    courses = Table('courses', meta, autoload=True, autoload_with=engine)
+
 else:
     dburl = None
     engine = None
@@ -58,9 +64,6 @@ def addQuestionToDB(self):
 
         last_changed = datetime.now()
 
-        engine = create_engine(dburl)
-        meta = MetaData()
-        questions = Table('questions', meta, autoload=True, autoload_with=engine)
         if 'difficulty' in self.options:
             difficulty = self.options['difficulty']
         else:
@@ -94,8 +97,6 @@ def addQuestionToDB(self):
 
 def getQuestionID(base_course, name):
     meta = MetaData()
-    questions = Table('questions', meta, autoload=True, autoload_with=engine)
-
 
     sel = select([questions]).where(and_(questions.c.name == name,
                                           questions.c.base_course == base_course))
@@ -108,10 +109,6 @@ def getQuestionID(base_course, name):
 def getOrInsertQuestionForPage(base_course=None, name=None, is_private='F', question_type="page", autograde = "visited", author=None, difficulty=1,chapter=None):
     last_changed = datetime.now()
 
-    meta = MetaData()
-    questions = Table('questions', meta, autoload=True, autoload_with=engine)
-
-
     sel = select([questions]).where(and_(questions.c.name == name,
                                           questions.c.base_course == base_course))
     res = engine.execute(sel).first()
@@ -144,8 +141,7 @@ def getOrInsertQuestionForPage(base_course=None, name=None, is_private='F', ques
 
 def getOrCreateAssignmentType(assignment_type_name, grade_type = None, points_possible = None, assignments_count = None, assignments_dropped = None):
 
-    meta = MetaData()
-    assignment_types = Table('assignment_types', meta, autoload=True, autoload_with=engine)
+
 
     # search for it in the DB
     sel = select([assignment_types]).where(assignment_types.c.name == assignment_type_name)
@@ -164,10 +160,6 @@ def getOrCreateAssignmentType(assignment_type_name, grade_type = None, points_po
         return res.inserted_primary_key[0]
 
 def addAssignmentQuestionToDB(question_id, assignment_id, points, assessment_type = None, timed=None, autograde=None):
-    meta = MetaData()
-    questions = Table('questions', meta, autoload=True, autoload_with=engine)
-    assignment_questions = Table('assignment_questions', meta, autoload=True, autoload_with=engine)
-
     # now insert or update the assignment_questions row
     sel = select([assignment_questions]).where(and_(assignment_questions.c.assignment_id == assignment_id,
                                           assignment_questions.c.question_id == question_id))
@@ -196,21 +188,13 @@ def addAssignmentQuestionToDB(question_id, assignment_id, points, assessment_typ
         engine.execute(ins)
 
 def getCourseID(coursename):
-    meta = MetaData()
-    courses = Table('courses', meta, autoload=True, autoload_with=engine)
-
     sel = select([courses]).where(courses.c.course_name == coursename)
     res = engine.execute(sel).first()
     return res['id']
 
 def addAssignmentToDB(name = None, course_id = None, assignment_type_id = None, deadline = None, points = None, threshold = None):
 
     last_changed = datetime.now()
-
-    meta = MetaData()
-    assignments = Table('assignments', meta, autoload=True, autoload_with=engine)
-    assignment_questions = Table('assignment_questions', meta, autoload=True, autoload_with=engine)
-
     sel = select([assignments]).where(and_(assignments.c.name == name,
                                           assignments.c.course == course_id))
     res = engine.execute(sel).first()
@@ -249,9 +233,6 @@ def addHTMLToDB(divid, basecourse, htmlsrc):
 
     if dburl:
         last_changed = datetime.now()
-        engine = create_engine(dburl)
-        meta = MetaData()
-        questions = Table('questions', meta, autoload=True, autoload_with=engine)
         sel = select([questions]).where(and_(questions.c.name == divid,
                                               questions.c.base_course == basecourse))
         res = engine.execute(sel).first()
@@ -266,8 +247,6 @@ def addHTMLToDB(divid, basecourse, htmlsrc):
             print("Error while trying to add directive {} to the DB".format(divid))
 
 def get_HTML_from_DB(divid, basecourse):
-    meta = MetaData()
-    questions = Table('questions', meta, autoload=True, autoload_with=engine)
     sel = select([questions]).where(and_(questions.c.name == divid,
                                           questions.c.base_course == basecourse))
     res = engine.execute(sel).first()