# HG changeset patch # User Julien Cristau # Date 1447079347 -3600 # Node ID 1d4a94d04ec66a8122be17366eff33363ce0a87b # Parent 9dedf464596bdf3dfa154a6689b6f413a2b34653 [dataimport] remove replace_sep parameter from massive store It is unused since changeset efbbf1e93a04 "[dataimport] Properly escape strings sent to COPY FROM" diff -r 9dedf464596b -r 1d4a94d04ec6 dataimport/massive_store.py --- a/dataimport/massive_store.py Mon Nov 09 15:49:45 2015 +0100 +++ b/dataimport/massive_store.py Mon Nov 09 15:29:07 2015 +0100 @@ -83,7 +83,7 @@ """ def __init__(self, cnx, autoflush_metadata=True, - replace_sep='', commit_at_flush=True, + commit_at_flush=True, iid_maxsize=1024, uri_param_name='rdf:about', eids_seq_range=10000, eids_seq_start=None, on_commit_callback=None, on_rollback_callback=None, @@ -95,8 +95,6 @@ - autoflush_metadata: Boolean. Automatically flush the metadata after each flush() - - replace_sep: String. Replace separator used for - (COPY FROM) buffer creation. - commit_at_flush: Boolean. Commit after each flush(). - eids_seq_range: Int. Range of the eids_seq_range to be fetched each time by the store (default is 10000). @@ -113,7 +111,6 @@ self._cnx = cnx self.sql = cnx.system_sql self.iid_maxsize = iid_maxsize - self.replace_sep = replace_sep self.commit_at_flush = commit_at_flush self._data_uri_relations = defaultdict(list) self._initialized = {'init_uri_eid': set(), @@ -125,7 +122,6 @@ self.sql = self._cnx.system_sql self.logger = logging.getLogger('dataio.massiveimport') self.autoflush_metadata = autoflush_metadata - self.replace_sep = replace_sep self.slave_mode = slave_mode self.size_constraints = get_size_constraints(cnx.vreg.schema) self.default_values = get_default_values(cnx.vreg.schema) @@ -529,8 +525,7 @@ if not data: # There is no data for these etype for this flush round. continue - buf = pgstore._create_copyfrom_buffer(data, ('eid_from', 'eid_to'), - replace_sep=self.replace_sep) + buf = pgstore._create_copyfrom_buffer(data, ('eid_from', 'eid_to')) if not buf: # The buffer is empty. This is probably due to error in _create_copyfrom_buffer raise ValueError @@ -566,8 +561,7 @@ _d = _base_data.copy() _d.update(d) _data.append(_d) - buf = pgstore._create_copyfrom_buffer(_data, columns, - replace_sep=self.replace_sep) + buf = pgstore._create_copyfrom_buffer(_data, columns) if not buf: # The buffer is empty. This is probably due to error in _create_copyfrom_buffer raise ValueError('Error in buffer creation for etype %s' % etype)