Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

when collecting index definitions, look at the parent classes as well… #1102

Closed
wants to merge 3 commits into from
Closed

when collecting index definitions, look at the parent classes as well… #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95cb7e3
when collecting index definitions, look at the parent classes as well…
Dec 7, 2016
c2643d6
re-inline this variable now that I'm done debugging
Dec 7, 2016
ccb2d9e
restore count check to catch missing (as opposed to extra) index defi…
Dec 8, 2016
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
48 changes: 27 additions & 21 deletions morphia/src/main/java/org/mongodb/morphia/IndexHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,29 +189,33 @@ private List<Index> collectNestedIndexes(final MappedClass mc, final List<Mapped

private List<Index> collectTopLevelIndexes(final MappedClass mc) {
List<Index> list = new ArrayList<Index>();
final List<Indexes> annotations = mc.getAnnotations(Indexes.class);
if (annotations != null) {
for (final Indexes indexes : annotations) {
for (final Index index : indexes.value()) {
Index updated = index;
if (index.fields().length == 0) {
LOG.warning(format("This index on '%s' is using deprecated configuration options. Please update to use the "
+ "fields value on @Index: %s", mc.getClazz().getName(), index.toString()));
updated = new IndexBuilder()
.migrate(index);
}
List<Field> fields = new ArrayList<Field>();
for (Field field : updated.fields()) {
fields.add(new FieldBuilder()
.value(findField(mc, index.options(), asList(field.value().split("\\."))))
.type(field.type())
.weight(field.weight()));
}
if (mc != null) {
final List<Indexes> annotations = mc.getAnnotations(Indexes.class);
if (annotations != null) {
for (final Indexes indexes : annotations) {
for (final Index index : indexes.value()) {
Index updated = index;
if (index.fields().length == 0) {
LOG.warning(format("This index on '%s' is using deprecated configuration options. Please update to use the "
+ "fields value on @Index: %s", mc.getClazz().getName(), index.toString()));
updated = new IndexBuilder()
.migrate(index);
}
List<Field> fields = new ArrayList<Field>();
for (Field field : updated.fields()) {
fields.add(new FieldBuilder()
.value(findField(mc, index.options(), asList(field.value().split("\\."))))
.type(field.type())
.weight(field.weight()));
}

list.add(replaceFields(updated, fields));
list.add(replaceFields(updated, fields));
}
}
}
list.addAll(collectTopLevelIndexes(mc.getSuperClass()));
}

return list;
}

Expand Down Expand Up @@ -359,8 +363,10 @@ String findField(final MappedClass mc, final IndexOptions options, final List<St
}

void createIndex(final MongoCollection collection, final MappedClass mc, final boolean background) {
for (Index index : collectIndexes(mc, Collections.<MappedClass>emptyList())) {
createIndex(collection, mc, index, background);
if (!mc.isInterface() && !mc.isAbstract()) {
for (Index index : collectIndexes(mc, Collections.<MappedClass>emptyList())) {
createIndex(collection, mc, index, background);
}
}
}

Expand Down
21 changes: 21 additions & 0 deletions morphia/src/main/java/org/mongodb/morphia/mapping/MappedClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,17 @@ public MappedClass(final Class<?> clazz, final Mapper mapper) {
}
}

/**
* This is an internal method subject to change without notice.
*
* @return the parent class of this type if there is one null otherwise
*
* @since 1.3
*/
public MappedClass getSuperClass() {
return superClass;
}


/**
* @return true if the MappedClass is an interface
Expand All @@ -156,6 +167,16 @@ public boolean isInterface() {
return clazz.isInterface();
}

/**
* This is an internal method subject to change without notice.
*
* @return true if the MappedClass is abstract
* @since 1.3
*/
public boolean isAbstract() {
return Modifier.isAbstract(clazz.getModifiers());
}

/**
* Checks to see if it a Map/Set/List or a property supported by the MongoDB java driver
*
Expand Down
39 changes: 24 additions & 15 deletions morphia/src/test/java/org/mongodb/morphia/IndexHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
import org.mongodb.morphia.annotations.IndexOptions;
import org.mongodb.morphia.annotations.Indexed;
import org.mongodb.morphia.annotations.Indexes;
import org.mongodb.morphia.annotations.Property;
import org.mongodb.morphia.annotations.Text;
import org.mongodb.morphia.mapping.MappedClass;
import org.mongodb.morphia.mapping.Mapper;
import org.mongodb.morphia.mapping.MappingException;
import org.mongodb.morphia.utils.IndexDirection;
import org.mongodb.morphia.utils.IndexType;
Expand All @@ -64,7 +64,7 @@ public class IndexHelperTest extends TestBase {

@Before
public void before() {
getMorphia().map(IndexedClass.class, NestedClass.class, NestedClassImpl.class);
getMorphia().map(AbstractParent.class, IndexedClass.class, NestedClass.class, NestedClassImpl.class);
}

@Test
Expand Down Expand Up @@ -109,13 +109,14 @@ public void calculateKeys() {
@Test
public void createIndex() {
checkMinServerVersion(3.4);
MongoCollection<Document> collection = getDatabase().getCollection("indexes");
MappedClass mappedClass = getMorphia().getMapper().getMappedClass(IndexedClass.class);
String collectionName = getDs().getCollection(IndexedClass.class).getName();
MongoCollection<Document> collection = getDatabase().getCollection(collectionName);
Mapper mapper = getMorphia().getMapper();

indexHelper.createIndex(collection, mappedClass, false);
indexHelper.createIndex(collection, mapper.getMappedClass(IndexedClass.class), false);
List<DBObject> indexInfo = getDs().getCollection(IndexedClass.class)
.getIndexInfo();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come this check was removed - shouldn't there be a fixed number of indexes?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well my initial thought was we'd catch any extra indexes in the loop but that won't catch missing indexes so I'll restore that check.

assertEquals("Should have 5 indexes", 5, indexInfo.size());
assertEquals("Should have 6 indexes", 6, indexInfo.size());
for (DBObject dbObject : indexInfo) {
String name = dbObject.get("name").toString();
if (name.equals("latitude_1")) {
Expand All @@ -129,22 +130,27 @@ public void createIndex() {
assertEquals(parse("{ 'nest.name' : 1} "), dbObject.get("key"));
} else if (name.equals("searchme")) {
assertEquals(parse("{ 'text' : 10 }"), dbObject.get("weights"));
} else if (name.equals("indexName_1")) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checkstyle probably is complaining about the "

assertEquals(parse("{'indexName': 1 }"), dbObject.get("key"));
} else {
if (!"_id_".equals(dbObject.get("name"))) {
throw new MappingException("Found an index I wasn't expecting: " + dbObject);
}
}

}

collection = getDatabase().getCollection(getDs().getCollection(AbstractParent.class).getName());
indexHelper.createIndex(collection, mapper.getMappedClass(AbstractParent.class), false);
indexInfo = getDs().getCollection(AbstractParent.class).getIndexInfo();
assertTrue("Shouldn't find any indexes: " + indexInfo, indexInfo.isEmpty());

}

@Test
public void findField() {
MappedClass mappedClass = getMorphia().getMapper().getMappedClass(IndexedClass.class);

assertEquals("name", indexHelper.findField(mappedClass, new IndexOptionsBuilder(), singletonList("indexName")));
assertEquals("name", indexHelper.findField(mappedClass, new IndexOptionsBuilder(), singletonList("name")));
assertEquals("indexName", indexHelper.findField(mappedClass, new IndexOptionsBuilder(), singletonList("indexName")));
assertEquals("nest.name", indexHelper.findField(mappedClass, new IndexOptionsBuilder(), asList("nested", "name")));
assertEquals("nest.name", indexHelper.findField(mappedClass, new IndexOptionsBuilder(), asList("nest", "name")));

Expand Down Expand Up @@ -254,7 +260,7 @@ public void oldIndexForm() {
List<DBObject> indexInfo = getDs().getCollection(IndexedClass.class)
.getIndexInfo();
for (DBObject dbObject : indexInfo) {
if (dbObject.get("name").equals("index_name")) {
if (dbObject.get("name").equals("index_indexName")) {
checkIndex(dbObject);
}
}
Expand Down Expand Up @@ -454,13 +460,9 @@ private interface NestedClass {

@Entity("indexes")
@Indexes(@Index(fields = @Field("latitude")))
private static class IndexedClass {
@Id
private ObjectId id;
private static class IndexedClass extends AbstractParent {
@Text(value = 10, options = @IndexOptions(name = "searchme"))
private String text;
@Property("name")
private double indexName;
private double latitude;
@Embedded("nest")
private NestedClass nested;
Expand All @@ -474,4 +476,11 @@ private static class NestedClassImpl implements NestedClass {
@Indexed
private String name;
}

@Indexes(@Index(fields = @Field("indexName")))
private abstract static class AbstractParent {
@Id
private ObjectId id;
private double indexName;
}
}