This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 42002f3 Fix the json deserialization issue in ColumnPartitionMetadata
(#3703)
42002f3 is described below
commit 42002f3a9e16571fcbc273b896198edca828af4b
Author: Xiaotian (Jackie) Jiang <[email protected]>
AuthorDate: Wed Jan 16 18:54:32 2019 -0800
Fix the json deserialization issue in ColumnPartitionMetadata (#3703)
For old jackson version (2.8.3), JsonDeserialize annotation on fields are
not picked up correctly when we use parameterized constructor
Moving the annotation from field into the constructor fixes the issue
Also change jackson version from 2.9.6 to 2.8.3 to be compatible with jersey
---
.../common/metadata/segment/ColumnPartitionMetadata.java | 16 +++++++---------
pom.xml | 3 ++-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/ColumnPartitionMetadata.java
b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/ColumnPartitionMetadata.java
index 11e408f..86f4be5 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/ColumnPartitionMetadata.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/ColumnPartitionMetadata.java
@@ -30,7 +30,7 @@ import
com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.io.IOException;
import java.util.List;
-import javax.annotation.Nonnull;
+import java.util.Objects;
import org.apache.commons.lang.math.IntRange;
import org.apache.pinot.common.config.ColumnPartitionConfig;
import org.apache.pinot.common.utils.EqualityUtils;
@@ -47,9 +47,6 @@ import org.apache.pinot.common.utils.EqualityUtils;
@JsonIgnoreProperties(ignoreUnknown = true)
public class ColumnPartitionMetadata extends ColumnPartitionConfig {
- @JsonSerialize(using = PartitionRangesSerializer.class)
- @JsonDeserialize(using = PartitionRangesDeserializer.class)
- @JsonProperty("partitionRanges")
private final List<IntRange> _partitionRanges;
/**
@@ -58,9 +55,9 @@ public class ColumnPartitionMetadata extends
ColumnPartitionConfig {
* @param numPartitions Number of partitions for this column.
* @param partitionRanges Partition ranges for the column.
*/
- public ColumnPartitionMetadata(@Nonnull @JsonProperty("functionName") String
functionName,
+ public ColumnPartitionMetadata(@JsonProperty("functionName") String
functionName,
@JsonProperty("numPartitions") int numPartitions,
- @JsonProperty("partitionRanges") List<IntRange> partitionRanges) {
+ @JsonProperty("partitionRanges") @JsonDeserialize(using =
PartitionRangesDeserializer.class) List<IntRange> partitionRanges) {
super(functionName, numPartitions);
_partitionRanges = partitionRanges;
}
@@ -70,6 +67,7 @@ public class ColumnPartitionMetadata extends
ColumnPartitionConfig {
*
* @return List of partition ranges.
*/
+ @JsonSerialize(using = PartitionRangesSerializer.class)
public List<IntRange> getPartitionRanges() {
return _partitionRanges;
}
@@ -84,8 +82,7 @@ public class ColumnPartitionMetadata extends
ColumnPartitionConfig {
}
ColumnPartitionMetadata that = (ColumnPartitionMetadata) o;
- return super.equals(that) && (_partitionRanges != null ?
_partitionRanges.equals(that._partitionRanges)
- : that._partitionRanges == null);
+ return super.equals(that) && Objects.equals(_partitionRanges,
that._partitionRanges);
}
@Override
@@ -112,7 +109,8 @@ public class ColumnPartitionMetadata extends
ColumnPartitionConfig {
public static class PartitionRangesDeserializer extends
JsonDeserializer<List<IntRange>> {
@Override
- public List<IntRange> deserialize(JsonParser jsonParser,
DeserializationContext context) throws IOException {
+ public List<IntRange> deserialize(JsonParser jsonParser,
DeserializationContext context)
+ throws IOException {
return ColumnPartitionConfig.rangesFromString(jsonParser.getText());
}
}
diff --git a/pom.xml b/pom.xml
index 6c7cc54..89f41c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,8 @@
<!-- jfim: for Kafka 0.9.0.0, use zkclient 0.7 -->
<kafka.version>0.9.0.1</kafka.version>
<zkclient.version>0.7</zkclient.version>
- <jackson.version>2.9.6</jackson.version>
+ <!-- TODO: bump up the jackson version once we update jersey version to
2.28 or later -->
+ <jackson.version>2.8.3</jackson.version>
<async-http-client.version>1.9.21</async-http-client.version>
<jersey.version>2.23</jersey.version>
<swagger.version>1.5.10</swagger.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
