Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add qxip/iox to stdlib contribs #5432

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0f55164
synced master with clickhouse support
adubovikov Oct 23, 2022
2a2ca59
synced master with clickhouse support. added files
adubovikov Oct 23, 2022
e20df2a
Merge pull request #3 from adubovikov/master
lmangani Nov 2, 2022
dcc12e3
Merge branch 'influxdata:master' into master
lmangani Jan 24, 2023
4bd8b47
refactor: get ready to fork Flux
Jun 8, 2023
80a9f51
refactor: remove files that reference Quay
Jun 9, 2023
4a66fc2
chore: update README
Jun 9, 2023
be472c0
Merge pull request #1 from InfluxCommunity/wolffcm/fork-flux
Jun 11, 2023
7df7a03
Merge branch 'master' into clickhouse-driver
lmangani Jun 21, 2023
7397e53
Feature: Add Fluxpipe to Examples
lmangani Sep 10, 2023
dfe4d10
#fix ch driver build problems
akvlad Sep 11, 2023
f9cbbc2
#fix update iox client dependency
akvlad Sep 11, 2023
dd93f0a
#feat iox sql.from impl
akvlad Sep 11, 2023
c1057ce
Merge pull request #6 from InfluxCommunity/lmangani-fluxpipe-example
lmangani Sep 12, 2023
ff53692
Merge branch 'master' into clickhouse-driver
lmangani Sep 12, 2023
e8bfabd
Update semantic.yml
lmangani Sep 12, 2023
e23fb08
Update semantic.yml
lmangani Sep 12, 2023
952968f
Merge pull request #7 from InfluxCommunity/less-semantic-checks
lmangani Sep 12, 2023
1e65736
Merge branch 'master' into clickhouse-driver
lmangani Sep 12, 2023
7fb689f
style: don't force using semantic in a commit
akvlad Sep 12, 2023
643e7ba
fix: InfluxCommunity deps; go.mod forced to update
akvlad Sep 12, 2023
8e5b144
Merge pull request #3 from metrico/clickhouse-driver
lmangani Sep 12, 2023
d40ef9e
Merge branch 'clickhouse-driver' into iox-driver
akvlad Sep 12, 2023
38fe878
fix: include the fork influxdb-iox-client-go with fixes
akvlad Sep 12, 2023
8338e99
fix: moving the forked influxdb-iox-client-go to the replace section …
akvlad Sep 12, 2023
f6be1be
chore: tests and information
akvlad Sep 12, 2023
5543b02
Merge branch 'master' into iox-driver
lmangani Sep 12, 2023
b5c3868
Merge pull request #8 from metrico/iox-driver
akvlad Sep 13, 2023
1faade3
Init qxip/iox contrib
lmangani Sep 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
225 changes: 0 additions & 225 deletions .circleci/config.yml

This file was deleted.

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.

3 changes: 2 additions & 1 deletion .github/semantic.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# docs: https://github.com/probot/semantic-pull-requests#configuration
# Always validate the PR title AND all the commits
titleAndCommits: true
titleOnly: true
titleAndCommits: false
3 changes: 3 additions & 0 deletions .github/workflows/semantic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ on:

jobs:
semantic:
with:
CHECK_PR_TITLE_OR_ONE_COMMIT: true
uses: influxdata/validate-semantic-github-messages/.github/workflows/semantic.yml@main

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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Flux - Influx data language

[![CircleCI](https://circleci.com/gh/influxdata/flux/tree/master.svg?style=svg)](https://circleci.com/gh/influxdata/flux/tree/master)

# Flux - Community fork of Influx data language

Flux is a lightweight scripting language for querying databases (like [InfluxDB](https://github.com/influxdata/influxdb)) and working with data.
It is part of InfluxDB 1.7 and 2.0, but can be run independently of those.
This repository contains the language definition and an implementation of the language core.

**Note:** This is the community fork of Flux. The Flux version that is maintained by InfluxData lives [here](https://github.com/influxdata/flux).
If you are seeking to make changes to Flux for use in your own projects, this repo is the right place to be.

## Specification

A complete specification can be found in [SPEC.md](./docs/SPEC.md).
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
Loading
Loading