You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2022/11/28 19:24:15 UTC
[calcite] branch main updated: [CALCITE-5374] Upgrade jackson to 2.14.0
This is an automated email from the ASF dual-hosted git repository.
jhyde pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new 601ef7b80b [CALCITE-5374] Upgrade jackson to 2.14.0
601ef7b80b is described below
commit 601ef7b80babd4e686d7c2bd4772b8f914b495a8
Author: Sergey Nuyanzin <sn...@gmail.com>
AuthorDate: Sat Nov 12 21:02:14 2022 +0100
[CALCITE-5374] Upgrade jackson to 2.14.0
---
.../calcite/adapter/elasticsearch/ElasticsearchAggregate.java | 2 +-
.../calcite/adapter/elasticsearch/ElasticsearchTable.java | 10 +++++-----
.../adapter/elasticsearch/EmbeddedElasticsearchPolicy.java | 7 ++++---
.../apache/calcite/adapter/elasticsearch/ScrollingTest.java | 3 ++-
.../java/org/apache/calcite/test/ElasticsearchChecker.java | 2 +-
gradle.properties | 4 ++--
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchAggregate.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchAggregate.java
index e3751f91e8..486d7d9a99 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchAggregate.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchAggregate.java
@@ -141,7 +141,7 @@ public class ElasticsearchAggregate extends Aggregate implements ElasticsearchRe
}
final ObjectNode aggregation = mapper.createObjectNode();
- final ObjectNode field = aggregation.with(toElasticAggregate(aggCall));
+ final ObjectNode field = aggregation.withObject("/" + toElasticAggregate(aggCall));
final String name = names.isEmpty() ? ElasticsearchConstants.ID : names.get(0);
field.put("field", implementor.expressionItemMap.getOrDefault(name, name));
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java
index ce0cb24d43..ec0f1ea8c5 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java
@@ -205,13 +205,13 @@ public class ElasticsearchTable extends AbstractQueryableTable implements Transl
orderedGroupBy.addAll(groupBy);
// construct nested aggregations node(s)
- ObjectNode parent = query.with(AGGREGATIONS);
+ ObjectNode parent = query.withObject("/" + AGGREGATIONS);
for (String name: orderedGroupBy) {
final String aggName = "g_" + name;
fieldMap.put(aggName, name);
- final ObjectNode section = parent.with(aggName);
- final ObjectNode terms = section.with("terms");
+ final ObjectNode section = parent.withObject("/" + aggName);
+ final ObjectNode terms = section.withObject("/terms");
terms.put("field", name);
transport.mapping.missingValueFor(name).ifPresent(m -> {
@@ -225,10 +225,10 @@ public class ElasticsearchTable extends AbstractQueryableTable implements Transl
sort.stream().filter(e -> e.getKey().equals(name)).findAny()
.ifPresent(s ->
- terms.with("order")
+ terms.withObject("/order")
.put("_key", s.getValue().isDescending() ? "desc" : "asc"));
- parent = section.with(AGGREGATIONS);
+ parent = section.withObject("/" + AGGREGATIONS);
}
// simple version for queries like "select count(*), max(col1) from table" (no GROUP BY cols)
diff --git a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java
index e89af6c2e8..6be0205557 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchPolicy.java
@@ -114,7 +114,8 @@ class EmbeddedElasticsearchPolicy {
ObjectNode mappings = mapper().createObjectNode();
- ObjectNode properties = mappings.with("mappings").with("properties");
+ ObjectNode properties = mappings.withObject("/mappings")
+ .withObject("/properties");
for (Map.Entry<String, String> entry: mapping.entrySet()) {
applyMapping(properties, entry.getKey(), entry.getValue());
}
@@ -139,9 +140,9 @@ class EmbeddedElasticsearchPolicy {
if (index > -1) {
String prefix = key.substring(0, index);
String suffix = key.substring(index + 1, key.length());
- applyMapping(parent.with(prefix).with("properties"), suffix, type);
+ applyMapping(parent.withObject("/" + prefix).withObject("/properties"), suffix, type);
} else {
- parent.with(key).put("type", type);
+ parent.withObject("/" + key).put("type", type);
}
}
diff --git a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/ScrollingTest.java b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/ScrollingTest.java
index a280506b67..63205551cc 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/ScrollingTest.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/ScrollingTest.java
@@ -108,7 +108,8 @@ class ScrollingTest {
try (InputStream is = response.getEntity().getContent()) {
final ObjectNode node = NODE.mapper().readValue(is, ObjectNode.class);
final String path = "/indices/search/scroll_current";
- final JsonNode scrollCurrent = node.with("nodes").elements().next().at(path);
+ final JsonNode scrollCurrent =
+ node.get("nodes").elements().next().at(path);
if (scrollCurrent.isMissingNode()) {
throw new IllegalStateException("Couldn't find node at " + path);
}
diff --git a/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchChecker.java b/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchChecker.java
index 14174f33a7..7e67020e91 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchChecker.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchChecker.java
@@ -113,7 +113,7 @@ public class ElasticsearchChecker {
final String[] names = property.split("\\.");
ObjectNode copy2 = copy;
for (int i = 0; i < names.length - 1; i++) {
- copy2 = copy2.with(names[i]);
+ copy2 = copy2.withObject("/" + names[i]);
}
copy2.set(names[names.length - 1], expandDots(node));
});
diff --git a/gradle.properties b/gradle.properties
index d4fe87bde3..d03a0f92b2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -114,8 +114,8 @@ httpcore.version=4.4.11
hydromatic.tpcds.version=0.4
immutables.version=2.8.8
innodb-java-reader.version=1.0.10
-jackson-databind.version=2.13.4.2
-jackson.version=2.13.4
+jackson-databind.version=2.14.0
+jackson.version=2.14.0
janino.version=3.1.8
java-diff.version=1.1.2
jcip-annotations.version=1.0-1