From 0e65b22be2256b17c223b255101e3945576e02f3 Mon Sep 17 00:00:00 2001 From: Masha Basmanova Date: Thu, 21 Mar 2024 06:22:59 -0700 Subject: [PATCH] Back out "Deshim //folly:dynamic to //folly/json:dynamic in velox" (#9197) Summary: build-break Pull Request resolved: https://github.com/facebookincubator/velox/pull/9197 Original commit changeset: 9d060725cb74 Original Phabricator Diff: D53837586 Reviewed By: Yuhta Differential Revision: D55183554 fbshipit-source-id: 4eb49ddcb7199dba2edf691551f751918c28b8f2 --- pyvelox/pyvelox.h | 2 +- velox/common/io/IoStatistics.h | 2 +- velox/common/serialization/DeserializationRegistry.h | 2 +- velox/common/serialization/Serializable.h | 2 +- velox/common/serialization/tests/SerializableTest.cpp | 2 +- velox/dwio/dwrf/common/Config.cpp | 2 +- velox/dwio/dwrf/reader/FlatMapColumnReader.cpp | 2 +- velox/exec/PlanNodeStats.h | 2 +- velox/exec/fuzzer/PrestoQueryRunner.cpp | 2 +- velox/exec/tests/TableWriteTest.cpp | 2 +- velox/functions/prestosql/json/JsonExtractor.cpp | 2 +- velox/functions/prestosql/json/JsonExtractor.h | 2 +- velox/functions/prestosql/json/SIMDJsonExtractor.h | 2 +- velox/functions/prestosql/json/tests/JsonExtractorTest.cpp | 2 +- velox/functions/prestosql/json/tests/SIMDJsonExtractorTest.cpp | 2 +- velox/functions/prestosql/types/JsonType.cpp | 2 +- velox/type/HugeInt.h | 2 +- velox/type/StringView.h | 2 +- velox/type/Timestamp.h | 2 +- velox/type/Type.h | 2 +- velox/type/Variant.cpp | 2 +- velox/type/Variant.h | 2 +- velox/vector/BiasVector.h | 2 +- velox/vector/FlatVector.h | 2 +- velox/vector/tests/SimpleVectorTest.cpp | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pyvelox/pyvelox.h b/pyvelox/pyvelox.h index 0e0c85ce3330..f801c2fb3e48 100644 --- a/pyvelox/pyvelox.h +++ b/pyvelox/pyvelox.h @@ -33,7 +33,7 @@ #include #include #include -#include "folly/json/json.h" +#include "folly/json.h" #include "velox/vector/VariantToVector.h" #include "context.h" diff --git a/velox/common/io/IoStatistics.h b/velox/common/io/IoStatistics.h index e6f01f1e37cb..99936d408163 100644 --- a/velox/common/io/IoStatistics.h +++ b/velox/common/io/IoStatistics.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace facebook::velox::io { diff --git a/velox/common/serialization/DeserializationRegistry.h b/velox/common/serialization/DeserializationRegistry.h index 913c2c055530..78cbf41a9e26 100644 --- a/velox/common/serialization/DeserializationRegistry.h +++ b/velox/common/serialization/DeserializationRegistry.h @@ -18,8 +18,8 @@ #include #include #include "Registry.h" +#include "folly/dynamic.h" #include "folly/hash/Hash.h" -#include "folly/json/dynamic.h" namespace facebook { namespace velox { diff --git a/velox/common/serialization/Serializable.h b/velox/common/serialization/Serializable.h index da10c3eea360..cda8a4593f64 100644 --- a/velox/common/serialization/Serializable.h +++ b/velox/common/serialization/Serializable.h @@ -18,7 +18,7 @@ #include #include "folly/Optional.h" -#include "folly/json/json.h" +#include "folly/json.h" #include "velox/common/base/Exceptions.h" #include "velox/common/serialization/DeserializationRegistry.h" diff --git a/velox/common/serialization/tests/SerializableTest.cpp b/velox/common/serialization/tests/SerializableTest.cpp index e80ce0b86fbd..8ec543d2d262 100644 --- a/velox/common/serialization/tests/SerializableTest.cpp +++ b/velox/common/serialization/tests/SerializableTest.cpp @@ -16,7 +16,7 @@ #include "velox/common/serialization/Serializable.h" #include -#include "folly/json/json.h" +#include "folly/json.h" using namespace ::facebook::velox; diff --git a/velox/dwio/dwrf/common/Config.cpp b/velox/dwio/dwrf/common/Config.cpp index a137fc9dca25..cda606466b18 100644 --- a/velox/dwio/dwrf/common/Config.cpp +++ b/velox/dwio/dwrf/common/Config.cpp @@ -17,7 +17,7 @@ #include "velox/dwio/dwrf/common/Config.h" #include "folly/String.h" -#include "folly/json/dynamic.h" +#include "folly/dynamic.h" namespace facebook::velox::dwrf { diff --git a/velox/dwio/dwrf/reader/FlatMapColumnReader.cpp b/velox/dwio/dwrf/reader/FlatMapColumnReader.cpp index 36efa1bb564d..2e52f05081b8 100644 --- a/velox/dwio/dwrf/reader/FlatMapColumnReader.cpp +++ b/velox/dwio/dwrf/reader/FlatMapColumnReader.cpp @@ -17,7 +17,7 @@ #include "velox/dwio/dwrf/reader/FlatMapColumnReader.h" #include #include -#include +#include #include "velox/common/base/BitUtil.h" #include "velox/dwio/common/FlatMapHelper.h" diff --git a/velox/exec/PlanNodeStats.h b/velox/exec/PlanNodeStats.h index 1e9bc663481a..a53a7fa3ea00 100644 --- a/velox/exec/PlanNodeStats.h +++ b/velox/exec/PlanNodeStats.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include "velox/common/time/CpuWallTimer.h" #include "velox/exec/Operator.h" diff --git a/velox/exec/fuzzer/PrestoQueryRunner.cpp b/velox/exec/fuzzer/PrestoQueryRunner.cpp index c775533ffbcd..bc81a452ae5e 100644 --- a/velox/exec/fuzzer/PrestoQueryRunner.cpp +++ b/velox/exec/fuzzer/PrestoQueryRunner.cpp @@ -16,7 +16,7 @@ #include "velox/exec/fuzzer/PrestoQueryRunner.h" #include // @manual -#include +#include #include #include "velox/common/base/Fs.h" #include "velox/common/encode/Base64.h" diff --git a/velox/exec/tests/TableWriteTest.cpp b/velox/exec/tests/TableWriteTest.cpp index bbcce92694bf..09af603cb068 100644 --- a/velox/exec/tests/TableWriteTest.cpp +++ b/velox/exec/tests/TableWriteTest.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "folly/json/dynamic.h" +#include "folly/dynamic.h" #include "velox/common/base/Fs.h" #include "velox/common/base/tests/GTestUtils.h" #include "velox/common/hyperloglog/SparseHll.h" diff --git a/velox/functions/prestosql/json/JsonExtractor.cpp b/velox/functions/prestosql/json/JsonExtractor.cpp index b2bec01cf5e5..c782232bd490 100644 --- a/velox/functions/prestosql/json/JsonExtractor.cpp +++ b/velox/functions/prestosql/json/JsonExtractor.cpp @@ -22,7 +22,7 @@ #include "boost/algorithm/string/trim.hpp" #include "folly/String.h" -#include "folly/json/json.h" +#include "folly/json.h" #include "velox/common/base/Exceptions.h" #include "velox/functions/prestosql/json/JsonPathTokenizer.h" diff --git a/velox/functions/prestosql/json/JsonExtractor.h b/velox/functions/prestosql/json/JsonExtractor.h index e906b0b83d21..d96c42d15f4a 100644 --- a/velox/functions/prestosql/json/JsonExtractor.h +++ b/velox/functions/prestosql/json/JsonExtractor.h @@ -19,7 +19,7 @@ #include #include "folly/Range.h" -#include "folly/json/dynamic.h" +#include "folly/dynamic.h" namespace facebook::velox::functions { diff --git a/velox/functions/prestosql/json/SIMDJsonExtractor.h b/velox/functions/prestosql/json/SIMDJsonExtractor.h index e416dc12c4c3..957c928f0941 100644 --- a/velox/functions/prestosql/json/SIMDJsonExtractor.h +++ b/velox/functions/prestosql/json/SIMDJsonExtractor.h @@ -19,7 +19,7 @@ #include #include "folly/Range.h" -#include "folly/json/dynamic.h" +#include "folly/dynamic.h" #include "velox/common/base/Exceptions.h" #include "velox/functions/prestosql/json/JsonPathTokenizer.h" #include "velox/functions/prestosql/json/SIMDJsonUtil.h" diff --git a/velox/functions/prestosql/json/tests/JsonExtractorTest.cpp b/velox/functions/prestosql/json/tests/JsonExtractorTest.cpp index dc89f4bbdf97..3ba9260efd37 100644 --- a/velox/functions/prestosql/json/tests/JsonExtractorTest.cpp +++ b/velox/functions/prestosql/json/tests/JsonExtractorTest.cpp @@ -16,7 +16,7 @@ #include "velox/functions/prestosql/json/JsonExtractor.h" -#include "folly/json/json.h" +#include "folly/json.h" #include "gtest/gtest.h" #include "velox/common/base/VeloxException.h" diff --git a/velox/functions/prestosql/json/tests/SIMDJsonExtractorTest.cpp b/velox/functions/prestosql/json/tests/SIMDJsonExtractorTest.cpp index 534f1f7f4cf3..2b83d81d1eae 100644 --- a/velox/functions/prestosql/json/tests/SIMDJsonExtractorTest.cpp +++ b/velox/functions/prestosql/json/tests/SIMDJsonExtractorTest.cpp @@ -18,7 +18,7 @@ #include #include -#include "folly/json/json.h" +#include "folly/json.h" #include "gtest/gtest.h" #include "velox/common/base/VeloxException.h" diff --git a/velox/functions/prestosql/types/JsonType.cpp b/velox/functions/prestosql/types/JsonType.cpp index b85a74940df5..7b11b8f9eaa1 100644 --- a/velox/functions/prestosql/types/JsonType.cpp +++ b/velox/functions/prestosql/types/JsonType.cpp @@ -22,7 +22,7 @@ #include "folly/CPortability.h" #include "folly/Conv.h" -#include "folly/json/json.h" +#include "folly/json.h" #include "velox/common/base/Exceptions.h" #include "velox/expression/EvalCtx.h" diff --git a/velox/type/HugeInt.h b/velox/type/HugeInt.h index 9a49c40a262a..eda86d3f40ab 100644 --- a/velox/type/HugeInt.h +++ b/velox/type/HugeInt.h @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include #include #include "velox/common/base/BitUtil.h" diff --git a/velox/type/StringView.h b/velox/type/StringView.h index 3fd3cfa2637a..ea070efb3c9d 100644 --- a/velox/type/StringView.h +++ b/velox/type/StringView.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include diff --git a/velox/type/Timestamp.h b/velox/type/Timestamp.h index a25540b36fb8..269dba53a9d5 100644 --- a/velox/type/Timestamp.h +++ b/velox/type/Timestamp.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include "velox/common/base/CheckedArithmetic.h" #include "velox/type/StringView.h" diff --git a/velox/type/Type.h b/velox/type/Type.h index 34fb60af35db..2308de937cc2 100644 --- a/velox/type/Type.h +++ b/velox/type/Type.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/velox/type/Variant.cpp b/velox/type/Variant.cpp index 14f1c24a17ab..1f15cff4c6fb 100644 --- a/velox/type/Variant.cpp +++ b/velox/type/Variant.cpp @@ -16,7 +16,7 @@ #include "velox/type/Variant.h" #include -#include "folly/json/json.h" +#include "folly/json.h" #include "velox/common/encode/Base64.h" #include "velox/type/DecimalUtil.h" #include "velox/type/HugeInt.h" diff --git a/velox/type/Variant.h b/velox/type/Variant.h index dd2c5a791697..2021d7069b4e 100644 --- a/velox/type/Variant.h +++ b/velox/type/Variant.h @@ -20,7 +20,7 @@ #include -#include "folly/json/dynamic.h" +#include "folly/dynamic.h" #include "velox/common/base/Exceptions.h" #include "velox/common/base/VeloxException.h" #include "velox/type/Conversions.h" diff --git a/velox/vector/BiasVector.h b/velox/vector/BiasVector.h index e8c9f7e34322..158f39ae093f 100644 --- a/velox/vector/BiasVector.h +++ b/velox/vector/BiasVector.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include "velox/common/base/SimdUtil.h" #include "velox/common/base/VeloxException.h" diff --git a/velox/vector/FlatVector.h b/velox/vector/FlatVector.h index 0a8674104044..b9ca51af67b9 100644 --- a/velox/vector/FlatVector.h +++ b/velox/vector/FlatVector.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include "velox/common/base/SimdUtil.h" diff --git a/velox/vector/tests/SimpleVectorTest.cpp b/velox/vector/tests/SimpleVectorTest.cpp index e6e857d478f9..8fefa19cb4dc 100644 --- a/velox/vector/tests/SimpleVectorTest.cpp +++ b/velox/vector/tests/SimpleVectorTest.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include "velox/common/base/tests/GTestUtils.h" #include "velox/vector/BuilderTypeUtils.h"