elasticstore and lmdb fixes

Author: SarahGrand

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().toString()));
 				}
 			}
 		}
@@ -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().toString());
 			}
 		}
 		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;
 	}