/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 46419

Added by Claudio Atzori over 7 years ago

simplifying

     	private static List<String> indexes = Arrays.asList(ID, TIMESTAMP, ORIGINAL_ID);
     	private final boolean discardRecords;
     	private String id;
     	private MongoDatabase mongoDatabase;
     	private MongoCollection<MDStoreRecord> collection;
     	private MongoCollection<MDStoreRecord> recordCollection;
     	private MongoCollection<MDStoreRecord> discardedCollection;
     	public MongoMDStore(final String id,
-...
     			final boolean discardRecords,
     			final MongoDatabase mongoDatabase) {
     		this.id = id;
     		this.mongoDatabase = mongoDatabase;
     		this.collection = collection;
     		this.discardedCollection = this.mongoDatabase.getCollection(DISCARDED_PREFIX + StringUtils.substringBefore(id, "_"), MDStoreRecord.class);
     		this.recordCollection = collection;
     		this.discardedCollection = mongoDatabase.getCollection(DISCARDED_PREFIX + StringUtils.substringBefore(id, "_"), MDStoreRecord.class);
     		this.discardRecords = discardRecords;
+    	}
     	@Override
     	public int feed(final Stream<MDStoreRecord> records) {
     		ensureIndices();
     		final BlockingQueue<MDStoreRecord> queue = new ArrayBlockingQueue<>(BULK_SIZE);
     		final MDStoreRecord sentinel = new MDStoreRecord();
     		int countStored = 0;
     		final Callable<Integer> writer = () -> {
     			final MongoBulkWritesManager bulkWritesManager =
     					new MongoBulkWritesManager(collection, discardedCollection, BULK_SIZE, discardRecords);
     					new MongoBulkWritesManager(recordCollection, discardedCollection, BULK_SIZE, discardRecords);
     			int count = 0;
     			while (true) {
     				try {
-...
+    		}
     		// double check
     		ensureIndices();
     		collection.createIndex(new BasicDBObject("id", 1));
     		log.info("finished feeding mdstore " + id);
     		return countStored;
+    	}
     	public void ensureIndices() {
     		indexes.forEach(key -> collection.createIndex(new BasicDBObject(key, 1)));
     		indexes.forEach(key -> recordCollection.createIndex(new BasicDBObject(key, 1)));
+    	}
     	public boolean isIndexed() {
     		final ListIndexesIterable<DBObject> listIndexes = collection.listIndexes(DBObject.class);
     		final ListIndexesIterable<DBObject> listIndexes = recordCollection.listIndexes(DBObject.class);
     		final List<String> key = StreamUtils.createStreamFromIterator(listIndexes.iterator())
     				.map(dbo -> new BasicDBObject(dbo.toMap()).getString("key"))
     				.collect(Collectors.toList());
-...
+    	}
     	private Stream<MDStoreRecord> query(final Bson query) {
     		final MongoCursor<MDStoreRecord> mongoCursor = collection.find(query).batchSize(BULK_SIZE).iterator();
     		final MongoCursor<MDStoreRecord> mongoCursor = recordCollection.find(query).batchSize(BULK_SIZE).iterator();
     		return DnetStreamSupport.generateStreamFromIterator(mongoCursor);
+    	}
     	@Override
     	public void deleteRecord(final String recordId) {
     		collection.deleteOne(new BasicDBObject("id", recordId));
     		recordCollection.deleteOne(new BasicDBObject("id", recordId));
+    	}
     	@Override
-...
     	@Override
     	public void truncate() {
     		collection.drop();
     		recordCollection.drop();
     		discardedCollection.drop();
+    	}
     	public DBObject getMDStoreMetadata() {
     		return mongoDatabase.getCollection("metadata", DBObject.class).find(new BasicDBObject("mdId", getId())).first();
+    	}
     	@Override
     	public String getFormat() {
     		return (String) getMDStoreMetadata().get("format");
+    	}
     	@Override
     	public String getInterpretation() {
     		return (String) getMDStoreMetadata().get("interpretation");
+    	}
     	@Override
     	public String getLayout() {
     		return (String) getMDStoreMetadata().get("layout");
+    	}
     	@Override
     	public String getId() {
     		return id;
+    	}
-...
     		this.id = id;
+    	}
     	public MongoCollection<MDStoreRecord> getCollection() {
     		return collection;
     	public MongoCollection<MDStoreRecord> getRecordCollection() {
     		return recordCollection;
+    	}
     	public void setCollection(final MongoCollection<MDStoreRecord> collection) {
     		this.collection = collection;
     	public void setRecordCollection(final MongoCollection<MDStoreRecord> recordCollection) {
     		this.recordCollection = recordCollection;
+    	}
     	@Override
     	public int getSize() {
     		return (int) collection.count();
     		return (int) recordCollection.count();
+    	}
     	public MongoCollection<MDStoreRecord> getDiscardedCollection() {

     	String getId() throws MDStoreException;
     	String getFormat() throws MDStoreException;
     	String getInterpretation() throws MDStoreException;
     	String getLayout() throws MDStoreException;
     	void truncate() throws MDStoreException;
     	int feed(Stream<MDStoreRecord> records) throws MDStoreException;

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 46419

Added by Claudio Atzori over 7 years ago