diff --git a/endToEndTests/test/info.test.js b/endToEndTests/test/info.test.js index bcc7f1215..4166a8337 100644 --- a/endToEndTests/test/info.test.js +++ b/endToEndTests/test/info.test.js @@ -8,7 +8,7 @@ describe('The /info endpoint', () => { .expect(200) .expect('Content-Type', 'application/json') .expect(headerToHaveDataVersion) - .expect({ nBitmapsSize: 3898, sequenceCount: 100, totalSize: 26589432 }) + .expect({ nBitmapsSize: 3898, sequenceCount: 100, totalSize: 26335659 }) .end(done); }); @@ -27,15 +27,15 @@ describe('The /info endpoint', () => { 'bitmapContainerSizeStatistic' ); expect(returnedInfo.bitmapContainerSizePerGenomeSection.bitmapContainerSizeStatistic).to.deep.equal({ - numberOfArrayContainers: 48524, + numberOfArrayContainers: 3065, numberOfBitsetContainers: 0, - numberOfRunContainers: 284, - numberOfValuesStoredInArrayContainers: 66620, + numberOfRunContainers: 3, + numberOfValuesStoredInArrayContainers: 4377, numberOfValuesStoredInBitsetContainers: 0, - numberOfValuesStoredInRunContainers: 2875, - totalBitmapSizeArrayContainers: 133240, + numberOfValuesStoredInRunContainers: 9, + totalBitmapSizeArrayContainers: 8754, totalBitmapSizeBitsetContainers: 0, - totalBitmapSizeRunContainers: 4824, + totalBitmapSizeRunContainers: 18, }); expect(returnedInfo.bitmapContainerSizePerGenomeSection).to.have.property( @@ -62,19 +62,19 @@ describe('The /info endpoint', () => { expect(returnedInfo).to.have.property('bitmapSizePerSymbol'); expect(returnedInfo.bitmapSizePerSymbol).to.deep.equal({ - '-': 2661831, - 'A': 2775910, + '-': 2648220, + 'A': 2635348, 'B': 2631464, - 'C': 2725728, + 'C': 2634362, 'D': 2631464, - 'G': 2728118, + 'G': 2633570, 'H': 2631464, 'K': 2631594, 'M': 2631554, 'N': 2631464, 'R': 2631514, 'S': 2631464, - 'T': 2791923, + 'T': 2638765, 'V': 2631464, 'W': 2631514, 'Y': 2631494, diff --git a/src/silo/database.test.cpp b/src/silo/database.test.cpp index 52f1324f7..6df1cb459 100644 --- a/src/silo/database.test.cpp +++ b/src/silo/database.test.cpp @@ -64,10 +64,10 @@ TEST(DatabaseTest, shouldReturnCorrectDatabaseInfo) { const auto simple_info = database.getDatabaseInfo(); EXPECT_EQ( - detailed_info.bitmap_size_per_symbol.size_in_bytes.at(silo::Nucleotide::Symbol::A), 2775910 + detailed_info.bitmap_size_per_symbol.size_in_bytes.at(silo::Nucleotide::Symbol::A), 2635348 ); EXPECT_EQ( - detailed_info.bitmap_size_per_symbol.size_in_bytes.at(silo::Nucleotide::Symbol::GAP), 2661831 + detailed_info.bitmap_size_per_symbol.size_in_bytes.at(silo::Nucleotide::Symbol::GAP), 2648220 ); EXPECT_EQ( @@ -78,7 +78,7 @@ TEST(DatabaseTest, shouldReturnCorrectDatabaseInfo) { EXPECT_EQ( detailed_info.bitmap_container_size_per_genome_section.bitmap_container_size_statistic .number_of_values_stored_in_run_containers, - 2875 + 9 ); EXPECT_EQ( detailed_info.bitmap_container_size_per_genome_section.bitmap_container_size_statistic @@ -87,18 +87,18 @@ TEST(DatabaseTest, shouldReturnCorrectDatabaseInfo) { ); EXPECT_EQ( - detailed_info.bitmap_container_size_per_genome_section.total_bitmap_size_computed, 42629964 + detailed_info.bitmap_container_size_per_genome_section.total_bitmap_size_computed, 42136719 ); EXPECT_EQ( - detailed_info.bitmap_container_size_per_genome_section.total_bitmap_size_frozen, 21433248 + detailed_info.bitmap_container_size_per_genome_section.total_bitmap_size_frozen, 21075818 ); EXPECT_EQ( detailed_info.bitmap_container_size_per_genome_section.bitmap_container_size_statistic .total_bitmap_size_array_containers, - 133240 + 8754 ); - EXPECT_EQ(simple_info.total_size, 26589432); + EXPECT_EQ(simple_info.total_size, 26335659); EXPECT_EQ(simple_info.sequence_count, 100); EXPECT_EQ(simple_info.n_bitmaps_size, 3898); }