Skip to content

Commit 298eefb

Browse files
ArnavBalyanArnavBalyan
authored
Merge branch 'main' into arnavb/range-test-rewrite
2 parents 94a8e1a + f898bc2 commit 298eefb

File tree

10 files changed

+55
-55
lines changed

10 files changed

+55
-55
lines changed

‎.github/workflows/velox_backend.yml

+42-42
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ jobs:
101101
with:
102102
path: '${{ env.CCACHE_DIR }}'
103103
key: ccache-centos7-release-default-${{github.sha}}
104-
- uses: actions/upload-artifact@v3
104+
- uses: actions/upload-artifact@v4
105105
with:
106106
name: velox-native-lib-centos-7-${{github.sha}}
107107
path: ./cpp/build/releases/
108-
- uses: actions/upload-artifact@v3
108+
- uses: actions/upload-artifact@v4
109109
with:
110110
name: arrow-jars-centos-7-${{github.sha}}
111111
path: .m2/repository/org/apache/arrow/
@@ -141,12 +141,12 @@ jobs:
141141
steps:
142142
- uses: actions/checkout@v2
143143
- name: Download All Native Artifacts
144-
uses: actions/download-artifact@v3
144+
uses: actions/download-artifact@v4
145145
with:
146146
name: velox-native-lib-centos-7-${{github.sha}}
147147
path: ./cpp/build/releases/
148148
- name: Download All Arrow Jar Artifacts
149-
uses: actions/download-artifact@v3
149+
uses: actions/download-artifact@v4
150150
with:
151151
name: arrow-jars-centos-7-${{github.sha}}
152152
path: /root/.m2/repository/org/apache/arrow/
@@ -212,12 +212,12 @@ jobs:
212212
steps:
213213
- uses: actions/checkout@v2
214214
- name: Download All Native Artifacts
215-
uses: actions/download-artifact@v3
215+
uses: actions/download-artifact@v4
216216
with:
217217
name: velox-native-lib-centos-7-${{github.sha}}
218218
path: ./cpp/build/releases/
219219
- name: Download All Arrow Jar Artifacts
220-
uses: actions/download-artifact@v3
220+
uses: actions/download-artifact@v4
221221
with:
222222
name: arrow-jars-centos-7-${{github.sha}}
223223
path: /root/.m2/repository/org/apache/arrow/
@@ -284,12 +284,12 @@ jobs:
284284
steps:
285285
- uses: actions/checkout@v4
286286
- name: Download All Native Artifacts
287-
uses: actions/download-artifact@v3
287+
uses: actions/download-artifact@v4
288288
with:
289289
name: velox-native-lib-centos-7-${{github.sha}}
290290
path: ./cpp/build/releases/
291291
- name: Download All Arrow Jar Artifacts
292-
uses: actions/download-artifact@v3
292+
uses: actions/download-artifact@v4
293293
with:
294294
name: arrow-jars-centos-7-${{github.sha}}
295295
path: .m2/repository/org/apache/arrow/
@@ -356,12 +356,12 @@ jobs:
356356
df -h
357357
- uses: actions/checkout@v2
358358
- name: Download All Native Artifacts
359-
uses: actions/download-artifact@v3
359+
uses: actions/download-artifact@v4
360360
with:
361361
name: velox-native-lib-centos-7-${{github.sha}}
362362
path: ./cpp/build/releases/
363363
- name: Download All Arrow Jar Artifacts
364-
uses: actions/download-artifact@v3
364+
uses: actions/download-artifact@v4
365365
with:
366366
name: arrow-jars-centos-7-${{github.sha}}
367367
path: /home/runner/.m2/repository/org/apache/arrow/
@@ -471,12 +471,12 @@ jobs:
471471
df -h
472472
- uses: actions/checkout@v2
473473
- name: Download All Native Artifacts
474-
uses: actions/download-artifact@v3
474+
uses: actions/download-artifact@v4
475475
with:
476476
name: velox-native-lib-centos-7-${{github.sha}}
477477
path: ./cpp/build/releases/
478478
- name: Download All Arrow Jar Artifacts
479-
uses: actions/download-artifact@v3
479+
uses: actions/download-artifact@v4
480480
with:
481481
name: arrow-jars-centos-7-${{github.sha}}
482482
path: /home/runner/.m2/repository/org/apache/arrow/
@@ -514,12 +514,12 @@ jobs:
514514
steps:
515515
- uses: actions/checkout@v2
516516
- name: Download All Native Artifacts
517-
uses: actions/download-artifact@v3
517+
uses: actions/download-artifact@v4
518518
with:
519519
name: velox-native-lib-centos-7-${{github.sha}}
520520
path: ./cpp/build/releases/
521521
- name: Download All Arrow Jar Artifacts
522-
uses: actions/download-artifact@v3
522+
uses: actions/download-artifact@v4
523523
with:
524524
name: arrow-jars-centos-7-${{github.sha}}
525525
path: /root/.m2/repository/org/apache/arrow/
@@ -558,12 +558,12 @@ jobs:
558558
steps:
559559
- uses: actions/checkout@v2
560560
- name: Download All Native Artifacts
561-
uses: actions/download-artifact@v3
561+
uses: actions/download-artifact@v4
562562
with:
563563
name: velox-native-lib-centos-7-${{github.sha}}
564564
path: ./cpp/build/releases/
565565
- name: Download All Arrow Jar Artifacts
566-
uses: actions/download-artifact@v3
566+
uses: actions/download-artifact@v4
567567
with:
568568
name: arrow-jars-centos-7-${{github.sha}}
569569
path: /root/.m2/repository/org/apache/arrow/
@@ -602,11 +602,11 @@ jobs:
602602
container: apache/gluten:centos-8
603603
steps:
604604
- uses: actions/checkout@v2
605-
- uses: actions/download-artifact@v3
605+
- uses: actions/download-artifact@v4
606606
with:
607607
name: velox-native-lib-centos-7-${{github.sha}}
608608
path: ./cpp/build/releases
609-
- uses: actions/download-artifact@v3
609+
- uses: actions/download-artifact@v4
610610
with:
611611
name: arrow-jars-centos-7-${{github.sha}}
612612
path: /root/.m2/repository/org/apache/arrow/
@@ -644,12 +644,12 @@ jobs:
644644
steps:
645645
- uses: actions/checkout@v2
646646
- name: Download All Artifacts
647-
uses: actions/download-artifact@v3
647+
uses: actions/download-artifact@v4
648648
with:
649649
name: velox-native-lib-centos-7-${{github.sha}}
650650
path: ./cpp/build/releases
651651
- name: Download Arrow Jars
652-
uses: actions/download-artifact@v3
652+
uses: actions/download-artifact@v4
653653
with:
654654
name: arrow-jars-centos-7-${{github.sha}}
655655
path: /root/.m2/repository/org/apache/arrow/
@@ -672,12 +672,12 @@ jobs:
672672
steps:
673673
- uses: actions/checkout@v2
674674
- name: Download All Artifacts
675-
uses: actions/download-artifact@v3
675+
uses: actions/download-artifact@v4
676676
with:
677677
name: velox-native-lib-centos-7-${{github.sha}}
678678
path: ./cpp/build/releases
679679
- name: Download Arrow Jars
680-
uses: actions/download-artifact@v3
680+
uses: actions/download-artifact@v4
681681
with:
682682
name: arrow-jars-centos-7-${{github.sha}}
683683
path: /root/.m2/repository/org/apache/arrow/
@@ -716,12 +716,12 @@ jobs:
716716
steps:
717717
- uses: actions/checkout@v2
718718
- name: Download All Artifacts
719-
uses: actions/download-artifact@v3
719+
uses: actions/download-artifact@v4
720720
with:
721721
name: velox-native-lib-centos-7-${{github.sha}}
722722
path: ./cpp/build/releases
723723
- name: Download Arrow Jars
724-
uses: actions/download-artifact@v3
724+
uses: actions/download-artifact@v4
725725
with:
726726
name: arrow-jars-centos-7-${{github.sha}}
727727
path: /root/.m2/repository/org/apache/arrow/
@@ -746,12 +746,12 @@ jobs:
746746
steps:
747747
- uses: actions/checkout@v2
748748
- name: Download All Artifacts
749-
uses: actions/download-artifact@v3
749+
uses: actions/download-artifact@v4
750750
with:
751751
name: velox-native-lib-centos-7-${{github.sha}}
752752
path: ./cpp/build/releases
753753
- name: Download Arrow Jars
754-
uses: actions/download-artifact@v3
754+
uses: actions/download-artifact@v4
755755
with:
756756
name: arrow-jars-centos-7-${{github.sha}}
757757
path: /root/.m2/repository/org/apache/arrow/
@@ -795,12 +795,12 @@ jobs:
795795
steps:
796796
- uses: actions/checkout@v2
797797
- name: Download All Artifacts
798-
uses: actions/download-artifact@v3
798+
uses: actions/download-artifact@v4
799799
with:
800800
name: velox-native-lib-centos-7-${{github.sha}}
801801
path: ./cpp/build/releases
802802
- name: Download Arrow Jars
803-
uses: actions/download-artifact@v3
803+
uses: actions/download-artifact@v4
804804
with:
805805
name: arrow-jars-centos-7-${{github.sha}}
806806
path: /root/.m2/repository/org/apache/arrow/
@@ -831,12 +831,12 @@ jobs:
831831
steps:
832832
- uses: actions/checkout@v2
833833
- name: Download All Artifacts
834-
uses: actions/download-artifact@v3
834+
uses: actions/download-artifact@v4
835835
with:
836836
name: velox-native-lib-centos-7-${{github.sha}}
837837
path: ./cpp/build/releases
838838
- name: Download Arrow Jars
839-
uses: actions/download-artifact@v3
839+
uses: actions/download-artifact@v4
840840
with:
841841
name: arrow-jars-centos-7-${{github.sha}}
842842
path: /root/.m2/repository/org/apache/arrow/
@@ -874,12 +874,12 @@ jobs:
874874
steps:
875875
- uses: actions/checkout@v2
876876
- name: Download All Artifacts
877-
uses: actions/download-artifact@v3
877+
uses: actions/download-artifact@v4
878878
with:
879879
name: velox-native-lib-centos-7-${{github.sha}}
880880
path: ./cpp/build/releases
881881
- name: Download Arrow Jars
882-
uses: actions/download-artifact@v3
882+
uses: actions/download-artifact@v4
883883
with:
884884
name: arrow-jars-centos-7-${{github.sha}}
885885
path: /root/.m2/repository/org/apache/arrow/
@@ -911,12 +911,12 @@ jobs:
911911
steps:
912912
- uses: actions/checkout@v2
913913
- name: Download All Artifacts
914-
uses: actions/download-artifact@v3
914+
uses: actions/download-artifact@v4
915915
with:
916916
name: velox-native-lib-centos-7-${{github.sha}}
917917
path: ./cpp/build/releases
918918
- name: Download Arrow Jars
919-
uses: actions/download-artifact@v3
919+
uses: actions/download-artifact@v4
920920
with:
921921
name: arrow-jars-centos-7-${{github.sha}}
922922
path: /root/.m2/repository/org/apache/arrow/
@@ -940,12 +940,12 @@ jobs:
940940
steps:
941941
- uses: actions/checkout@v2
942942
- name: Download All Artifacts
943-
uses: actions/download-artifact@v3
943+
uses: actions/download-artifact@v4
944944
with:
945945
name: velox-native-lib-centos-7-${{github.sha}}
946946
path: ./cpp/build/releases
947947
- name: Download Arrow Jars
948-
uses: actions/download-artifact@v3
948+
uses: actions/download-artifact@v4
949949
with:
950950
name: arrow-jars-centos-7-${{github.sha}}
951951
path: /root/.m2/repository/org/apache/arrow/
@@ -976,12 +976,12 @@ jobs:
976976
steps:
977977
- uses: actions/checkout@v2
978978
- name: Download All Artifacts
979-
uses: actions/download-artifact@v3
979+
uses: actions/download-artifact@v4
980980
with:
981981
name: velox-native-lib-centos-7-${{github.sha}}
982982
path: ./cpp/build/releases
983983
- name: Download Arrow Jars
984-
uses: actions/download-artifact@v3
984+
uses: actions/download-artifact@v4
985985
with:
986986
name: arrow-jars-centos-7-${{github.sha}}
987987
path: /root/.m2/repository/org/apache/arrow/
@@ -1004,12 +1004,12 @@ jobs:
10041004
steps:
10051005
- uses: actions/checkout@v2
10061006
- name: Download All Artifacts
1007-
uses: actions/download-artifact@v3
1007+
uses: actions/download-artifact@v4
10081008
with:
10091009
name: velox-native-lib-centos-7-${{github.sha}}
10101010
path: ./cpp/build/releases
10111011
- name: Download Arrow Jars
1012-
uses: actions/download-artifact@v3
1012+
uses: actions/download-artifact@v4
10131013
with:
10141014
name: arrow-jars-centos-7-${{github.sha}}
10151015
path: /root/.m2/repository/org/apache/arrow/
@@ -1040,12 +1040,12 @@ jobs:
10401040
steps:
10411041
- uses: actions/checkout@v2
10421042
- name: Download All Artifacts
1043-
uses: actions/download-artifact@v3
1043+
uses: actions/download-artifact@v4
10441044
with:
10451045
name: velox-native-lib-centos-7-${{github.sha}}
10461046
path: ./cpp/build/releases
10471047
- name: Download Arrow Jars
1048-
uses: actions/download-artifact@v3
1048+
uses: actions/download-artifact@v4
10491049
with:
10501050
name: arrow-jars-centos-7-${{github.sha}}
10511051
path: /root/.m2/repository/org/apache/arrow/

‎cpp-ch/clickhouse.version

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CH_ORG=Kyligence
2-
CH_BRANCH=rebase_ch/20250124
3-
CH_COMMIT=6d716e92afe
2+
CH_BRANCH=rebase_ch/20250201
3+
CH_COMMIT=6a77c5fc048

‎cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <Interpreters/TableJoin.h>
2222
#include <Common/CHUtil.h>
2323
#include <Common/Exception.h>
24+
#include <Common/ThreadPool.h>
2425
#include <Common/logger_useful.h>
2526

2627
namespace DB
@@ -102,7 +103,6 @@ StorageJoinFromReadBuffer::StorageJoinFromReadBuffer(
102103

103104
void StorageJoinFromReadBuffer::buildJoin(Blocks & data, const Block header, std::shared_ptr<DB::TableJoin> analyzed_join)
104105
{
105-
106106
auto build_join = [&]
107107
{
108108
join = std::make_shared<HashJoin>(analyzed_join, header, overwrite, row_count);
@@ -133,7 +133,7 @@ void StorageJoinFromReadBuffer::buildJoinLazily(DB::Block header, std::shared_pt
133133
if (join)
134134
return;
135135
join = std::make_shared<HashJoin>(analyzed_join, header, overwrite, row_count);
136-
while(!input_blocks.empty())
136+
while (!input_blocks.empty())
137137
{
138138
auto & block = *input_blocks.begin();
139139
DB::ColumnsWithTypeAndName columns;

‎cpp-ch/local-engine/Parser/RelParsers/StreamKafkaRelParser.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <Parser/SubstraitParserUtils.h>
2121
#include <Parser/TypeParser.h>
2222
#include <Storages/Kafka/ReadFromGlutenStorageKafka.h>
23+
#include <Common/logger_useful.h>
2324

2425
namespace DB
2526
{

‎cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "SparkMergeTreeSink.h"
1818

1919
#include <Core/Settings.h>
20+
#include <IO/copyData.h>
2021
#include <Interpreters/MergeTreeTransaction.h>
2122
#include <Storages/MergeTree/MetaDataHelper.h>
2223
#include <Common/QueryContext.h>

‎cpp/velox/jni/JniFileSystem.cc

+2-4
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,7 @@ class FileSystemWrapper : public facebook::velox::filesystems::FileSystem {
215215

216216
std::unique_ptr<facebook::velox::ReadFile> openFileForRead(
217217
std::string_view path,
218-
const facebook::velox::filesystems::FileOptions& options,
219-
facebook::velox::io::IoStatistics* ioStats) override {
218+
const facebook::velox::filesystems::FileOptions& options) override {
220219
return fs_->openFileForRead(rewrite(path), options);
221220
}
222221

@@ -287,8 +286,7 @@ class JniFileSystem : public facebook::velox::filesystems::FileSystem {
287286

288287
std::unique_ptr<facebook::velox::ReadFile> openFileForRead(
289288
std::string_view path,
290-
const facebook::velox::filesystems::FileOptions& options,
291-
facebook::velox::io::IoStatistics* ioStats) override {
289+
const facebook::velox::filesystems::FileOptions& options) override {
292290
GLUTEN_CHECK(
293291
options.values.empty(),
294292
"JniFileSystem::openFileForRead: file options is not empty, this is not currently supported");

‎cpp/velox/substrait/SubstraitToVeloxPlan.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1281,9 +1281,9 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
12811281
std::shared_ptr<connector::hive::HiveTableHandle> tableHandle;
12821282
if (!readRel.has_filter()) {
12831283
tableHandle = std::make_shared<connector::hive::HiveTableHandle>(
1284-
kHiveConnectorId, "hive_table", filterPushdownEnabled, connector::hive::SubfieldFilters{}, nullptr);
1284+
kHiveConnectorId, "hive_table", filterPushdownEnabled, common::SubfieldFilters{}, nullptr);
12851285
} else {
1286-
connector::hive::SubfieldFilters subfieldFilters;
1286+
common::SubfieldFilters subfieldFilters;
12871287
auto names = colNameList;
12881288
auto types = veloxTypeList;
12891289
auto remainingFilter = exprConverter_->toVeloxExpr(readRel.filter(), ROW(std::move(names), std::move(types)));

0 commit comments

Comments
 (0)