Changeset: 92c8db01da03 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92c8db01da03
Added Files:
sql/backends/monet5/bam/85_bam.mal
sql/backends/monet5/bam/85_bam.sql
sql/backends/monet5/bam/BAMRecipe.pdf
sql/backends/monet5/bam/Makefile.ag
sql/backends/monet5/bam/Tests/All
sql/backends/monet5/bam/Tests/benchmarks_0/benchmark1.sql
sql/backends/monet5/bam/Tests/benchmarks_0/benchmark2.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query1.1.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query1.2.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query1.3.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query1.4.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query1.5.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.1.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.10.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.11.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.12.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.2.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.3.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.4.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.5.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.6.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.7.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.8.sql
sql/backends/monet5/bam/Tests/benchmarks_0/query2.9.sql
sql/backends/monet5/bam/Tests/benchmarks_1/benchmark1.sql
sql/backends/monet5/bam/Tests/benchmarks_1/benchmark2.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query1.1.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query1.2.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query1.3.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query1.4.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query1.5.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.1.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.10.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.11.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.12.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.2.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.3.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.4.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.5.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.6.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.7.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.8.sql
sql/backends/monet5/bam/Tests/benchmarks_1/query2.9.sql
sql/backends/monet5/bam/Tests/files/bam_test_file_1.bam
sql/backends/monet5/bam/Tests/files/bam_test_file_2.sam
sql/backends/monet5/bam/Tests/files/queryname/bam_test_file_1.bam
sql/backends/monet5/bam/Tests/files/queryname/bam_test_file_2.sam
sql/backends/monet5/bam/Tests/load.sql
sql/backends/monet5/bam/Tests/test.SQL.py
sql/backends/monet5/bam/Tests/test.stable.err
sql/backends/monet5/bam/Tests/test.stable.out
sql/backends/monet5/bam/bam.mal
sql/backends/monet5/bam/bam_db_interface.c
sql/backends/monet5/bam/bam_db_interface.h
sql/backends/monet5/bam/bam_globals.h
sql/backends/monet5/bam/bam_lib.c
sql/backends/monet5/bam/bam_lib.h
sql/backends/monet5/bam/bam_loader.c
sql/backends/monet5/bam/bam_loader.h
sql/backends/monet5/bam/bam_wrapper.c
sql/backends/monet5/bam/bam_wrapper.h
sql/backends/monet5/bam/mykstring.h
Removed Files:
sql/backends/monet5/bamloader/85_bam.mal
sql/backends/monet5/bamloader/85_bam.sql
sql/backends/monet5/bamloader/BAMRecipe.pdf
sql/backends/monet5/bamloader/Makefile.ag
sql/backends/monet5/bamloader/Tests/All
sql/backends/monet5/bamloader/Tests/bam/bam_test_file_1.bam
sql/backends/monet5/bamloader/Tests/bam/bam_test_file_2.sam
sql/backends/monet5/bamloader/Tests/bam/queryname/bam_test_file_1.bam
sql/backends/monet5/bamloader/Tests/bam/queryname/bam_test_file_2.sam
sql/backends/monet5/bamloader/Tests/benchmarks_0/benchmark1.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/benchmark2.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.1.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.2.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.3.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.4.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.5.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.1.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.10.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.11.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.12.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.2.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.3.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.4.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.5.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.6.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.7.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.8.sql
sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.9.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/benchmark1.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/benchmark2.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.1.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.2.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.3.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.4.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.5.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.1.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.10.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.11.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.12.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.2.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.3.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.4.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.5.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.6.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.7.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.8.sql
sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.9.sql
sql/backends/monet5/bamloader/Tests/load.sql
sql/backends/monet5/bamloader/Tests/test.SQL.py
sql/backends/monet5/bamloader/Tests/test.stable.err
sql/backends/monet5/bamloader/Tests/test.stable.out
sql/backends/monet5/bamloader/bam.mal
sql/backends/monet5/bamloader/bam_db_interface.c
sql/backends/monet5/bamloader/bam_db_interface.h
sql/backends/monet5/bamloader/bam_globals.h
sql/backends/monet5/bamloader/bam_lib.c
sql/backends/monet5/bamloader/bam_lib.h
sql/backends/monet5/bamloader/bam_loader.c
sql/backends/monet5/bamloader/bam_loader.h
sql/backends/monet5/bamloader/bam_wrapper.c
sql/backends/monet5/bamloader/bam_wrapper.h
sql/backends/monet5/bamloader/mykstring.h
Branch: bamloader
Log Message:
Some renaming; module is not *just* a BAM loader
diffs (220 lines):
diff --git a/sql/backends/monet5/bamloader/85_bam.mal
b/sql/backends/monet5/bam/85_bam.mal
rename from sql/backends/monet5/bamloader/85_bam.mal
rename to sql/backends/monet5/bam/85_bam.mal
diff --git a/sql/backends/monet5/bamloader/85_bam.sql
b/sql/backends/monet5/bam/85_bam.sql
rename from sql/backends/monet5/bamloader/85_bam.sql
rename to sql/backends/monet5/bam/85_bam.sql
diff --git a/sql/backends/monet5/bamloader/BAMRecipe.pdf
b/sql/backends/monet5/bam/BAMRecipe.pdf
rename from sql/backends/monet5/bamloader/BAMRecipe.pdf
rename to sql/backends/monet5/bam/BAMRecipe.pdf
diff --git a/sql/backends/monet5/bamloader/Makefile.ag
b/sql/backends/monet5/bam/Makefile.ag
rename from sql/backends/monet5/bamloader/Makefile.ag
rename to sql/backends/monet5/bam/Makefile.ag
diff --git a/sql/backends/monet5/bamloader/Tests/All
b/sql/backends/monet5/bam/Tests/All
rename from sql/backends/monet5/bamloader/Tests/All
rename to sql/backends/monet5/bam/Tests/All
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/benchmark1.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/benchmark1.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/benchmark1.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/benchmark1.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/benchmark2.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/benchmark2.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/benchmark2.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/benchmark2.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.1.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query1.1.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.1.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query1.1.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.2.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query1.2.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.2.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query1.2.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.3.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query1.3.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.3.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query1.3.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.4.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query1.4.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.4.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query1.4.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.5.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query1.5.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query1.5.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query1.5.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.1.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.1.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.1.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.1.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.10.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.10.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.10.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.10.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.11.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.11.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.11.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.11.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.12.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.12.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.12.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.12.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.2.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.2.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.2.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.2.sql
diff --git a/sql/backends/monet5/bam/Tests/benchmarks_0/query2.3.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.3.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.3.sql
@@ -0,0 +1,10 @@
+SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual
+FROM bam.alignments_i
+WHERE qname IN (
+ SELECT qname
+ FROM bam.alignments_i
+ GROUP BY qname
+ HAVING SUM(bam_flag(flag, 'firs_segm')) = 0
+ OR SUM(bam_flag(flag, 'last_segm')) = 0
+)
+ORDER BY qname;
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.4.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.4.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.4.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.4.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.5.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.5.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.5.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.5.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.6.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.6.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.6.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.6.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.7.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.7.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.7.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.7.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.8.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.8.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.8.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.8.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.9.sql
b/sql/backends/monet5/bam/Tests/benchmarks_0/query2.9.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.9.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_0/query2.9.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/benchmark1.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/benchmark1.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/benchmark1.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/benchmark1.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/benchmark2.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/benchmark2.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/benchmark2.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/benchmark2.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.1.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query1.1.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.1.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query1.1.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.2.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query1.2.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.2.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query1.2.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.3.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query1.3.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.3.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query1.3.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.4.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query1.4.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.4.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query1.4.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.5.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query1.5.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query1.5.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query1.5.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.1.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.1.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.1.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.1.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.10.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.10.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.10.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.10.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.11.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.11.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.11.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.11.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.12.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.12.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.12.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.12.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.2.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.2.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.2.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.2.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.3.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.3.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.3.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.3.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.4.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.4.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.4.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.4.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.5.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.5.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.5.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.5.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.6.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.6.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.6.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.6.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.7.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.7.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.7.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.7.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.8.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.8.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.8.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.8.sql
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.9.sql
b/sql/backends/monet5/bam/Tests/benchmarks_1/query2.9.sql
rename from sql/backends/monet5/bamloader/Tests/benchmarks_1/query2.9.sql
rename to sql/backends/monet5/bam/Tests/benchmarks_1/query2.9.sql
diff --git a/sql/backends/monet5/bamloader/Tests/bam/bam_test_file_1.bam
b/sql/backends/monet5/bam/Tests/files/bam_test_file_1.bam
rename from sql/backends/monet5/bamloader/Tests/bam/bam_test_file_1.bam
rename to sql/backends/monet5/bam/Tests/files/bam_test_file_1.bam
diff --git a/sql/backends/monet5/bamloader/Tests/bam/bam_test_file_2.sam
b/sql/backends/monet5/bam/Tests/files/bam_test_file_2.sam
rename from sql/backends/monet5/bamloader/Tests/bam/bam_test_file_2.sam
rename to sql/backends/monet5/bam/Tests/files/bam_test_file_2.sam
diff --git
a/sql/backends/monet5/bamloader/Tests/bam/queryname/bam_test_file_1.bam
b/sql/backends/monet5/bam/Tests/files/queryname/bam_test_file_1.bam
rename from
sql/backends/monet5/bamloader/Tests/bam/queryname/bam_test_file_1.bam
rename to sql/backends/monet5/bam/Tests/files/queryname/bam_test_file_1.bam
diff --git
a/sql/backends/monet5/bamloader/Tests/bam/queryname/bam_test_file_2.sam
b/sql/backends/monet5/bam/Tests/files/queryname/bam_test_file_2.sam
rename from
sql/backends/monet5/bamloader/Tests/bam/queryname/bam_test_file_2.sam
rename to sql/backends/monet5/bam/Tests/files/queryname/bam_test_file_2.sam
diff --git a/sql/backends/monet5/bamloader/Tests/load.sql
b/sql/backends/monet5/bam/Tests/load.sql
rename from sql/backends/monet5/bamloader/Tests/load.sql
rename to sql/backends/monet5/bam/Tests/load.sql
--- a/sql/backends/monet5/bamloader/Tests/load.sql
+++ b/sql/backends/monet5/bam/Tests/load.sql
@@ -1,2 +1,2 @@
-CALL bam_loader_repos('PWD/bam', 0, 32);
-CALL bam_loader_repos('PWD/bam/queryname', 1, 32);
+CALL bam_loader_repos('PWD/files', 0, 32);
+CALL bam_loader_repos('PWD/files/queryname', 1, 32);
diff --git a/sql/backends/monet5/bamloader/Tests/test.SQL.py
b/sql/backends/monet5/bam/Tests/test.SQL.py
rename from sql/backends/monet5/bamloader/Tests/test.SQL.py
rename to sql/backends/monet5/bam/Tests/test.SQL.py
diff --git a/sql/backends/monet5/bamloader/Tests/test.stable.err
b/sql/backends/monet5/bam/Tests/test.stable.err
rename from sql/backends/monet5/bamloader/Tests/test.stable.err
rename to sql/backends/monet5/bam/Tests/test.stable.err
diff --git a/sql/backends/monet5/bamloader/Tests/test.stable.out
b/sql/backends/monet5/bam/Tests/test.stable.out
rename from sql/backends/monet5/bamloader/Tests/test.stable.out
rename to sql/backends/monet5/bam/Tests/test.stable.out
diff --git a/sql/backends/monet5/bamloader/bam.mal
b/sql/backends/monet5/bam/bam.mal
rename from sql/backends/monet5/bamloader/bam.mal
rename to sql/backends/monet5/bam/bam.mal
diff --git a/sql/backends/monet5/bamloader/bam_db_interface.c
b/sql/backends/monet5/bam/bam_db_interface.c
rename from sql/backends/monet5/bamloader/bam_db_interface.c
rename to sql/backends/monet5/bam/bam_db_interface.c
diff --git a/sql/backends/monet5/bamloader/bam_db_interface.h
b/sql/backends/monet5/bam/bam_db_interface.h
rename from sql/backends/monet5/bamloader/bam_db_interface.h
rename to sql/backends/monet5/bam/bam_db_interface.h
diff --git a/sql/backends/monet5/bamloader/bam_globals.h
b/sql/backends/monet5/bam/bam_globals.h
rename from sql/backends/monet5/bamloader/bam_globals.h
rename to sql/backends/monet5/bam/bam_globals.h
diff --git a/sql/backends/monet5/bamloader/bam_lib.c
b/sql/backends/monet5/bam/bam_lib.c
rename from sql/backends/monet5/bamloader/bam_lib.c
rename to sql/backends/monet5/bam/bam_lib.c
diff --git a/sql/backends/monet5/bamloader/bam_lib.h
b/sql/backends/monet5/bam/bam_lib.h
rename from sql/backends/monet5/bamloader/bam_lib.h
rename to sql/backends/monet5/bam/bam_lib.h
diff --git a/sql/backends/monet5/bamloader/bam_loader.c
b/sql/backends/monet5/bam/bam_loader.c
rename from sql/backends/monet5/bamloader/bam_loader.c
rename to sql/backends/monet5/bam/bam_loader.c
diff --git a/sql/backends/monet5/bamloader/bam_loader.h
b/sql/backends/monet5/bam/bam_loader.h
rename from sql/backends/monet5/bamloader/bam_loader.h
rename to sql/backends/monet5/bam/bam_loader.h
diff --git a/sql/backends/monet5/bamloader/bam_wrapper.c
b/sql/backends/monet5/bam/bam_wrapper.c
rename from sql/backends/monet5/bamloader/bam_wrapper.c
rename to sql/backends/monet5/bam/bam_wrapper.c
diff --git a/sql/backends/monet5/bamloader/bam_wrapper.h
b/sql/backends/monet5/bam/bam_wrapper.h
rename from sql/backends/monet5/bamloader/bam_wrapper.h
rename to sql/backends/monet5/bam/bam_wrapper.h
diff --git a/sql/backends/monet5/bamloader/mykstring.h
b/sql/backends/monet5/bam/mykstring.h
rename from sql/backends/monet5/bamloader/mykstring.h
rename to sql/backends/monet5/bam/mykstring.h
diff --git a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.3.sql
b/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.3.sql
deleted file mode 100644
--- a/sql/backends/monet5/bamloader/Tests/benchmarks_0/query2.3.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT qname, flag, rname, pos, mapq, cigar, rnext, pnext, tlen, seq, qual
-FROM bam.alignments_4
-WHERE qname IN (
- SELECT qname
- FROM bam.alignments_4
- GROUP BY qname
- HAVING SUM(bam_flag(flag, 'firs_segm')) = 0
- OR SUM(bam_flag(flag, 'last_segm')) = 0
-)
-ORDER BY qname;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
