wgtmac commented on code in PR #532: URL: https://github.com/apache/iceberg-cpp/pull/532#discussion_r2730129553
########## src/iceberg/expression/json_serde_internal.h: ########## @@ -0,0 +1,51 @@ +/* + * 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. + */ + +#pragma once + +#include <nlohmann/json_fwd.hpp> + +#include "iceberg/expression/expression.h" +#include "iceberg/iceberg_export.h" +#include "iceberg/result.h" + +/// \file iceberg/expression/json_internal.h Review Comment: Let's keep the comment in sync ########## src/iceberg/expression/json_serde_internal.h: ########## @@ -0,0 +1,51 @@ +/* + * 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. + */ + +#pragma once + +#include <nlohmann/json_fwd.hpp> + +#include "iceberg/expression/expression.h" +#include "iceberg/iceberg_export.h" +#include "iceberg/result.h" + +/// \file iceberg/expression/json_internal.h +/// JSON serialization and deserialization for expressions. + +namespace iceberg { + +template <typename Model> +Result<Model> FromJson(const nlohmann::json& json); + +#define ICEBERG_DECLARE_JSON_SERDE(Model) \ + ICEBERG_EXPORT Result<std::shared_ptr<Model>> Model##FromJson( \ + const nlohmann::json& json); \ + \ + template <typename Model> \ + ICEBERG_EXPORT Result<std::shared_ptr<Model>> FromJson(const nlohmann::json& json); \ + \ + ICEBERG_EXPORT nlohmann::json ToJson(const Model& model); + +/// \note Don't forget to add `ICEBERG_DEFINE_FROM_JSON` to the end of +/// `json_internal.cc` to define the `FromJson` function for the model. Review Comment: ditto ########## src/iceberg/expression/json_serde.cc: ########## @@ -0,0 +1,64 @@ +/* + * 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. + */ + +#include <format> +#include <string> +#include <utility> +#include <vector> + +#include <nlohmann/json.hpp> + +#include "iceberg/expression/expressions.h" +#include "iceberg/expression/json_serde_internal.h" +#include "iceberg/expression/literal.h" +#include "iceberg/util/json_util_internal.h" +#include "iceberg/util/macros.h" + +namespace iceberg { + +Result<std::shared_ptr<Expression>> ExpressionFromJson(const nlohmann::json& json) { + // Handle boolean + if (json.is_boolean()) { + return json.get<bool>() ? std::static_pointer_cast<Expression>(True::Instance()) Review Comment: nit: use checked_pointer_cast ########## src/iceberg/CMakeLists.txt: ########## @@ -31,6 +31,7 @@ set(ICEBERG_SOURCES expression/expression.cc expression/expressions.cc expression/inclusive_metrics_evaluator.cc + expression/json_serde.cc Review Comment: We also need to update `meson.build` for any new file. ########## src/iceberg/test/expression_json_test.cc: ########## @@ -0,0 +1,68 @@ +/* + * 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. + */ + +#include <memory> +#include <vector> + +#include <gmock/gmock.h> +#include <gtest/gtest.h> +#include <nlohmann/json.hpp> + +#include "iceberg/expression/expression.h" +#include "iceberg/expression/expressions.h" +#include "iceberg/expression/json_serde_internal.h" +#include "iceberg/expression/literal.h" +#include "iceberg/expression/predicate.h" +#include "iceberg/expression/term.h" +#include "iceberg/test/matchers.h" + +namespace iceberg { + +class ExpressionJsonTest : public ::testing::Test {}; + +// Test boolean constant expressions +TEST_F(ExpressionJsonTest, TrueExpression) { + auto expr = True::Instance(); + auto json = ToJson(*expr); + + // True should serialize as JSON boolean true + EXPECT_TRUE(json.is_boolean()); + EXPECT_TRUE(json.get<bool>()); + + // Parse back + auto result = ExpressionFromJson(json); + ASSERT_THAT(result, IsOk()); + EXPECT_EQ(result.value()->op(), Expression::Operation::kTrue); +} + +TEST_F(ExpressionJsonTest, FalseExpression) { Review Comment: These two cases share a lot of similarities. Can we use a single test? ########## src/iceberg/test/CMakeLists.txt: ########## @@ -88,6 +88,7 @@ add_iceberg_test(table_test add_iceberg_test(expression_test SOURCES aggregate_test.cc + expression_json_test.cc Review Comment: Same comment for `meson.build` -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
