-
Notifications
You must be signed in to change notification settings - Fork 872
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
244 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
lucene/src/main/java/com/orientechnologies/lucene/collections/OLuceneResultSetEmpty.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * | ||
| * * Copyright 2010-2016 OrientDB LTD (http://orientdb.com) | ||
| * * | ||
| * * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * * you may not use this file except in compliance with the License. | ||
| * * You may obtain a copy of the License at | ||
| * * | ||
| * * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * * | ||
| * * Unless required by applicable law or agreed to in writing, software | ||
| * * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * * See the License for the specific language governing permissions and | ||
| * * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package com.orientechnologies.lucene.collections; | ||
|
|
||
| import com.orientechnologies.common.exception.OException; | ||
| import com.orientechnologies.common.log.OLogManager; | ||
| import com.orientechnologies.lucene.engine.OLuceneIndexEngine; | ||
| import com.orientechnologies.lucene.engine.OLuceneIndexEngineAbstract; | ||
| import com.orientechnologies.lucene.engine.OLuceneIndexEngineUtils; | ||
| import com.orientechnologies.lucene.exception.OLuceneIndexException; | ||
| import com.orientechnologies.lucene.query.OLuceneQueryContext; | ||
| import com.orientechnologies.lucene.tx.OLuceneTxChangesAbstract; | ||
| import com.orientechnologies.orient.core.command.OCommandContext; | ||
| import com.orientechnologies.orient.core.db.record.OIdentifiable; | ||
| import com.orientechnologies.orient.core.id.OContextualRecordId; | ||
| import com.orientechnologies.orient.core.record.impl.ODocument; | ||
| import org.apache.lucene.analysis.TokenStream; | ||
| import org.apache.lucene.document.Document; | ||
| import org.apache.lucene.index.IndexReader; | ||
| import org.apache.lucene.search.IndexSearcher; | ||
| import org.apache.lucene.search.Query; | ||
| import org.apache.lucene.search.ScoreDoc; | ||
| import org.apache.lucene.search.TopDocs; | ||
| import org.apache.lucene.search.highlight.Formatter; | ||
| import org.apache.lucene.search.highlight.*; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.*; | ||
|
|
||
| /** | ||
| * Created by Enrico Risa on 16/09/15. | ||
| */ | ||
| public class OLuceneResultSetEmpty extends OLuceneResultSet { | ||
|
|
||
| public OLuceneResultSetEmpty() { | ||
| super(); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<OIdentifiable> iterator() { | ||
| return Collections.emptyIterator(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
lucene/src/test/java/com/orientechnologies/spatial/LuceneSpatialQueryIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /** | ||
| * Copyright 2010-2016 OrientDB LTD (http://orientdb.com) | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" | ||
| * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language | ||
| * governing permissions and limitations under the License. | ||
| * <p> | ||
| * For more information: http://www.orientdb.com | ||
| */ | ||
| package com.orientechnologies.spatial; | ||
|
|
||
| import com.orientechnologies.common.log.OLogManager; | ||
| import com.orientechnologies.lucene.test.BaseLuceneTest; | ||
| import com.orientechnologies.orient.core.Orient; | ||
| import com.orientechnologies.orient.core.exception.OCommandExecutionException; | ||
| import com.orientechnologies.orient.core.intent.OIntentMassiveInsert; | ||
| import com.orientechnologies.orient.core.metadata.schema.OClass; | ||
| import com.orientechnologies.orient.core.metadata.schema.OSchema; | ||
| import com.orientechnologies.orient.core.metadata.schema.OType; | ||
| import com.orientechnologies.orient.core.record.impl.ODocument; | ||
| import com.orientechnologies.orient.core.sql.OCommandSQL; | ||
| import com.orientechnologies.orient.core.sql.executor.OResultSet; | ||
| import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Ignore; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.File; | ||
| import java.io.InputStream; | ||
| import java.io.InputStreamReader; | ||
| import java.io.LineNumberReader; | ||
| import java.util.Enumeration; | ||
| import java.util.List; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.zip.ZipEntry; | ||
| import java.util.zip.ZipFile; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** | ||
| * Created by Enrico Risa on 02/10/14. | ||
| */ | ||
| public class LuceneSpatialQueryIntegrationTest extends BaseLuceneTest { | ||
|
|
||
| @Test | ||
| public void testIssueGH9105() { | ||
|
|
||
| db.command("create class Country extends V").close(); | ||
| db.command("create property Country.name STRING").close(); | ||
| db.command("create property Country.geometry EMBEDDED OMultiPolygon").close(); | ||
| db.command("create class POI extends V").close(); | ||
| db.command("create property POI.name STRING").close(); | ||
| db.command("create property POI.location EMBEDDED OPoint").close(); | ||
| db.command("insert into POI(name, location) values(\"zeropoint\", St_GeomFromText(\"Point(0 0)\"))").close(); | ||
| db.command( | ||
| "insert into Country(name, geometry) values(\"zeroland\", St_GeomFromText(\"MultiPolygon(((1 1, 1 -1, -1 -1, -1 1, 1 1)))\"))") | ||
| .close(); | ||
| db.command("CREATE INDEX POI.location ON POI(location) SPATIAL ENGINE LUCENE"); | ||
| db.command("CREATE INDEX Country.geometry ON Country(geometry) SPATIAL ENGINE LUCENE;"); | ||
|
|
||
| try (OResultSet resultSet = db.query( | ||
| "select name from Country let locations = (select from Poi) where ST_Contains(geometry, $locations[0].location) = true")) { | ||
|
|
||
| assertThat(resultSet.stream().count()).isEqualTo(1); | ||
| } | ||
|
|
||
| try (OResultSet resultSet = db | ||
| .query("select name from Country where ST_Contains(geometry, (select location from POI)) = true;")) { | ||
|
|
||
| assertThat(resultSet.stream().count()).isEqualTo(1); | ||
| } | ||
|
|
||
| try (OResultSet resultSet = db | ||
| .query("select name from Country where ST_Contains(geometry, (select name,location from POI)) = true;")) { | ||
|
|
||
| assertThat(resultSet.stream().count()).isEqualTo(0); | ||
| } | ||
|
|
||
| db.command("insert into POI(name, location) values(\"zeropoint\", St_GeomFromText(\"Point(0 0)\"))").close(); | ||
|
|
||
| try (OResultSet resultSet = db | ||
| .query("select name from Country where ST_Contains(geometry, (select location from POI)) = true;")) { | ||
|
|
||
| Assert.fail("It should throw an exception"); | ||
| } catch (Exception e) { | ||
| Assert.assertTrue(e instanceof OCommandExecutionException); | ||
| } | ||
|
|
||
| db.command("delete vertex Poi").close(); | ||
|
|
||
| try (OResultSet resultSet = db | ||
| .query("select name from Country where ST_Contains(geometry, (select location from POI)) = true;")) { | ||
|
|
||
| assertThat(resultSet.stream().count()).isEqualTo(0); | ||
| } | ||
|
|
||
| } | ||
| } |