MonetDB: bamloader - Small bug fix

[Robin Cijvat]

Changeset: fb17f0c487cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb17f0c487cc
Modified Files:
        sql/backends/monet5/bam/bam_wrapper.c
        sql/backends/monet5/bam/bam_wrapper.h
Branch: bamloader
Log Message:

Small bug fix


diffs (40 lines):

diff --git a/sql/backends/monet5/bam/bam_wrapper.c 
b/sql/backends/monet5/bam/bam_wrapper.c
--- a/sql/backends/monet5/bam/bam_wrapper.c
+++ b/sql/backends/monet5/bam/bam_wrapper.c
@@ -182,6 +182,7 @@ init_bam_wrapper(bam_wrapper * bw, filet
        bw->cnt_alignments_extra = 0;
        bw->cnt_alignments_paired_primary = 0;
        bw->cnt_alignments_paired_secondary = 0;
+    bw->cnt_alignments_total = 0;
 
        for (i = 0; i < 6; ++i) {
                snprintf(bw->fp_files[i], BW_FP_BUF_SIZE, "%s/files_%d",
@@ -1968,7 +1969,7 @@ complete_qname_group(alignment ** alignm
        return MAL_SUCCEED;
 }
 
-#define BAMSAM_TELL(bw) (bw->type == BAM ? bam_tell(bw->bam.input) : 
(bw->cnt_alignments + 1))
+#define BAMSAM_TELL(bw) (bw->type == BAM ? bam_tell(bw->bam.input) : 
(bw->cnt_alignments_total + 1))
 
 str
 process_alignments(bam_wrapper * bw, bit * some_thread_failed)
@@ -2048,6 +2049,8 @@ process_alignments(bam_wrapper * bw, bit
                 break;
             }
            }
+        
+        ++bw->cnt_alignments_total;
 
                if (bw->dbschema == 1 && alig_index > 0
                    && strcmp((bw->type == BAM ? bam1_qname(alig) : a->qname),
diff --git a/sql/backends/monet5/bam/bam_wrapper.h 
b/sql/backends/monet5/bam/bam_wrapper.h
--- a/sql/backends/monet5/bam/bam_wrapper.h
+++ b/sql/backends/monet5/bam/bam_wrapper.h
@@ -69,6 +69,7 @@ typedef struct bam_wrapper {
        lng cnt_alignments_extra;
        lng cnt_alignments_paired_primary;
        lng cnt_alignments_paired_secondary;
+    lng cnt_alignments_total;
 
        /* File paths to binary files */
        char fp_files[6][BW_FP_BUF_SIZE];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list