Skip to content

Commit

Permalink
Merge branch 'apache:main' into Benchmark-CI
Browse files Browse the repository at this point in the history
  • Loading branch information
singh1203 authored Feb 21, 2025
2 parents c9f47c3 + 6dc6926 commit faf6d04
Show file tree
Hide file tree
Showing 74 changed files with 1,588 additions and 1,391 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
with:
python-version: 3.12
- name: Setup Go
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ jobs:
include:
- arch-label: AMD64
arch: amd64
go: 1.22
go: 1.23
runs-on: ubuntu-latest
- arch-label: AMD64
arch: amd64
go: 1.23
go: 1.24
runs-on: ubuntu-latest
- arch-label: ARM64
arch: arm64v8
go: 1.22
go: 1.23
runs-on: ubuntu-24.04-arm
- arch-label: ARM64
arch: arm64v8
go: 1.23
go: 1.24
runs-on: ubuntu-24.04-arm
env:
ARCH: ${{ matrix.arch }}
Expand Down Expand Up @@ -88,8 +88,8 @@ jobs:
fail-fast: false
matrix:
go:
- '1.22'
- '1.23'
- '1.24'
env:
GO: ${{ matrix.go }}
steps:
Expand Down Expand Up @@ -128,8 +128,8 @@ jobs:
fail-fast: false
matrix:
go:
- '1.22'
- '1.23'
- '1.24'
env:
GO: ${{ matrix.go }}
steps:
Expand Down Expand Up @@ -168,8 +168,8 @@ jobs:
fail-fast: false
matrix:
go:
- '1.22'
- '1.23'
- '1.24'
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand All @@ -195,8 +195,8 @@ jobs:
fail-fast: false
matrix:
go:
- '1.22'
- '1.23'
- '1.24'
env:
ARROW_GO_TESTCGO: "1"
steps:
Expand Down Expand Up @@ -229,8 +229,8 @@ jobs:
fail-fast: false
matrix:
go:
- '1.22'
- '1.23'
- '1.24'
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down Expand Up @@ -378,13 +378,13 @@ jobs:
run: |
ci/scripts/util_free_space.sh
- name: Cache Docker Volumes
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: .docker
key: integration-conda-${{ hashFiles('cpp/**') }}
restore-keys: conda-
- name: Setup Python
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
with:
python-version: 3.12
- name: Setup Archery
Expand Down
23 changes: 22 additions & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@

This project includes code from the Go project, BSD 3-clause license + PATENTS
weak patent termination clause
(https://github.com/golang/go/blob/master/PATENTS).
(https://github.com/golang/go/blob/master/PATENTS):

* arrow/flight/cookie_middleware.go

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -234,3 +236,22 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------

This project includes code from the LLVM project:

* arrow/compute/internal/kernels/_lib/types.h

Apache License v2.0 with LLVM Exceptions.
See https://llvm.org/LICENSE.txt for license information.
SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

--------------------------------------------------------------------------------

This project includes code from the brotli project (https://github.com/google/brotli):

* parquet/compress/brotli.go

Copyright: 2013 Google Inc. All Rights Reserved
Distributed under MIT License.
20 changes: 12 additions & 8 deletions arrow/bitutil/bitmaps.go
Original file line number Diff line number Diff line change
Expand Up @@ -465,20 +465,24 @@ type bitOp struct {

var (
bitAndOp = bitOp{
opWord: func(l, r uint64) uint64 { return l & r },
opByte: func(l, r byte) byte { return l & r },
opWord: func(l, r uint64) uint64 { return l & r },
opByte: func(l, r byte) byte { return l & r },
opAligned: alignedBitAndGo,
}
bitOrOp = bitOp{
opWord: func(l, r uint64) uint64 { return l | r },
opByte: func(l, r byte) byte { return l | r },
opWord: func(l, r uint64) uint64 { return l | r },
opByte: func(l, r byte) byte { return l | r },
opAligned: alignedBitOrGo,
}
bitAndNotOp = bitOp{
opWord: func(l, r uint64) uint64 { return l &^ r },
opByte: func(l, r byte) byte { return l &^ r },
opWord: func(l, r uint64) uint64 { return l &^ r },
opByte: func(l, r byte) byte { return l &^ r },
opAligned: alignedBitAndNotGo,
}
bitXorOp = bitOp{
opWord: func(l, r uint64) uint64 { return l ^ r },
opByte: func(l, r byte) byte { return l ^ r },
opWord: func(l, r uint64) uint64 { return l ^ r },
opByte: func(l, r byte) byte { return l ^ r },
opAligned: alignedBitXorGo,
}
)

Expand Down
3 changes: 2 additions & 1 deletion arrow/compute/exprs/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import (
// Arrow Extension registry and the default collection of substrait extensions
// from the Substrait-go repo.
func NewDefaultExtensionSet() ExtensionIDSet {
return NewExtensionSetDefault(expr.NewEmptyExtensionRegistry(&extensions.DefaultCollection))
return NewExtensionSetDefault(
expr.NewEmptyExtensionRegistry(extensions.GetDefaultCollectionWithNoError()))
}

// NewScalarCall constructs a substrait ScalarFunction expression with the provided
Expand Down
5 changes: 3 additions & 2 deletions arrow/compute/exprs/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func GetExtensionIDSet(ctx context.Context) ExtensionIDSet {
v, ok := ctx.Value(extCtxKey{}).(ExtensionIDSet)
if !ok {
return NewExtensionSet(
expr.NewEmptyExtensionRegistry(&extensions.DefaultCollection),
expr.NewEmptyExtensionRegistry(extensions.GetDefaultCollectionWithNoError()),
GetExtensionRegistry(ctx))
}
return v
Expand Down Expand Up @@ -434,7 +434,8 @@ func ExecuteScalarSubstrait(ctx context.Context, expression *expr.Extended, part
}

reg := GetExtensionRegistry(ctx)
set := NewExtensionSet(expr.NewExtensionRegistry(expression.Extensions, &extensions.DefaultCollection), reg)
set := NewExtensionSet(expr.NewExtensionRegistry(expression.Extensions,
extensions.GetDefaultCollectionWithNoError()), reg)
sc, err := ToArrowSchema(expression.BaseSchema, set)
if err != nil {
return nil, err
Expand Down
1 change: 0 additions & 1 deletion arrow/compute/internal/kernels/_lib/base_arithmetic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <stdint.h>
#include <limits.h>
#include "types.h"
#include "vendored/safe-math.h"

// Corresponds to equivalent ArithmeticOp enum in base_arithmetic.go
// for passing across which operation to perform. This allows simpler
Expand Down
Loading

0 comments on commit faf6d04

Please sign in to comment.