Merge branch 'refs/heads/develop' into sketch-based-optimizer-4-new-unified-planners-and-optimizers2

# Conflicts:
#	.gitignore
#	core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/ArrayBindingSet.java
#	core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbSailStore.java
#	core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbStore.java
#	core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java

Author: hmottestad

compliance/solr/pom.xml

@@ -84,7 +84,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
 
 /**
  * A {@link SPARQLProtocolSession} subclass which extends the standard SPARQL 1.1 Protocol with additional

core/http/client/src/main/java/org/eclipse/rdf4j/http/client/RDF4JProtocolSession.java

@@ -25,12 +25,14 @@
 			<artifactId>jackson-annotations</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
+			<groupId>tools.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
+			<version>${jackson3.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
+			<groupId>tools.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
+			<version>${jackson3.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

core/query/pom.xml

@@ -15,8 +15,9 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 /**
  * This is an experimental feature. It may be changed, moved or potentially removed in a future release.
@@ -37,7 +38,12 @@ public ExplanationImpl(GenericPlanNode genericPlanNode, boolean timedOut, Object
 		}
 	}
 
-	ObjectMapper objectMapper = new ObjectMapper();
+	ObjectMapper objectMapper = JsonMapper.builder()
+			.changeDefaultVisibility(vc -> vc
+					.withVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY)
+					.withVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.NONE))
+			.changeDefaultPropertyInclusion(incl -> incl.withValueInclusion(JsonInclude.Include.NON_NULL))
+			.build();
 
 	@Override
 	public Object tupleExpr() {
@@ -51,16 +57,10 @@ public GenericPlanNode toGenericPlanNode() {
 
 	@Override
 	public String toJson() {
-		try {
-			// TODO: Consider removing pretty printer
-			return this.objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY)
-					.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.NONE)
-					.setSerializationInclusion(JsonInclude.Include.NON_NULL)
-					.writerWithDefaultPrettyPrinter()
-					.writeValueAsString(toGenericPlanNode());
-		} catch (JsonProcessingException e) {
-			throw new RuntimeException(e);
-		}
+		// TODO: Consider removing pretty printer
+		return this.objectMapper
+				.writerWithDefaultPrettyPrinter()
+				.writeValueAsString(toGenericPlanNode());
 	}
 
 	@Override

core/query/src/main/java/org/eclipse/rdf4j/query/explanation/ExplanationImpl.java

@@ -143,7 +143,10 @@ public ArrayBindingSet(ArrayBindingSet toCopy, String[] names,
 		this.sharedSortedBindingNamesCache = sharedSortedBindingNamesCache;
 		this.empty = toCopy.empty;
 		this.cachedSize = toCopy.cachedSize;
-		this.activeBindingMask = toCopy.activeBindingMask;
+		if (sharedSortedBindingNamesCache != null) {
+			this.activeBindingMask = toCopy.bindingNames == names ? toCopy.activeBindingMask
+					: calculateActiveBindingMask();
+		}
 		assert !this.empty || size() == 0;
 	}
 

core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/ArrayBindingSet.java

@@ -26,8 +26,9 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
+			<groupId>tools.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
+			<version>${jackson3.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>