Skip to content

Commit 1785912

Browse files
author
Istemi Ekin Akkus
committed
fix get_privileged_data_layer_client with dropping keyspace
1 parent 87ad3d9 commit 1785912

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

FunctionWorker/python/MicroFunctionsAPI.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,12 @@ def __init__(self, uid, sid, wid, funcstatename, key, publication_utils, is_sess
8181

8282
#self._logger.debug("[MicroFunctionsAPI] init done.")
8383

84-
def get_privileged_data_layer_client(self, suid=None, keyspace=None, init_tables=False, drop_keyspace=False):
84+
def get_privileged_data_layer_client(self, suid=None, sid=None, init_tables=False, drop_keyspace=False):
8585
if self._is_privileged:
8686
if suid is not None:
8787
return DataLayerClient(locality=1, suid=suid, connect=self._datalayer, init_tables=init_tables, drop_keyspace=drop_keyspace)
88-
elif keyspace is not None:
89-
dlc = DataLayerClient(locality=1, for_mfn=True, connect=self._datalayer)
90-
dlc.keyspace = keyspace
91-
return dlc
88+
elif sid is not None:
89+
return DataLayerClient(locality=1, for_mfn=True, sid=sid, connect=self._datalayer, drop_keyspace=drop_keyspace)
9290
return None
9391

9492
def update_metadata(self, metadata_name, metadata_value, is_privileged_metadata=False):

JavaRequestHandler/src/main/java/org/microfunctions/mfnapi/MicroFunctionsAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def get_data_to_be_deleted(self, is_private=False):
214214
215215
===================
216216
217-
def get_privileged_data_layer_client(self, suid=None, keyspace=None, tablename=None, maptablename=None, settablename=None, countertablename=None, init_tables=False):
217+
def get_privileged_data_layer_client(self, suid=None, sid=None, init_tables=False, drop_keyspace=False):
218218
219219
*/
220220

ManagementService/python/deleteAccount.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def delete_single_workflow(email, wid, sapi):
4242
# 1. workflow private keyspace
4343
# 2. mfn metadata store keyspace
4444
# just drop the keyspace
45-
dlc = sapi.get_privileged_data_layer_client(keyspace="sbox_" + wid, drop_keyspace=True)
45+
dlc = sapi.get_privileged_data_layer_client(sid=wid, drop_keyspace=True)
4646
dlc.shutdown()
4747

4848
# TODO: local data layer entries for each workflow

0 commit comments

Comments
 (0)