0001-wcs_api-use-WcsApi.batch_size-for-FormDatas-batch-si.patch

Benjamin Dauvergne, 09 juillet 2020 14:27

Voir les différences: en ligne côte à côte

Subject: [PATCH] wcs_api: use WcsApi.batch_size for FormDatas batch size
 (#44970)

 tests/test_wcs.py   | 19 ++++++++++++++++++-
 wcs_olap/wcs_api.py | 12 ++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

     import pytest
     import pathlib
     import unittest.mock as mock
     import requests
     import httmock
-...
                 c.execute('CREATE TABLE olap_temp.coin()')
                 c.execute('COMMIT')
         olap_cmd()
         class MockSession(requests.Session):
             mocks = []
             def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
                 self.get = mock.MagicMock(wraps=self.get)
                 self.mocks.append(self.get)
         with mock.patch('requests.Session', MockSession):
             olap_cmd()
         call_args_list = MockSession.mocks[-1].call_args_list
         url_with_limits = [call_args[0][0] for call_args in MockSession.mocks[-1].call_args_list
                            if 'limit' in call_args[0][0]]
         assert url_with_limits, call_args_list
         for url_with_limit in url_with_limits:
             assert 'limit=500&' in url_with_limit
         expected_schema = [
             ('agent', 'id'),

     class FormDatas(object):
         def __init__(self, wcs_api, formdef, full=False, anonymize=False, batch=1000):
         def __init__(self, wcs_api, formdef, full=False, anonymize=False):
             self.wcs_api = wcs_api
             self.formdef = formdef
             self._full = full
             self.anonymize = anonymize
             self.batch = batch
             self.batch_size = wcs_api.batch_size
         def __getitem__(self, slice_or_id):
             # get batch of forms
-...
         def batched(self, batch):
             forms = copy.copy(self)
             forms.batch = batch
             forms.batch_size = batch
             return forms
         def __iter__(self):
             start = 0
             while True:
                 empty = True
                 for formdef in self[start:start + self.batch]:
                 for formdef in self[start:start + self.batch_size]:
                     empty = False
                     yield formdef
                 if empty:
                     break
                 start += self.batch
                 start += self.batch_size
         def __len__(self):
             return len(list((o for o in self)))
-...
         def __init__(self, url, email=None, name_id=None, batch_size=1000,
                      session=None, logger=None, orig=None, key=None, verify=True):
             self.url = url
             self.batch_size = batch_size
             self.email = email
             self.name_id = name_id
             self.requests = session or requests.Session()
-...
             self.orig = orig
             self.key = key
             self.verify = verify
             self.batch_size = batch_size
         def _build_url(self, url_parts):
             url = self.url
+    -

Projet

Général

Profil

Produits Entr'ouvert » OLAP / Business Intelligence pour Publik

0001-wcs_api-use-WcsApi.batch_size-for-FormDatas-batch-si.patch