elasticsearch and lmdblit update

Author: SarahGrand

compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailTest.java

@@ -78,6 +78,11 @@ public void testTriplesStored() {
 		delegateTest.testTriplesStored();
 	}
 
+//	@Test
+//	public void testDLS() {
+//		delegateTest.testDirLangString();
+//	}
+
 	@Test
 	public void testRegularQuery() throws RepositoryException, MalformedQueryException, QueryEvaluationException {
 		delegateTest.testRegularQuery();

core/sail/elasticsearch-store/src/main/java/org/eclipse/rdf4j/sail/elasticsearchstore/ElasticsearchDataStructure.java

@@ -243,6 +243,8 @@ private QueryBuilder getQueryBuilder(Resource subject, IRI predicate, Value obje
 				if (((Literal) object).getLanguage().isPresent()) {
 					boolQueryBuilder
 							.must(QueryBuilders.termQuery("object_Lang", ((Literal) object).getLanguage().get()));
+					boolQueryBuilder
+							.must(QueryBuilders.termQuery("object_LangDir", ((Literal) object).getBaseDirection()));
 				}
 			}
 		}
@@ -450,7 +452,7 @@ private Map<String, Object> statementToJsonMap(ExtensibleStatement statement) {
 					((Literal) statement.getObject()).getDatatype().stringValue());
 			if (((Literal) statement.getObject()).getLanguage().isPresent()) {
 				jsonMap.put("object_Lang", ((Literal) statement.getObject()).getLanguage().get());
-
+				jsonMap.put("object_LangDir", ((Literal) statement.getObject()).getBaseDirection());
 			}
 		}
 		return jsonMap;
@@ -673,8 +675,8 @@ private static ExtensibleStatement sourceToStatement(Map<String, Object> sourceA
 			objectRes = vf.createBNode(objectString);
 		} else {
 			if (sourceAsMap.containsKey("object_Lang")) {
-				objectRes = vf.createLiteral(objectString, (String) sourceAsMap.get("object_Lang"));
-
+				objectRes = vf.createLiteral(objectString, (String) sourceAsMap.get("object_Lang"),
+						Literal.BaseDirection.fromString((String) sourceAsMap.get("object_LangDir")));
 			} else {
 				objectRes = vf.createLiteral(objectString,
 						vf.createIRI((String) sourceAsMap.get("object_Datatype")));

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/model/LmdbLiteral.java

@@ -98,7 +98,7 @@ public LmdbLiteral(ValueStoreRevision revision, String label, String language, B
 		} else {
 			setDatatype(CoreDatatype.RDF.LANGSTRING);
 		}
-		setInternalID(UNKNOWN_ID, revision);
+		setInternalID(internalID, revision);
 		this.initialized = true;
 	}
 

testsuites/lucene/src/main/java/org/eclipse/testsuite/rdf4j/sail/lucene/AbstractLuceneSailTest.java

@@ -37,6 +37,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Resource;
@@ -52,11 +53,15 @@
 import org.eclipse.rdf4j.query.QueryLanguage;
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.impl.EmptyBindingSet;
+import org.eclipse.rdf4j.query.parser.ParsedTupleQuery;
+import org.eclipse.rdf4j.query.parser.QueryParserUtil;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.repository.sail.SailRepository;
 import org.eclipse.rdf4j.repository.util.Repositories;
+import org.eclipse.rdf4j.sail.SailConnection;
 import org.eclipse.rdf4j.sail.lucene.LuceneSail;
 import org.eclipse.rdf4j.sail.lucene.LuceneSailSchema;
 import org.eclipse.rdf4j.sail.memory.MemoryStore;
@@ -180,6 +185,52 @@ public void testTriplesStored() {
 		}
 	}
 
+//	@Test
+//	public void testDirLangString() {
+//		try (final SailConnection con = sail.getConnection()) {
+//			con.begin();
+//
+//			IRI subj = vf.createIRI("http://s");
+//
+//			IRI pred = vf.createIRI("http://p");
+//			Literal obj = vf.createLiteral("o", "en", Literal.BaseDirection.LTR);
+//			con.addStatement(subj, pred, obj);
+//
+//			con.commit();
+//
+//			try (final CloseableIteration<? extends Statement> stIter = con.getStatements(null, null, null,
+//					false)) {
+//				assertTrue(stIter.hasNext());
+//
+//				Statement st = stIter.next();
+//				assertEquals(subj, st.getSubject());
+//				assertEquals(pred, st.getPredicate());
+//				assertEquals(obj, st.getObject());
+//				assertFalse(stIter.hasNext());
+//			}
+//
+//			ParsedTupleQuery tupleQuery = QueryParserUtil.parseTupleQuery(QueryLanguage.SPARQL,
+//					"SELECT * WHERE { ?S ?P ?O. FILTER(?P = <" + pred.stringValue() + ">)}", null);
+//
+//			CloseableIteration<? extends BindingSet> iter;
+//			iter = con.evaluate(tupleQuery.getTupleExpr(), null, EmptyBindingSet.getInstance(), false);
+//
+//			try {
+//				assertTrue(iter.hasNext());
+//
+//				BindingSet bindings = iter.next();
+//				assertEquals(subj, bindings.getValue("S"));
+//				assertEquals(pred, bindings.getValue("P"));
+//				assertEquals(obj, bindings.getValue("O"));
+//				assertTrue(!iter.hasNext());
+//			} finally {
+//				iter.close();
+//			}
+//		}
+////		assertTrue(connection.hasStatement(vf.createIRI("http://s"), vf.createIRI("http://p"), vf.createLiteral("o", "en", Literal.BaseDirection.LTR), false));
+//
+//	}
+
 	@Test
 	public void testRegularQuery() throws RepositoryException, MalformedQueryException, QueryEvaluationException {
 		try (RepositoryConnection connection = repository.getConnection()) {