This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 422152d49f [GLUTEN-6887][VL] Daily Update Velox Version (2025_07_02)
(#10098)
422152d49f is described below
commit 422152d49f0cf92c9e36d3ecc8e6ef63ffc1fa1a
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Wed Jul 2 10:43:34 2025 +0100
[GLUTEN-6887][VL] Daily Update Velox Version (2025_07_02) (#10098)
* [GLUTEN-6887][VL] Daily Update Velox Version (2025_07_02)
Upstream Velox's New Commits:
0d57d2742 by Masha Basmanova, refactor: Rename variant class to match
coding style (#13957)
fa743e3e1 by Rajeev Dharmendra Singh, feat: Add a option to include only
plan node headers in plan summary (#13935)
faa180a7c by Masha Basmanova, refactor: Remove redundant variant::kind2type
(#13952)
6dd02486e by Masha Basmanova, refactor: Modernize parse/Expressions.*
(#13949)
4bedd5ce8 by Masha Basmanova, refactor: Delete substrait (#13938)
90a5a535f by Peter Enescu, feat: Add Hive intermediate support for Interval
(#13640)
5c3229fa7 by Peter Enescu, fix: Provide SQL generation support for type
INTERVAL (#13544)
Signed-off-by: glutenperfbot <[email protected]>
* fix missing JsonToProto header
Signed-off-by: Yuan <[email protected]>
* fix apache license
Signed-off-by: Yuan <[email protected]>
* fix format
Signed-off-by: Yuan <[email protected]>
---------
Signed-off-by: glutenperfbot <[email protected]>
Signed-off-by: Yuan <[email protected]>
Co-authored-by: glutenperfbot <[email protected]>
Co-authored-by: Yuan <[email protected]>
---
cpp/velox/tests/JsonToProtoConverter.cc | 2 +-
.../JsonToProtoConverter.h} | 26 +++++++---------------
ep/build-velox/src/get_velox.sh | 2 +-
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/cpp/velox/tests/JsonToProtoConverter.cc
b/cpp/velox/tests/JsonToProtoConverter.cc
index 93b5e86049..4ed1372d1f 100644
--- a/cpp/velox/tests/JsonToProtoConverter.cc
+++ b/cpp/velox/tests/JsonToProtoConverter.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "velox/substrait/tests/JsonToProtoConverter.h"
+#include "utils//JsonToProtoConverter.h"
#include <fstream>
#include <sstream>
#include "velox/common/base/Exceptions.h"
diff --git a/cpp/velox/tests/JsonToProtoConverter.cc
b/cpp/velox/utils/JsonToProtoConverter.h
similarity index 51%
copy from cpp/velox/tests/JsonToProtoConverter.cc
copy to cpp/velox/utils/JsonToProtoConverter.h
index 93b5e86049..f9c41bb695 100644
--- a/cpp/velox/tests/JsonToProtoConverter.cc
+++ b/cpp/velox/utils/JsonToProtoConverter.h
@@ -15,22 +15,12 @@
* limitations under the License.
*/
-#include "velox/substrait/tests/JsonToProtoConverter.h"
-#include <fstream>
-#include <sstream>
-#include "velox/common/base/Exceptions.h"
+#pragma once
-void JsonToProtoConverter::readFromFile(const std::string& msgPath,
google::protobuf::Message& msg) {
- // Read json file and resume the Substrait plan.
- std::ifstream msgJson(msgPath);
- VELOX_CHECK(!msgJson.fail(), "Failed to open file: {}. {}", msgPath,
strerror(errno));
- std::stringstream buffer;
- buffer << msgJson.rdbuf();
- std::string msgData = buffer.str();
- auto status = google::protobuf::util::JsonStringToMessage(msgData, &msg);
- VELOX_CHECK(
- status.ok(),
- "Failed to parse Substrait JSON: {} {}",
- static_cast<int8_t>(status.code()),
- status.message().ToString());
-}
+#include <google/protobuf/util/json_util.h>
+
+class JsonToProtoConverter {
+ public:
+ /// Reconstruct Protobuf message from Json file.
+ static void readFromFile(const std::string& msgPath,
google::protobuf::Message& msg);
+};
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 31c71e9d32..ff9989f413 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -17,7 +17,7 @@
set -exu
VELOX_REPO=https://github.com/oap-project/velox.git
-VELOX_BRANCH=2025_07_01
+VELOX_BRANCH=2025_07_02
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
VELOX_ENHANCED_REPO=https://github.com/oap-project/velox.git
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
