Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion cpp-ch/local-engine/local_engine_jni.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <jni.h>

#include <Builder/SerializedPlanBuilder.h>
#include <Columns/ColumnReplicated.h>
#include <Compression/CompressedReadBuffer.h>
#include <DataTypes/DataTypeNullable.h>
#include <Join/BroadCastJoinBuilder.h>
Expand Down Expand Up @@ -539,7 +540,16 @@ Java_org_apache_gluten_vectorized_CHNativeBlock_nativeBlockStats(JNIEnv * env, j
}
else
{
const auto * nullable = checkAndGetColumn<DB::ColumnNullable>(&*col.column);
const DB::ColumnNullable * nullable;
if (col.column->isReplicated())
{
auto * replicated_col = checkAndGetColumn<DB::ColumnReplicated>(&*col.column);
nullable = checkAndGetColumn<DB::ColumnNullable>(&*replicated_col->getNestedColumn());
}
else
{
nullable = checkAndGetColumn<DB::ColumnNullable>(&*col.column);
}
const auto & null_map_data = nullable->getNullMapData();

jobject block_stats = env->NewObject(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ object ClickHouseSQLQueryTestSettings extends SQLQueryTestSettings {
// CH- "null-propagation.sql",
"operators.sql",
// TODO: rebase-25.12, fix later
// the results are the same, but the order of the unsorted data is different.
// "order-by-nulls-ordering.sql",
// TODO: rebase-25.12, fix later
// the results are the same, but the order of the unsorted data is different.
// "order-by-ordinal.sql",
"outer-join.sql",
"parse-schema-string.sql",
Expand Down Expand Up @@ -120,20 +122,22 @@ object ClickHouseSQLQueryTestSettings extends SQLQueryTestSettings {
"subquery/exists-subquery/exists-having.sql",
"subquery/exists-subquery/exists-joins-and-set-ops.sql",
// TODO: rebase-25.12, fix later
// the results are the same, but the order of the unsorted data is different.
// "subquery/exists-subquery/exists-orderby-limit.sql",
"subquery/exists-subquery/exists-within-and-or.sql",
"subquery/in-subquery/in-basic.sql",
"subquery/in-subquery/in-group-by.sql",
"subquery/in-subquery/in-having.sql",
// TODO: rebase-25.12, fix later
// the results are the same, but the order of the unsorted data is different.
// "subquery/in-subquery/in-joins.sql",
"subquery/in-subquery/in-limit.sql",
"subquery/in-subquery/in-multiple-columns.sql",
// TODO: rebase-25.12, fix later
// the results are the same, but the order of the unsorted data is different.
// "subquery/in-subquery/in-order-by.sql",
// CH- "subquery/in-subquery/in-set-operations.sql",
// TODO: rebase-25.12, fix later, will core dump
// "subquery/in-subquery/in-with-cte.sql",
"subquery/in-subquery/in-with-cte.sql",
"subquery/in-subquery/nested-not-in.sql",
"subquery/in-subquery/not-in-group-by.sql",
"subquery/in-subquery/not-in-joins.sql",
Expand Down
Loading