You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by GitBox <gi...@apache.org> on 2022/04/21 18:23:30 UTC
[GitHub] [pinot] Jackie-Jiang commented on a diff in pull request #8514: Indicate what fields are getting ignored when adding configs
Jackie-Jiang commented on code in PR #8514:
URL: https://github.com/apache/pinot/pull/8514#discussion_r855453394
##########
pinot-spi/src/test/java/org/apache/pinot/spi/utils/TestClass.java:
##########
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.spi.utils;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TestClass {
+ int _primitiveIntegerField;
+ String _stringField;
+ Long _longField;
+ Klass _classField;
Review Comment:
(minor) I think we use `Clazz` in most of the places
##########
pinot-spi/src/main/java/org/apache/pinot/spi/utils/JsonUtils.java:
##########
@@ -71,12 +88,53 @@ private JsonUtils() {
public static final ObjectReader DEFAULT_READER = DEFAULT_MAPPER.reader();
public static final ObjectWriter DEFAULT_WRITER = DEFAULT_MAPPER.writer();
public static final ObjectWriter DEFAULT_PRETTY_WRITER = DEFAULT_MAPPER.writerWithDefaultPrettyPrinter();
+ private static final TypeReference<HashMap<String, Object>> GENERIC_JSON_TYPE =
+ new TypeReference<HashMap<String, Object>>() { };
public static <T> T stringToObject(String jsonString, Class<T> valueType)
throws IOException {
return DEFAULT_READER.forType(valueType).readValue(jsonString);
}
+ public static <T> JsonPojoWithUnparsableProps<T> stringToObjectAndUnparseableProps(String jsonString, Class<T> klass)
Review Comment:
(optional) I feel returning a `Pair<T, Map<String, Object>>` should be enough
##########
pinot-spi/src/main/java/org/apache/pinot/spi/utils/JsonUtils.java:
##########
@@ -71,12 +88,53 @@ private JsonUtils() {
public static final ObjectReader DEFAULT_READER = DEFAULT_MAPPER.reader();
public static final ObjectWriter DEFAULT_WRITER = DEFAULT_MAPPER.writer();
public static final ObjectWriter DEFAULT_PRETTY_WRITER = DEFAULT_MAPPER.writerWithDefaultPrettyPrinter();
+ private static final TypeReference<HashMap<String, Object>> GENERIC_JSON_TYPE =
+ new TypeReference<HashMap<String, Object>>() { };
public static <T> T stringToObject(String jsonString, Class<T> valueType)
throws IOException {
return DEFAULT_READER.forType(valueType).readValue(jsonString);
}
+ public static <T> JsonPojoWithUnparsableProps<T> stringToObjectAndUnparseableProps(String jsonString, Class<T> klass)
Review Comment:
Name the second parameter `valueType` for consistency
##########
pinot-spi/src/main/java/org/apache/pinot/spi/utils/JsonUtils.java:
##########
@@ -71,12 +88,53 @@ private JsonUtils() {
public static final ObjectReader DEFAULT_READER = DEFAULT_MAPPER.reader();
public static final ObjectWriter DEFAULT_WRITER = DEFAULT_MAPPER.writer();
public static final ObjectWriter DEFAULT_PRETTY_WRITER = DEFAULT_MAPPER.writerWithDefaultPrettyPrinter();
+ private static final TypeReference<HashMap<String, Object>> GENERIC_JSON_TYPE =
+ new TypeReference<HashMap<String, Object>>() { };
public static <T> T stringToObject(String jsonString, Class<T> valueType)
throws IOException {
return DEFAULT_READER.forType(valueType).readValue(jsonString);
}
+ public static <T> JsonPojoWithUnparsableProps<T> stringToObjectAndUnparseableProps(String jsonString, Class<T> klass)
+ throws IOException {
+ T instance = DEFAULT_READER.forType(klass).readValue(jsonString);
+
+ String instanceJson = DEFAULT_MAPPER.writeValueAsString(instance);
+ Map<String, Object> inputJsonMap = flatten(DEFAULT_MAPPER.readValue(jsonString, GENERIC_JSON_TYPE));
+ Map<String, Object> instanceJsonMap = flatten(DEFAULT_MAPPER.readValue(instanceJson, GENERIC_JSON_TYPE));
+
+ MapDifference<String, Object> difference = Maps.difference(inputJsonMap, instanceJsonMap);
+ return new JsonPojoWithUnparsableProps<>(instance, difference.entriesOnlyOnLeft());
+ }
+
+ public static Map<String, Object> flatten(Map<String, Object> map) {
+ return map.entrySet().stream()
+ .flatMap(JsonUtils::flatten)
+ .collect(LinkedHashMap::new, (m, e) -> m.put("/" + e.getKey(), e.getValue()), LinkedHashMap::putAll);
+ }
+
+ private static Stream<Map.Entry<String, Object>> flatten(Map.Entry<String, Object> entry) {
+
Review Comment:
(nit) remove empty line
##########
pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ConfigSuccessResponse.java:
##########
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.controller.api.resources;
+
+import java.util.Map;
+
+public final class ConfigSuccessResponse extends SuccessResponse {
+ private final Map<String, Object> _unparseableProps;
Review Comment:
Suggest renaming the field, same for other places
```suggestion
private final Map<String, Object> _ unrecognizedProperties;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org