Project

General

Profile

« Previous | Next » 

Revision 43673

create index on (id, timestamp) upon objectStore creation. Cleanup

View differences:

modules/dnet-fs-objectstore/trunk/src/main/java/eu/dnetlib/data/objectstore/filesystem/FileSystemObjectStoreResultSetListener.java
1
/**
2
 *
3
 */
4 1
package eu.dnetlib.data.objectstore.filesystem;
5 2

  
6 3
import java.util.List;
......
20 17
import org.apache.commons.logging.LogFactory;
21 18
import org.bson.conversions.Bson;
22 19

  
23
// TODO: Auto-generated Javadoc
24 20
/**
25 21
 * The listener interface for receiving fileSystemObjectStoreResultSet events.
26 22
 * The class that is interested in processing a fileSystemObjectStoreResultSet
......
78 74
	 */
79 75
	@Override
80 76
	public List<String> getResult(final int from, final int to) {
81
		log.debug(String.format("ObjectStoreId :%s, from: %d, to: %d", objectStoreID, from, to));
77
		if (log.isDebugEnabled()) {
78
			log.debug(String.format("ObjectStoreId :%s, from: %d, to: %d", objectStoreID, from, to));
79
		}
82 80
		if (records != null) {
83 81
			List<String> ids = Lists.newArrayList();
84 82
			for (int i = from; i < to; i++) {
modules/dnet-fs-objectstore/trunk/src/main/java/eu/dnetlib/data/objectstore/filesystem/FileSystemObjectStoreDao.java
33 33
 */
34 34
public class FileSystemObjectStoreDao implements ObjectStoreDao {
35 35

  
36
	public static final String INTERPRETATION_FIELD = "interpretation";
37
	public final static String OBJECTSTORE_METADATA_NAME_FIELD = "metadataObjectStore";
38
	public final static String OBJECTSTORE_ID_FIELD = "obsId";
39
	public final static String BASE_PATH_FIELD = "basePath";
36 40
	private static final Log log = LogFactory.getLog(FileSystemObjectStoreDao.class); // NOPMD by marko on 11/24/08 5:02 PM
37

  
38 41
	private static final String OBJECTSTORE_PROFILE_SUFFIX = "_T2JqZWN0U3RvcmVEU1Jlc291cmNlcy9PYmplY3RTdG9yZURTUmVzb3VyY2VUeXBl";
39

  
40
	private static final String INTERPRETATION_FIELD = "interpretation";
41

  
42
	private final static String OBJECTSTORE_METADATA_NAME_FIELD = "metadataObjectStore";
43

  
44
	private final static String OBJECTSTORE_ID_FIELD = "obsId";
45

  
46
	private final static String BASE_PATH_FIELD = "basePath";
47

  
48 42
	@Resource(name="objectstoreMongoDB")
49 43
	private MongoDatabase db;
50 44

  
......
66 60
			find_id += OBJECTSTORE_PROFILE_SUFFIX;
67 61
		}
68 62

  
69
		MongoCollection<DBObject> coll = getDb().getCollection(OBJECTSTORE_METADATA_NAME_FIELD, DBObject.class);
63
		MongoCollection<DBObject> metadataObjectStore = getDb().getCollection(OBJECTSTORE_METADATA_NAME_FIELD, DBObject.class);
70 64
		Bson query = Filters.eq(OBJECTSTORE_ID_FIELD, find_id);
71
		log.debug("QUERY :"+query.toString());
72
		DBObject resultQuery = coll.find(query).first();
73
		log.debug("result "+resultQuery);
65
		log.debug("QUERY :" + query.toString());
66
		DBObject resultQuery = metadataObjectStore.find(query).first();
67
		log.debug("result " + resultQuery);
74 68
		if ((resultQuery == null)) throw new ObjectStoreFileNotFoundException("the objectStore with identifier: "+obsId+" was not found");
75 69

  
76 70
		final String basePath = resultQuery.get(BASE_PATH_FIELD).toString();
......
128 122
			coll.insertOne(obj);
129 123
			MongoCollection<DBObject> objectStore = getDb().getCollection(currentObsId, DBObject.class);
130 124
			objectStore.createIndex(new BasicDBObject("id", 1));
125
			objectStore.createIndex(new BasicDBObject("timestamp", 1));
131 126
			return true;
132 127
		} catch (Throwable e) {
133 128
			throw new ObjectStoreServiceException("Can't Create the object Store id: '" + obsId, e);

Also available in: Unified diff