diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-03-23 16:53:23 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-04-01 22:20:31 +0300 |
| commit | b150ca62bda0d453cb967e7b9027ed36f538f9ea (patch) | |
| tree | 809d72e98bc8f0b8541ae0a6d1bacd3bc99d7b73 /src/server | |
| parent | 84802e38300b2df48e8e0290b58e558c0cca1c02 (diff) | |
DB_Driver, DB_Op: statement -> query rename
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/db_controller.py | 2 | ||||
| -rw-r--r-- | src/server/db_driver.py | 14 | ||||
| -rw-r--r-- | src/server/db_op.py | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/server/db_controller.py b/src/server/db_controller.py index d94c456b..857ae7c1 100644 --- a/src/server/db_controller.py +++ b/src/server/db_controller.py @@ -37,7 +37,7 @@ class DB_Controller: try: # non-composed DB op self.db_driver.begin_tx(op) - self.db_driver.exec_statement_set(op) + self.db_driver.exec_query_set(op) self.db_driver.commit_tx(op) op_ret = op.process_result_set() diff --git a/src/server/db_driver.py b/src/server/db_driver.py index 75a5cb19..8cdd35f7 100644 --- a/src/server/db_driver.py +++ b/src/server/db_driver.py @@ -27,7 +27,7 @@ class DB_Driver_Embedded(DB_Driver_Base): def begin_tx(self, op): pass - def exec_statement_set(self, op): + def exec_query_set(self, op): pass def commit_tx(self, op): @@ -44,7 +44,7 @@ class DB_Driver_REST(DB_Driver_Base): # # [!] neo4j seems picky about receiving an additional empty statement list # - data = db_util.statement_set_to_REST_form([]) # open TX with empty statement_set + data = db_util.db_query_set_to_REST_form([]) # open TX with empty query_set ret = db_util.post_neo4j(tx_open_url, data) tx_commit_url = ret['commit'] op.parse_tx_id(tx_commit_url) @@ -53,19 +53,19 @@ class DB_Driver_REST(DB_Driver_Base): except Exception as e: raise Exception('failed to open transaction: ' + e.message) - def exec_statement_set(self, op): + def exec_query_set(self, op): tx_url = "{0}/{1}".format(self.tx_base_url, op.tx_id) - statement_set = db_util.statement_set_to_REST_form(op.statement_set) + q_set = db_util.db_query_set_to_REST_form(op.query_set) try: - post_ret = db_util.post_neo4j(tx_url, statement_set) + post_ret = db_util.post_neo4j(tx_url, q_set) op.result_set = post_ret['results'] op.error_set = post_ret['errors'] if 0 != len(op.error_set): raise Neo4JException(op.error_set) - self.log_committed_queries(statement_set) + self.log_committed_queries(q_set) except Neo4JException as e: # NOTE: python 2.7 loses the stack when reraising the exception. # python 3 does the right thing, but gevent doesn't support it yet. @@ -84,7 +84,7 @@ class DB_Driver_REST(DB_Driver_Base): # # [!] neo4j seems picky about receiving an additional empty statement list # - data = db_util.statement_set_to_REST_form([]) # close TX with empty statement_set + data = db_util.db_query_set_to_REST_form([]) # close TX with empty query_set ret = db_util.post(tx_commit_url, data) log.debug('tx-commit: id: {0}, commit-url: {1}'.format(op.tx_id, tx_commit_url)) diff --git a/src/server/db_op.py b/src/server/db_op.py index c756097b..43edd741 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -681,7 +681,8 @@ class DBO_rz_clone(DB_op): 'optional match (n)-[r]->(m)', 'return n,labels(n),collect([m.id, r, type(r)])'] - self.add_statement(q_arr) + db_q = DB_Query(q_arr) + self.add_db_query(db_q) def process_result_set(self): ret_n_set = [] |