zzh
/
minimap2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r667: warn if one query file has fewer records #92

This commit is contained in:
Heng Li 2018-01-28 17:36:21 -05:00
parent 72b9b0e3b6
commit 43bfa6199d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bseq.c
View File

@ -115,10 +115,15 @@ mm_bseq1_t *mm_bseq_read_frag(int n_fp, mm_bseq_file_t **fp, int chunk_size, int
*n_ = 0; *n_ = 0;
if (n_fp < 1) return 0; if (n_fp < 1) return 0;
while (1) { while (1) {
int n_read = 0;
for (i = 0; i < n_fp; ++i) for (i = 0; i < n_fp; ++i)
if (kseq_read(fp[i]->ks) < 0) if (kseq_read(fp[i]->ks) >= 0)
break; ++n_read;
if (i != n_fp) break; // some file reaches the end if (n_read < n_fp) {
if (n_read > 0)
fprintf(stderr, "[W::%s]\033[1;31m query files have different number of records; extra records skipped.\033[0m\n", __func__);
break; // some file reaches the end
}
if (a.m == 0) kv_resize(mm_bseq1_t, 0, a, 256); if (a.m == 0) kv_resize(mm_bseq1_t, 0, a, 256);
for (i = 0; i < n_fp; ++i) { for (i = 0; i < n_fp; ++i) {
mm_bseq1_t *s; mm_bseq1_t *s;

2
main.c
View File

@ -6,7 +6,7 @@
#include "mmpriv.h" #include "mmpriv.h"
#include "getopt.h" #include "getopt.h"
#define MM_VERSION "2.7-r666-dirty" #define MM_VERSION "2.7-r667-dirty"
#ifdef __linux__ #ifdef __linux__
#include <sys/resource.h> #include <sys/resource.h>