Skip to content

Commit

Permalink
Merge branch 'main' of github.com:apache/datafusion into dev/xinli/re…
Browse files Browse the repository at this point in the history
…gexp_count
  • Loading branch information
xinlifoobar committed Aug 20, 2024
2 parents f72c11f + 37e54ee commit 682a50a
Show file tree
Hide file tree
Showing 145 changed files with 4,315 additions and 2,390 deletions.
46 changes: 1 addition & 45 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,11 @@
# under the License.

apache-rat-*.jar
arrow-src.tar
arrow-src.tar.gz

# Compiled source
*.a
*.dll
*.o
*.py[ocd]
*.so
*.so.*
*.bundle
*.dylib
.build_cache_dir
dependency-reduced-pom.xml
MANIFEST
compile_commands.json
build.ninja

# Generated Visual Studio files
*.vcxproj
*.vcxproj.*
*.sln
*.iml

# Linux perf sample data
perf.data
perf.data.old

cpp/.idea/
.clangd/
cpp/.clangd/
cpp/apidoc/xml/
docs/example.gz
docs/example1.dat
docs/example3.dat
python/.eggs/
python/doc/
# Egg metadata
*.egg-info

.vscode
.idea/
Expand All @@ -66,16 +32,9 @@ docker_cache
.*.swp
.*.swo

site/

# R files
**/.Rproj.user
**/*.Rcheck/
**/.Rhistory
.Rproj.user
venv/*

# macOS
cpp/Brewfile.lock.json
.DS_Store

# docker volumes used for caching
Expand All @@ -90,9 +49,6 @@ rusty-tags.vi
.history
.flatbuffers/

.vscode
venv/*

# apache release artifacts
dev/dist

Expand Down
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ members = [
"datafusion/functions-aggregate",
"datafusion/functions-aggregate-common",
"datafusion/functions-nested",
"datafusion/functions-window",
"datafusion/optimizer",
"datafusion/physical-expr",
"datafusion/physical-expr-common",
Expand Down Expand Up @@ -102,6 +103,7 @@ datafusion-functions = { path = "datafusion/functions", version = "41.0.0" }
datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "41.0.0" }
datafusion-functions-aggregate-common = { path = "datafusion/functions-aggregate-common", version = "41.0.0" }
datafusion-functions-nested = { path = "datafusion/functions-nested", version = "41.0.0" }
datafusion-functions-window = { path = "datafusion/functions-window", version = "41.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "41.0.0", default-features = false }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "41.0.0", default-features = false }
datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "41.0.0", default-features = false }
Expand Down Expand Up @@ -133,7 +135,7 @@ rand = "0.8"
regex = "1.8"
rstest = "0.22.0"
serde_json = "1"
sqlparser = { version = "0.49", features = ["visitor"] }
sqlparser = { version = "0.50.0", features = ["visitor"] }
tempfile = "3"
thiserror = "1.0.44"
tokio = { version = "1.36", features = ["macros", "rt", "sync"] }
Expand Down
Loading

0 comments on commit 682a50a

Please sign in to comment.