Skip to content

Commit

Permalink
[GLUTEN-6887][VL] Daily Update Velox Version (2024_10_12) (#7487)
Browse files Browse the repository at this point in the history
* [GLUTEN-6887][VL] Daily Update Velox Version (2024_10_12)

Upstream Velox's New Commits:

5bedca0f3 by Kevin Wilfong, Add tests constructing maps with duplicate custom TimestampWithTimezones (11228)
c434ed8c6 by Kevin Wilfong, Add support for custom comparison in Presto's contains UDF (11227)
903ae35d3 by Kevin Wilfong, Add support for custom comparison in Presto's array_position UDF (11226)
0fba52159 by Kevin Wilfong, Add tests for array_union and array_remove with TimestampWithTimezone (11222)
f4ca8a60c by duanmeng, Ignore tracing of auxiliary operator (11220)
74a0db903 by Deepak Majeti, Remove connector factory registrations (8871)
daeff5943 by Jialiang Tan, Do not pre-allocate memory when init vector stream (11211)

---------

Signed-off-by: glutenperfbot <[email protected]>
Signed-off-by: Yuan Zhou <[email protected]>
Co-authored-by: glutenperfbot <[email protected]>
Co-authored-by: Yuan Zhou <[email protected]>
  • Loading branch information
3 people authored Oct 12, 2024
1 parent 21ff0fe commit 8391156
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
- name: Check License Header
run: |
git fetch --recurse-submodules=no origin main ${{github.event.pull_request.base.sha}}
pip install regex
pip install regex --break-system-packages
cd $GITHUB_WORKSPACE/
./.github/workflows/util/check.sh ${{github.event.pull_request.base.sha}}
5 changes: 3 additions & 2 deletions cpp/velox/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,9 @@ if(ENABLE_GLUTEN_VCPKG)
endif()

target_include_directories(
velox PUBLIC ${CMAKE_SYSTEM_INCLUDE_PATH} ${JNI_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR} ${PROTOBUF_INCLUDE} ${VELOX_HOME})
velox
PUBLIC ${CMAKE_SYSTEM_INCLUDE_PATH} ${JNI_INCLUDE_DIRS} ${VELOX_BUILD_PATH}
${CMAKE_CURRENT_SOURCE_DIR} ${PROTOBUF_INCLUDE} ${VELOX_HOME})

if(BUILD_TESTS)
target_include_directories(velox PUBLIC ${VELOX_BUILD_PATH})
Expand Down
26 changes: 26 additions & 0 deletions cpp/velox/compute/VeloxBackend.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
#include "velox/common/file/FileSystems.h"
#include "velox/connectors/hive/HiveConnector.h"
#include "velox/connectors/hive/HiveDataSource.h"
#include "velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.h" // @manual
#include "velox/connectors/hive/storage_adapters/gcs/RegisterGCSFileSystem.h" // @manual
#include "velox/connectors/hive/storage_adapters/hdfs/RegisterHdfsFileSystem.h" // @manual
#include "velox/connectors/hive/storage_adapters/s3fs/RegisterS3FileSystem.h" // @manual
#include "velox/dwio/orc/reader/OrcReader.h"
#include "velox/dwio/parquet/RegisterParquetReader.h"
#include "velox/dwio/parquet/RegisterParquetWriter.h"
#include "velox/serializers/PrestoSerializer.h"

DECLARE_bool(velox_exception_user_stacktrace_enabled);
Expand Down Expand Up @@ -110,10 +117,29 @@ void VeloxBackend::init(const std::unordered_map<std::string, std::string>& conf

// Setup and register.
velox::filesystems::registerLocalFileSystem();

#ifdef ENABLE_HDFS
velox::filesystems::registerHdfsFileSystem();
#endif
#ifdef ENABLE_S3
velox::filesystems::registerS3FileSystem();
#endif
#ifdef ENABLE_GCS
velox::filesystems::registerGCSFileSystem();
#endif
#ifdef ENABLE_ABFS
velox::filesystems::abfs::registerAbfsFileSystem();
#endif

initJolFilesystem();
initCache();
initConnector();

velox::dwio::common::registerFileSinks();
velox::parquet::registerParquetReaderFactory();
velox::parquet::registerParquetWriterFactory();
velox::orc::registerOrcReaderFactory();

// Register Velox functions
registerAllFunctions();
if (!facebook::velox::isRegisteredVectorSerde()) {
Expand Down
2 changes: 1 addition & 1 deletion ep/build-velox/src/get_velox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set -exu

VELOX_REPO=https://github.com/oap-project/velox.git
VELOX_BRANCH=2024_10_11
VELOX_BRANCH=2024_10_12
VELOX_HOME=""

OS=`uname -s`
Expand Down

0 comments on commit 8391156

Please sign in to comment.