Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
mongodb-version: [4.0.18]
mongodb-version: [6.0.6]
java-version: [1.8]

steps:
Expand All @@ -23,9 +23,9 @@ jobs:
java-version: ${{ matrix.java-version }}
- name: Install and Start MongoDB
run: |
wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${{ matrix.mongodb-version }}.tgz
tar xfz mongodb-linux-x86_64-${{ matrix.mongodb-version }}.tgz
export PATH=`pwd`/mongodb-linux-x86_64-${{ matrix.mongodb-version }}/bin:$PATH
wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-${{ matrix.mongodb-version }}.tgz
tar xfz mongodb-linux-x86_64-ubuntu2204-${{ matrix.mongodb-version }}.tgz
export PATH=`pwd`/mongodb-linux-x86_64-ubuntu2204-${{ matrix.mongodb-version }}/bin:$PATH
mkdir -p data/db
mongod --dbpath=data/db &
mongod --version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
*/
public class VariantSourceMongoWriter extends MongoItemWriter<IVariantSource> {

public static final String UNIQUE_FILE_INDEX_NAME = "unique_file";

private MongoOperations mongoOperations;

private String collection;
Expand All @@ -53,7 +51,7 @@ public VariantSourceMongoWriter(MongoOperations mongoOperations, String collecti
}

private void createIndexes() {
IndexOptions indexOptions = new IndexOptions().background(true).unique(true).name(UNIQUE_FILE_INDEX_NAME);
IndexOptions indexOptions = new IndexOptions().background(true).unique(true);
mongoOperations.getCollection(collection).createIndex(
new Document(VariantSourceMongo.STUDYID_FIELD, 1).append(VariantSourceMongo.FILEID_FIELD, 1)
.append(VariantSourceMongo.FILENAME_FIELD, 1),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ public void shouldCreateUniqueFileIndex() throws Exception {
indexesInfo.map(index -> index.get("name").toString()).spliterator(), false)
.collect(Collectors.toSet());
Set<String> expectedIndexes = new HashSet<>();
expectedIndexes.addAll(Arrays.asList(VariantSourceMongoWriter.UNIQUE_FILE_INDEX_NAME, "_id_"));
expectedIndexes.addAll(Arrays.asList("sid_1_fid_1_fname_1", "_id_"));
assertEquals(expectedIndexes, createdIndexes);

for(Document indexInfo: indexesInfo) {
if (VariantSourceMongoWriter.UNIQUE_FILE_INDEX_NAME.equals(indexInfo.get("name").toString())) {
if ("sid_1_fid_1_fname_1".equals(indexInfo.get("name").toString())) {
assertNotNull(indexInfo);
assertEquals("true", indexInfo.get(UNIQUE_INDEX).toString());
assertEquals("true", indexInfo.get(BACKGROUND_INDEX).toString());
Expand Down
Loading