[MediaWiki-commits] [Gerrit] dumps; fix another indentation screwup from the pylint - change (operations/dumps)
ArielGlenn has submitted this change and it was merged. Change subject: dumps; fix another indentation screwup from the pylint .. dumps; fix another indentation screwup from the pylint didn't break things but did make some commands needlessly long text Change-Id: I2939e1edaad924724b5a61302b91a591b2665887 --- M xmldumps-backup/dumps/jobs.py 1 file changed, 51 insertions(+), 51 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/xmldumps-backup/dumps/jobs.py b/xmldumps-backup/dumps/jobs.py index 7989093..b7d656a 100644 --- a/xmldumps-backup/dumps/jobs.py +++ b/xmldumps-backup/dumps/jobs.py @@ -1274,59 +1274,59 @@ file_obj, self.verbose) file_obj.first_page_id = fname.find_first_page_id_in_file() -# get the files that cover our range -for file_obj in file_list: -# If some of the file_objs in file_list could not be properly be parsed, some of -# the (int) conversions below will fail. However, it is of little use to us, -# which conversion failed. /If any/ conversion fails, it means, that that we do -# not understand how to make sense of the current file_obj. Hence we cannot use -# it as prefetch object and we have to drop it, to avoid passing a useless file -# to the text pass. (This could days as of a comment below, but by not passing -# a likely useless file, we have to fetch more texts from the database) -# -# Therefore try...except-ing the whole block is sufficient: If whatever error -# occurs, we do not abort, but skip the file for prefetch. -try: -# If we could properly parse -first_page_id_in_file = int(file_obj.first_page_id) +# get the files that cover our range +for file_obj in file_list: +# If some of the file_objs in file_list could not be properly be parsed, some of +# the (int) conversions below will fail. However, it is of little use to us, +# which conversion failed. /If any/ conversion fails, it means, that that we do +# not understand how to make sense of the current file_obj. Hence we cannot use +# it as prefetch object and we have to drop it, to avoid passing a useless file +# to the text pass. (This could days as of a comment below, but by not passing +# a likely useless file, we have to fetch more texts from the database) +# +# Therefore try...except-ing the whole block is sufficient: If whatever error +# occurs, we do not abort, but skip the file for prefetch. +try: +# If we could properly parse +first_page_id_in_file = int(file_obj.first_page_id) -# fixme what do we do here? this could be very expensive. is that worth it?? -if not file_obj.last_page_id: -# (b) nasty hack, see (a) -# it's not a checkpoint fle or we'd have the pageid in the filename -# so... temporary hack which will give expensive results -# if chunk file, and it's the last chunk, put none -# if it's not the last chunk, get the first pageid in the next -# chunk and subtract 1 -# if not chunk, put none. -if file_obj.is_chunk_file and file_obj.chunk_int < maxchunks: -for fname in file_list: -if fname.chunk_int == file_obj.chunk_int + 1: -# not true! this could be a few past where it really is -# (because of deleted pages that aren't included at all) -file_obj.last_page_id = str(int(fname.first_page_id) - 1) -if file_obj.last_page_id: -last_page_id_in_file = int(file_obj.last_page_id) -else: -last_page_id_in_file = None +# fixme what do we do here? this could be very expensive. is that worth it?? +if not file_obj.last_page_id: +# (b) nasty hack, see (a) +# it's not a checkpoint fle or we'd have the pageid in the filename +# so... temporary hack which will give expensive results +# if chunk
[MediaWiki-commits] [Gerrit] dumps; fix another indentation screwup from the pylint - change (operations/dumps)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/244801 Change subject: dumps; fix another indentation screwup from the pylint .. dumps; fix another indentation screwup from the pylint didn't break things but did make some commands needlessly long text Change-Id: I2939e1edaad924724b5a61302b91a591b2665887 --- M xmldumps-backup/dumps/jobs.py 1 file changed, 51 insertions(+), 51 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dumps refs/changes/01/244801/1 diff --git a/xmldumps-backup/dumps/jobs.py b/xmldumps-backup/dumps/jobs.py index 7989093..b7d656a 100644 --- a/xmldumps-backup/dumps/jobs.py +++ b/xmldumps-backup/dumps/jobs.py @@ -1274,59 +1274,59 @@ file_obj, self.verbose) file_obj.first_page_id = fname.find_first_page_id_in_file() -# get the files that cover our range -for file_obj in file_list: -# If some of the file_objs in file_list could not be properly be parsed, some of -# the (int) conversions below will fail. However, it is of little use to us, -# which conversion failed. /If any/ conversion fails, it means, that that we do -# not understand how to make sense of the current file_obj. Hence we cannot use -# it as prefetch object and we have to drop it, to avoid passing a useless file -# to the text pass. (This could days as of a comment below, but by not passing -# a likely useless file, we have to fetch more texts from the database) -# -# Therefore try...except-ing the whole block is sufficient: If whatever error -# occurs, we do not abort, but skip the file for prefetch. -try: -# If we could properly parse -first_page_id_in_file = int(file_obj.first_page_id) +# get the files that cover our range +for file_obj in file_list: +# If some of the file_objs in file_list could not be properly be parsed, some of +# the (int) conversions below will fail. However, it is of little use to us, +# which conversion failed. /If any/ conversion fails, it means, that that we do +# not understand how to make sense of the current file_obj. Hence we cannot use +# it as prefetch object and we have to drop it, to avoid passing a useless file +# to the text pass. (This could days as of a comment below, but by not passing +# a likely useless file, we have to fetch more texts from the database) +# +# Therefore try...except-ing the whole block is sufficient: If whatever error +# occurs, we do not abort, but skip the file for prefetch. +try: +# If we could properly parse +first_page_id_in_file = int(file_obj.first_page_id) -# fixme what do we do here? this could be very expensive. is that worth it?? -if not file_obj.last_page_id: -# (b) nasty hack, see (a) -# it's not a checkpoint fle or we'd have the pageid in the filename -# so... temporary hack which will give expensive results -# if chunk file, and it's the last chunk, put none -# if it's not the last chunk, get the first pageid in the next -# chunk and subtract 1 -# if not chunk, put none. -if file_obj.is_chunk_file and file_obj.chunk_int < maxchunks: -for fname in file_list: -if fname.chunk_int == file_obj.chunk_int + 1: -# not true! this could be a few past where it really is -# (because of deleted pages that aren't included at all) -file_obj.last_page_id = str(int(fname.first_page_id) - 1) -if file_obj.last_page_id: -last_page_id_in_file = int(file_obj.last_page_id) -else: -last_page_id_in_file = None +# fixme what do we do here? this could be very expensive. is that worth it?? +if not file_obj.last_page_id: +# (b) nasty hack, see (a) +# it's not a checkpoint fle or we'd have the pageid in the filename +# so... temporary hack which will give expensive results +
