This commit is contained in:
Jonas Finnemann Jensen 2013-11-13 16:27:21 -08:00
Родитель a46a130f1b
Коммит e238dcbbfa
2 изменённых файлов: 28 добавлений и 7 удалений

Просмотреть файл

@ -56,4 +56,31 @@ class ResultMergingProcess(Process):
self.ctx.merge_result_file(input_path)
os.remove(input_path)
print " - Merged result, % i left" % len(self.path_set)
self.ctx.output(self.result_path)
self.ctx.output(self.result_path)
def main():
p = ArgumentParser(
description = 'Merge analysis results to single file',
formatter_class = ArgumentDefaultsHelpFormatter
)
p.add_argument(
"-i", "--input-file",
help = "Input files to merge to data folder",
required = True,
nargs = '+'
)
p.add_argument(
"-o", "--output-file",
help = "Output file to write data to",
required = True
)
cfg = p.parse_args()
ctx = ResultContext()
for f in cfg.input_file:
ctx.merge_result_file(f)
ctx.output(cfg.output_file)
if __name__ == "__main__":
sys.exit(main())

Просмотреть файл

@ -176,8 +176,6 @@ class ChannelVersionManager:
# if we have a data-array length mismatch, then we purge existing data
if length != len(dump['values']):
purge_data = True
if metadata.get('length', None) != None:
print dump['values']
revision = dump['revision']
buildId = dump['buildId']
length = len(dump['values'])
@ -205,10 +203,6 @@ class ChannelVersionManager:
oldlen = metadata.get('length', None)
if oldlen != None:
print >> sys.stderr, "Purging data for %s from length %i to %i" % (measure, oldlen, length)
print >> sys.stderr, " old-build: " + metadata.get('buildId', '')
print >> sys.stderr, " new-build: " + buildId
print >> sys.stderr, " old-rev: " + metadata.get('revision', '')
print >> sys.stderr, " new-rev: " + revision
# Filename to merge blob into
filename = measure + "-" + byDateType + ".json"