Skip to content

Commit

Permalink
refactor: get ready to fork Flux
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Wolff committed Jun 8, 2023
1 parent d8995bb commit 4bd8b47
Show file tree
Hide file tree
Showing 747 changed files with 3,806 additions and 3,872 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
- run: make checkrelease
- run: make vet
- run: GOGC=50 make staticcheck
- run: make libflux-wasm
- run: make test GO_TEST_FLAGS='-coverprofile=coverage.txt -covermode=atomic' GO_TAGS=assert
- save_cache:
name: Saving GOPATH/pkg/mod
Expand Down
6 changes: 0 additions & 6 deletions .devcontainer/Dockerfile

This file was deleted.

27 changes: 0 additions & 27 deletions .devcontainer/devcontainer.json

This file was deleted.

8 changes: 0 additions & 8 deletions CODEOWNERS

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile_build
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
FROM rust:1.68 as RUSTBUILD

FROM golang:1.19 as PKGCONFIG
COPY go.mod go.sum /go/src/github.com/influxdata/flux/
RUN cd /go/src/github.com/influxdata/flux && \
COPY go.mod go.sum /go/src/github.com/InfluxCommunity/flux/
RUN cd /go/src/github.com/InfluxCommunity/flux && \
go build -o /usr/local/bin/cgo-pkgbuild github.com/influxdata/pkg-config

FROM golang:1.19
Expand Down
19 changes: 0 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -160,21 +160,6 @@ libflux/flux-core/src/scanner/scanner_generated.rs: libflux/flux-core/src/scanne
libflux-go: $(LIBFLUX_GENERATED_TARGETS)
$(GO_GENERATE) ./libflux/go/libflux

libflux-wasm:
cd libflux/flux && CC=clang AR=llvm-ar wasm-pack build --scope influxdata --dev

clean-wasm:
rm -rf libflux/flux/pkg

build-wasm:
cd libflux/flux && CC=clang AR=llvm-ar wasm-pack build -t nodejs --scope influxdata

publish-wasm: clean-wasm build-wasm
cd libflux/flux/pkg && npm publish --access public

test-wasm: clean-wasm build-wasm
cd libflux/flux && CC=clang AR==llvm-ar wasm-pack test --node

test-valgrind: libflux
cd libflux/c && $(MAKE) test-valgrind

Expand Down Expand Up @@ -204,25 +189,21 @@ checkdocs: $(STDLIB_SOURCES) libflux/target/release/fluxdoc bin/flux
# This list is sorted for easy inspection
.PHONY: bench \
build \
build-wasm \
checkdocs \
checkfmt \
checkgenerate \
checkrelease \
checkreproducibility \
checktidy \
clean \
clean-wasm \
cleangenerate \
default \
fluxdocs \
fmt \
generate \
libflux \
libflux-go \
libflux-wasm \
lint-rust \
publish-wasm \
release \
staticcheck \
test \
Expand Down
5 changes: 0 additions & 5 deletions TODO.txt

This file was deleted.

6 changes: 3 additions & 3 deletions array/array.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"strconv"
"sync/atomic"

"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
"github.com/InfluxCommunity/flux/memory"
"github.com/apache/arrow/go/v7/arrow"
"github.com/apache/arrow/go/v7/arrow/array"
arrowmem "github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
"github.com/influxdata/flux/memory"
)

//go:generate -command tmpl ../gotool.sh github.com/benbjohnson/tmpl
Expand Down
4 changes: 2 additions & 2 deletions array/array_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package array_test
import (
"testing"

"github.com/InfluxCommunity/flux/array"
fluxmemory "github.com/InfluxCommunity/flux/memory"
apachearray "github.com/apache/arrow/go/v7/arrow/array"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/google/go-cmp/cmp"
"github.com/influxdata/flux/array"
fluxmemory "github.com/influxdata/flux/memory"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions array/binary.gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package array
import (
"math"

"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
)

//
Expand Down
4 changes: 2 additions & 2 deletions array/binary.gen.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"math"

"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
)

//
Expand Down
4 changes: 2 additions & 2 deletions array/binary.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package array

import (
"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
)

func And(l, r *Boolean, mem memory.Allocator) (*Boolean, error) {
Expand Down
4 changes: 2 additions & 2 deletions array/conditional.gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
package array

import (
"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
)

func IntConditional(t *Boolean, c, a *Int, mem memory.Allocator) (*Int, error) {
Expand Down
4 changes: 2 additions & 2 deletions array/conditional.gen.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package array

import (
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
)

{{range .}}
Expand Down
6 changes: 3 additions & 3 deletions array/repeat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package array_test
import (
"testing"

"github.com/InfluxCommunity/flux"
"github.com/InfluxCommunity/flux/arrow"
"github.com/InfluxCommunity/flux/values"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux"
"github.com/influxdata/flux/arrow"
"github.com/influxdata/flux/values"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion arrow/allocator.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package arrow

import (
"github.com/InfluxCommunity/flux/memory"
arrowmemory "github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux/memory"
)

func NewAllocator(a memory.Allocator) arrowmemory.Allocator {
Expand Down
4 changes: 2 additions & 2 deletions arrow/arrow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package arrow_test
import (
"testing"

"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/arrow"
"github.com/apache/arrow/go/v7/arrow/math"
arrowmemory "github.com/apache/arrow/go/v7/arrow/memory"
"github.com/google/go-cmp/cmp"
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/arrow"
)

func TestSum_Float64_Empty(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions arrow/bool.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package arrow

import (
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/memory"
"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/memory"
)

func NewBool(vs []bool, alloc memory.Allocator) *array.Boolean {
Expand Down
4 changes: 2 additions & 2 deletions arrow/float.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package arrow

import (
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/memory"
"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/memory"
)

func NewFloat(vs []float64, alloc memory.Allocator) *array.Float {
Expand Down
4 changes: 2 additions & 2 deletions arrow/int.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package arrow

import (
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/memory"
"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/memory"
)

func NewInt(vs []int64, alloc memory.Allocator) *array.Int {
Expand Down
10 changes: 5 additions & 5 deletions arrow/repeat.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package arrow

import (
"github.com/InfluxCommunity/flux"
"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
"github.com/InfluxCommunity/flux/values"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux"
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
"github.com/influxdata/flux/values"
)

// Repeat will construct an arrow array that repeats
Expand Down
4 changes: 2 additions & 2 deletions arrow/string.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package arrow

import (
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/memory"
"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/memory"
)

func NewString(vs []string, alloc memory.Allocator) *array.String {
Expand Down
8 changes: 4 additions & 4 deletions arrow/table_buffer.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package arrow

import (
"github.com/influxdata/flux"
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
"github.com/InfluxCommunity/flux"
"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
)

// TableBuffer represents the buffered component of an arrow table.
Expand Down
4 changes: 2 additions & 2 deletions arrow/uint.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package arrow

import (
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/memory"
"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/memory"
)

func NewUint(vs []uint64, alloc memory.Allocator) *array.Uint {
Expand Down
12 changes: 6 additions & 6 deletions arrow/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package arrow
import (
"fmt"

"github.com/InfluxCommunity/flux"
"github.com/InfluxCommunity/flux/array"
"github.com/InfluxCommunity/flux/codes"
"github.com/InfluxCommunity/flux/internal/errors"
"github.com/InfluxCommunity/flux/semantic"
"github.com/InfluxCommunity/flux/values"
"github.com/apache/arrow/go/v7/arrow/memory"
"github.com/influxdata/flux"
"github.com/influxdata/flux/array"
"github.com/influxdata/flux/codes"
"github.com/influxdata/flux/internal/errors"
"github.com/influxdata/flux/semantic"
"github.com/influxdata/flux/values"
)

// NewBuilder constructs a new builder for the given
Expand Down
2 changes: 1 addition & 1 deletion ast/asttest/cmpopts.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package asttest
// DO NOT EDIT: This file is autogenerated via the cmpgen command.

import (
"github.com/InfluxCommunity/flux/ast"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/influxdata/flux/ast"
)

var IgnoreBaseNodeOptions = []cmp.Option{
Expand Down
2 changes: 1 addition & 1 deletion ast/asttest/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/google/go-cmp/cmp"
)

//go:generate go run github.com/influxdata/flux/internal/cmd/cmpgen cmpopts.go
//go:generate go run github.com/InfluxCommunity/flux/internal/cmd/cmpgen cmpopts.go

var CompareOptions = append(IgnoreBaseNodeOptions,
cmp.Comparer(func(x, y *regexp.Regexp) bool { return x.String() == y.String() }),
Expand Down
4 changes: 2 additions & 2 deletions ast/astutil/format.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package astutil
import (
"encoding/json"

"github.com/influxdata/flux/ast"
"github.com/influxdata/flux/runtime"
"github.com/InfluxCommunity/flux/ast"
"github.com/InfluxCommunity/flux/runtime"
)

// Format will format the AST to a string.
Expand Down
6 changes: 3 additions & 3 deletions ast/astutil/format_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package astutil_test
import (
"testing"

"github.com/influxdata/flux/ast"
"github.com/influxdata/flux/ast/astutil"
"github.com/influxdata/flux/parser"
"github.com/InfluxCommunity/flux/ast"
"github.com/InfluxCommunity/flux/ast/astutil"
"github.com/InfluxCommunity/flux/parser"
)

func TestFormat(t *testing.T) {
Expand Down
Loading

0 comments on commit 4bd8b47

Please sign in to comment.