x/stackalytics
Code Issues Proposed changes

Reviews and blueprints should be merged during update

Browse Source 
Change-Id: Ib0719d0516f96df41013826192f5acd6928a9ba4
This commit is contained in:
Ilya Shakhat
2013-10-15 16:15:34 +04:00
parent 4ac730d9ee
commit 83a28b7c8e
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stackalytics/processor/main.py
View File

@@ -82,7 +82,8 @@ def process_repo(repo, runtime_storage_inst, record_processor_inst):
bp_iterator_typed = _record_typer(bp_iterator, 'bp') bp_iterator_typed = _record_typer(bp_iterator, 'bp')
processed_bp_iterator = record_processor_inst.process( processed_bp_iterator = record_processor_inst.process(
bp_iterator_typed) bp_iterator_typed)
runtime_storage_inst.set_records(processed_bp_iterator) runtime_storage_inst.set_records(processed_bp_iterator,
utils.merge_records)
vcs_inst = vcs.get_vcs(repo, cfg.CONF.sources_root) vcs_inst = vcs.get_vcs(repo, cfg.CONF.sources_root)
vcs_inst.fetch() vcs_inst.fetch()
@@ -116,7 +117,8 @@ def process_repo(repo, runtime_storage_inst, record_processor_inst):
review_iterator_typed = _record_typer(review_iterator, 'review') review_iterator_typed = _record_typer(review_iterator, 'review')
processed_review_iterator = record_processor_inst.process( processed_review_iterator = record_processor_inst.process(
review_iterator_typed) review_iterator_typed)
runtime_storage_inst.set_records(processed_review_iterator) runtime_storage_inst.set_records(processed_review_iterator,
utils.merge_records)
last_id = rcs_inst.get_last_id(branch) last_id = rcs_inst.get_last_id(branch)
runtime_storage_inst.set_by_key(rcs_key, last_id) runtime_storage_inst.set_by_key(rcs_key, last_id)

9
stackalytics/processor/utils.py
View File

@@ -108,3 +108,12 @@ def format_text(s):
s = cgi.escape(re.sub(re.compile('\n{2,}', flags=re.MULTILINE), '\n', s)) s = cgi.escape(re.sub(re.compile('\n{2,}', flags=re.MULTILINE), '\n', s))
s = re.sub(r'([/\/]+)', r'\1​', s) s = re.sub(r'([/\/]+)', r'\1​', s)
return s return s
def merge_records(original, new):
need_update = False
for key, value in new.iteritems():
if original.get(key) != value:
need_update = True
original[key] = value
return need_update