Skip to content

Commit 3ad61b3

Browse files
committed
Merge remote-tracking branch 'upstream/main' into test_non_exact_size_batch
2 parents e134735 + 7d52145 commit 3ad61b3

File tree

77 files changed

+3895
-709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+3895
-709
lines changed

.devcontainer/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
44
# Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
55
&& apt-get purge -y imagemagick imagemagick-6-common
66

7-
# Add protoc
7+
# setup the containers WORKDIR so npm install works
8+
# https://stackoverflow.com/questions/57534295/npm-err-tracker-idealtree-already-exists-while-creating-the-docker-image-for
9+
WORKDIR /root
10+
11+
# Add protoc, npm, prettier
812
# https://datafusion.apache.org/contributor-guide/development_environment.html#protoc-installation
913
RUN apt-get update \
10-
&& apt-get install -y --no-install-recommends protobuf-compiler libprotobuf-dev \
14+
&& apt-get install -y --no-install-recommends protobuf-compiler libprotobuf-dev npm nodejs\
1115
&& rm -rf /var/lib/apt/lists/*

.github/workflows/extended.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -159,44 +159,6 @@ jobs:
159159
cargo test --features backtrace --profile release-nonlto --test sqllogictests -- --include-sqlite
160160
cargo clean
161161
162-
# If the workflow was triggered by the PR comment (through pr_comment_commands.yml action) we need to manually update check status to display in UI
163-
update-check-status:
164-
needs: [linux-build-lib, linux-test-extended, hash-collisions, sqllogictest-sqlite]
165-
runs-on: ubuntu-latest
166-
if: ${{ always() && github.event_name == 'workflow_dispatch' }}
167-
steps:
168-
- name: Determine workflow status
169-
id: status
170-
run: |
171-
if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
172-
echo "workflow_status=failure" >> $GITHUB_OUTPUT
173-
echo "conclusion=failure" >> $GITHUB_OUTPUT
174-
else
175-
echo "workflow_status=completed" >> $GITHUB_OUTPUT
176-
echo "conclusion=success" >> $GITHUB_OUTPUT
177-
fi
178-
179-
- name: Update check run
180-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
181-
with:
182-
github-token: ${{ secrets.GITHUB_TOKEN }}
183-
script: |
184-
const workflowRunUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
185-
186-
await github.rest.checks.update({
187-
owner: context.repo.owner,
188-
repo: context.repo.repo,
189-
check_run_id: ${{ github.event.inputs.check_run_id }},
190-
status: 'completed',
191-
conclusion: '${{ steps.status.outputs.conclusion }}',
192-
output: {
193-
title: '${{ steps.status.outputs.conclusion == 'success' && 'Extended Tests Passed' || 'Extended Tests Failed' }}',
194-
summary: `Extended tests have completed with status: ${{ steps.status.outputs.conclusion }}.\n\n[View workflow run](${workflowRunUrl})`
195-
},
196-
details_url: workflowRunUrl
197-
});
198-
199-
200162
201163
202164

.github/workflows/pr_comment_commands.yml

Lines changed: 0 additions & 89 deletions
This file was deleted.

Cargo.lock

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clippy.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,14 @@ disallowed-types = [
99

1010
# Lowering the threshold to help prevent stack overflows (default is 16384)
1111
# See: https://rust-lang.github.io/rust-clippy/master/index.html#/large_futures
12-
future-size-threshold = 10000
12+
future-size-threshold = 10000
13+
14+
# Be more aware of large error variants which can impact the "happy path" due
15+
# to large stack footprint when considering async state machines (default is 128).
16+
#
17+
# Value of 70 picked arbitrarily as something less than 100.
18+
#
19+
# See:
20+
# - https://github.com/apache/datafusion/issues/16652
21+
# - https://rust-lang.github.io/rust-clippy/master/index.html#result_large_err
22+
large-error-threshold = 70

datafusion-cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ object_store = { workspace = true, features = ["aws", "gcp", "http"] }
6161
parking_lot = { workspace = true }
6262
parquet = { workspace = true, default-features = false }
6363
regex = { workspace = true }
64-
rustyline = "16.0"
64+
rustyline = "17.0"
6565
tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] }
6666
url = { workspace = true }
6767

datafusion-examples/examples/advanced_udwf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use datafusion::prelude::*;
4343
/// a function `partition_evaluator` that returns the `MyPartitionEvaluator` instance.
4444
///
4545
/// To do so, we must implement the `WindowUDFImpl` trait.
46-
#[derive(Debug, Clone)]
46+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
4747
struct SmoothItUdf {
4848
signature: Signature,
4949
}
@@ -149,7 +149,7 @@ impl PartitionEvaluator for MyPartitionEvaluator {
149149
}
150150

151151
/// This UDWF will show how to use the WindowUDFImpl::simplify() API
152-
#[derive(Debug, Clone)]
152+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
153153
struct SimplifySmoothItUdf {
154154
signature: Signature,
155155
}

datafusion/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ half = { workspace = true }
6666
hashbrown = { workspace = true }
6767
hex = { workspace = true, optional = true }
6868
indexmap = { workspace = true }
69-
libc = "0.2.174"
69+
libc = "0.2.175"
7070
log = { workspace = true }
7171
object_store = { workspace = true, optional = true }
7272
parquet = { workspace = true, optional = true, default-features = true }

datafusion/common/src/test_util.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -314,43 +314,43 @@ pub fn get_data_dir(
314314
#[macro_export]
315315
macro_rules! create_array {
316316
(Boolean, $values: expr) => {
317-
std::sync::Arc::new(arrow::array::BooleanArray::from($values))
317+
std::sync::Arc::new($crate::arrow::array::BooleanArray::from($values))
318318
};
319319
(Int8, $values: expr) => {
320-
std::sync::Arc::new(arrow::array::Int8Array::from($values))
320+
std::sync::Arc::new($crate::arrow::array::Int8Array::from($values))
321321
};
322322
(Int16, $values: expr) => {
323-
std::sync::Arc::new(arrow::array::Int16Array::from($values))
323+
std::sync::Arc::new($crate::arrow::array::Int16Array::from($values))
324324
};
325325
(Int32, $values: expr) => {
326-
std::sync::Arc::new(arrow::array::Int32Array::from($values))
326+
std::sync::Arc::new($crate::arrow::array::Int32Array::from($values))
327327
};
328328
(Int64, $values: expr) => {
329-
std::sync::Arc::new(arrow::array::Int64Array::from($values))
329+
std::sync::Arc::new($crate::arrow::array::Int64Array::from($values))
330330
};
331331
(UInt8, $values: expr) => {
332-
std::sync::Arc::new(arrow::array::UInt8Array::from($values))
332+
std::sync::Arc::new($crate::arrow::array::UInt8Array::from($values))
333333
};
334334
(UInt16, $values: expr) => {
335-
std::sync::Arc::new(arrow::array::UInt16Array::from($values))
335+
std::sync::Arc::new($crate::arrow::array::UInt16Array::from($values))
336336
};
337337
(UInt32, $values: expr) => {
338-
std::sync::Arc::new(arrow::array::UInt32Array::from($values))
338+
std::sync::Arc::new($crate::arrow::array::UInt32Array::from($values))
339339
};
340340
(UInt64, $values: expr) => {
341-
std::sync::Arc::new(arrow::array::UInt64Array::from($values))
341+
std::sync::Arc::new($crate::arrow::array::UInt64Array::from($values))
342342
};
343343
(Float16, $values: expr) => {
344-
std::sync::Arc::new(arrow::array::Float16Array::from($values))
344+
std::sync::Arc::new($crate::arrow::array::Float16Array::from($values))
345345
};
346346
(Float32, $values: expr) => {
347-
std::sync::Arc::new(arrow::array::Float32Array::from($values))
347+
std::sync::Arc::new($crate::arrow::array::Float32Array::from($values))
348348
};
349349
(Float64, $values: expr) => {
350-
std::sync::Arc::new(arrow::array::Float64Array::from($values))
350+
std::sync::Arc::new($crate::arrow::array::Float64Array::from($values))
351351
};
352352
(Utf8, $values: expr) => {
353-
std::sync::Arc::new(arrow::array::StringArray::from($values))
353+
std::sync::Arc::new($crate::arrow::array::StringArray::from($values))
354354
};
355355
}
356356

@@ -359,7 +359,7 @@ macro_rules! create_array {
359359
///
360360
/// Example:
361361
/// ```
362-
/// use datafusion_common::{record_batch, create_array};
362+
/// use datafusion_common::record_batch;
363363
/// let batch = record_batch!(
364364
/// ("a", Int32, vec![1, 2, 3]),
365365
/// ("b", Float64, vec![Some(4.0), None, Some(5.0)]),
@@ -370,13 +370,13 @@ macro_rules! create_array {
370370
macro_rules! record_batch {
371371
($(($name: expr, $type: ident, $values: expr)),*) => {
372372
{
373-
let schema = std::sync::Arc::new(arrow::datatypes::Schema::new(vec![
373+
let schema = std::sync::Arc::new($crate::arrow::datatypes::Schema::new(vec![
374374
$(
375-
arrow::datatypes::Field::new($name, arrow::datatypes::DataType::$type, true),
375+
$crate::arrow::datatypes::Field::new($name, $crate::arrow::datatypes::DataType::$type, true),
376376
)*
377377
]));
378378

379-
let batch = arrow::array::RecordBatch::try_new(
379+
let batch = $crate::arrow::array::RecordBatch::try_new(
380380
schema,
381381
vec![$(
382382
$crate::create_array!($type, $values),

datafusion/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ rand_distr = "0.5"
172172
regex = { workspace = true }
173173
rstest = { workspace = true }
174174
serde_json = { workspace = true }
175-
sysinfo = "0.36.1"
175+
sysinfo = "0.37.0"
176176
test-utils = { path = "../../test-utils" }
177177
tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot", "fs"] }
178178

0 commit comments

Comments
 (0)