Skip to content

Commit

Permalink
review comments incorporated
Browse files Browse the repository at this point in the history
  • Loading branch information
nitin-ebi committed May 13, 2024
1 parent 03a3b1c commit 852cc97
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ private void initializeMongoDbWithUncommittedAccessions() {
clusteredVariantEntityList.add(entity);
}

// Entries for 2nd block
// Entries for 2nd block - Missing 5 RS (3000000035l - 3000000039l)
for (long i = 3000000030l; i <= 3000000034l; i++) {
ClusteredVariant model = new ClusteredVariant("assembly", 1111,
"contig", 100, VariantType.SNV, false, LocalDateTime.now());
Expand Down Expand Up @@ -119,7 +119,7 @@ private void initializeMongoDbWithUncommittedAccessions() {

private void verifyInitialDBState() {
// Initial state of Contiguous Id Block DB is 5 blocks are present but their "last_committed" is not updated
// (Initialized using "resources/test-data/monotonic_accession_recovery_agent_test_data.sql")
// (Initialized using "resources/test-data/monotonic_accession_recovery_agent_category_rs_test_data.sql")

// block id first value last value last committed reserved last_updated_timestamp | remarks
// 1 3000000000 3000000029 2999999999 true 1970-01-01 00:00:00 | should be recovered
Expand All @@ -129,7 +129,7 @@ private void verifyInitialDBState() {
// 5 3000000120 3000000149 3000000119 true 2099-01-01 00:00:00 | should not be recovered

// Mongo DB
// 85 accessions have been used in mongoDB but are not reflected in the block allocation table
// 95 accessions have been used in mongoDB but are not reflected in the block allocation table
// 30 accessions belong to 1st block (3000000000 to 3000000029),
// 25 to the 2nd block (3000000030 to 300000034 and 3000000040 to 3000000059)
// 30 to the 3rd block (3000000060 to 3000000089)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spring.datasource.url=jdbc:hsqldb:mem:db;sql.syntax_pgs=true;DB_CLOSE_DELAY=-1
spring.datasource.username=SA
spring.datasource.password=
spring.datasource.schema=test-data/contiguous_id_blocks_schema.sql
spring.datasource.data=test-data/monotonic_accession_recovery_agent_test_data.sql
spring.datasource.data=test-data/monotonic_accession_recovery_agent_category_rs_test_data.sql
spring.jpa.hibernate.ddl-auto=update

parameters.vcf=src/test/resources/input-files/vcf/aggregated_accessioned.vcf.gz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ private void initializeMongoDbWithUncommittedAccessions() {
submittedVariantEntityList.add(entity);
}

// Entries for 2nd block
// Entries for 2nd block - Missing 5 RS (3000000035l - 3000000039l)
for (long i = 5000000030l; i <= 5000000034l; i++) {
SubmittedVariant model = new SubmittedVariant("assembly", 1111,
"project", "contig", 100, "A", "T",
Expand Down Expand Up @@ -123,7 +123,7 @@ private void initializeMongoDbWithUncommittedAccessions() {

private void verifyInitialDBState() {
// Initial state of Contiguous Id Block DB is 5 blocks are present but their "last_committed" is not updated
// (Initialized using "resources/test-data/monotonic_accession_recovery_agent_test_data.sql")
// (Initialized using "resources/test-data/monotonic_accession_recovery_agent_category_ss_test_data.sql")

// block id first value last value last committed reserved last_updated_timestamp | remarks
// 1 5000000000 5000000029 4999999999 true 1970-01-01 00:00:00 | should be recovered
Expand All @@ -133,7 +133,7 @@ private void verifyInitialDBState() {
// 5 5000000120 5000000149 5000000119 true 2099-01-01 00:00:00 | should not be recovered

// Mongo DB
// 85 accessions have been used in mongoDB but are not reflected in the block allocation table
// 95 accessions have been used in mongoDB but are not reflected in the block allocation table
// 30 accessions belong to 1st block (5000000000 to 5000000029),
// 25 to the 2nd block (5000000030 to 500000034 and 5000000040 to 5000000059)
// 30 to the 3rd block (5000000060 to 5000000089)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spring.datasource.url=jdbc:hsqldb:mem:db;sql.syntax_pgs=true;DB_CLOSE_DELAY=-1
spring.datasource.username=SA
spring.datasource.password=
spring.datasource.schema=test-data/contiguous_id_blocks_schema.sql
spring.datasource.data=test-data/monotonic_accession_recovery_agent_test_data.sql
spring.datasource.data=test-data/monotonic_accession_recovery_agent_category_ss_test_data.sql
spring.jpa.hibernate.ddl-auto=update

accessioning.submitted.categoryId=test-pipeline-ss
Expand Down

0 comments on commit 852cc97

Please sign in to comment.