This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 056b9808f chore(r): Clean up R package skeleton files (#1679)
056b9808f is described below
commit 056b9808f48fe7cd9a36ceb398f7a1faad3b084f
Author: Dewey Dunnington <[email protected]>
AuthorDate: Thu Mar 28 09:07:54 2024 -0300
chore(r): Clean up R package skeleton files (#1679)
This PR is just me going through all the R packages and building them
locally since there have been a few structural changes since I last did
that. There isn't anything that will affect any released version or CI
but there are a few things that came up:
- We hadn't run `devtools::document()` to flush the updated
documentation URLs into the .Rd files
- Running `cleanup` for the Go packages didn't work (because the Go
cache can't be `rm`ed without a special flag
- Running `cleanup` for the C packages didn't work (because they had
hard-coded some object paths)
- The .gitignore files were ignoring the wrong files in light of some
structural updates
I'd like to improve how files are vendored to make this less work for
non-R people updating drivers (but will have to save that for another
PR).
---
r/adbcdrivermanager/.Rbuildignore | 2 ++
r/adbcdrivermanager/NEWS.md | 15 ---------------
r/adbcdrivermanager/man/adbcdrivermanager-package.Rd | 1 +
r/adbcflightsql/.Rbuildignore | 2 +-
r/adbcflightsql/NEWS.md | 3 ---
r/adbcflightsql/man/adbcflightsql-package.Rd | 1 +
r/adbcflightsql/src/Makevars.in | 2 +-
r/adbcpostgresql/NEWS.md | 11 -----------
r/adbcpostgresql/cleanup | 3 ++-
r/adbcpostgresql/man/adbcpostgresql-package.Rd | 1 +
r/adbcpostgresql/src/.gitignore | 13 -------------
r/adbcsnowflake/.Rbuildignore | 1 +
r/adbcsnowflake/man/adbcsnowflake-package.Rd | 1 +
r/adbcsnowflake/src/Makevars.in | 2 +-
r/adbcsqlite/NEWS.md | 11 -----------
r/adbcsqlite/cleanup | 3 ++-
r/adbcsqlite/man/adbcsqlite-package.Rd | 1 +
r/adbcsqlite/src/.gitignore | 6 ------
r/adbcsqlite/src/nanoarrow/.gitignore | 20 --------------------
19 files changed, 15 insertions(+), 84 deletions(-)
diff --git a/r/adbcdrivermanager/.Rbuildignore
b/r/adbcdrivermanager/.Rbuildignore
index c74a5d2e2..c27933db6 100644
--- a/r/adbcdrivermanager/.Rbuildignore
+++ b/r/adbcdrivermanager/.Rbuildignore
@@ -12,3 +12,5 @@
^_pkgdown\.yml$
^docs$
^pkgdown$
+^compile_commands\.json$
+^\.cache$
diff --git a/r/adbcdrivermanager/NEWS.md b/r/adbcdrivermanager/NEWS.md
deleted file mode 100644
index dadc9aa48..000000000
--- a/r/adbcdrivermanager/NEWS.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# adbcdrivermanager 0.8.0
-
-- Update upstream ADBC libraries to version 0.8.0.
-
-# adbcdrivermanager 0.7.0
-
-- Update upstream ADBC libraries to version 0.7.0.
-
-# adbcdrivermanager 0.6.0
-
-- **r**: Ensure that info_codes are coerced to integer (#986)
-
-# adbcdrivermanager 0.5.0
-
-* Added a `NEWS.md` file to track changes to the package.
diff --git a/r/adbcdrivermanager/man/adbcdrivermanager-package.Rd
b/r/adbcdrivermanager/man/adbcdrivermanager-package.Rd
index 998704644..ee342c720 100644
--- a/r/adbcdrivermanager/man/adbcdrivermanager-package.Rd
+++ b/r/adbcdrivermanager/man/adbcdrivermanager-package.Rd
@@ -12,6 +12,7 @@ Provides a developer-facing interface to 'Arrow' Database
Connectivity ('ADBC')
Useful links:
\itemize{
\item \url{https://github.com/apache/arrow-adbc}
+ \item \url{https://arrow.apache.org/adbc/current/r/adbcdrivermanager/}
\item Report bugs at \url{https://github.com/apache/arrow-adbc/issues}
}
diff --git a/r/adbcflightsql/.Rbuildignore b/r/adbcflightsql/.Rbuildignore
index 63718b49c..eef47c80f 100644
--- a/r/adbcflightsql/.Rbuildignore
+++ b/r/adbcflightsql/.Rbuildignore
@@ -4,7 +4,6 @@
^bootstrap\.R$
^README\.Rmd$
^src/Makevars$
-^configure\.win$
^\.vscode$
^src/go/tmp$
^_pkgdown\.yml$
@@ -13,3 +12,4 @@
^cran-comments\.md$
^src/\.go-cache$
^src/\.go-path$
+^configure\.win$
diff --git a/r/adbcflightsql/NEWS.md b/r/adbcflightsql/NEWS.md
deleted file mode 100644
index a2980eac9..000000000
--- a/r/adbcflightsql/NEWS.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# adbcflightsql 0.6.0
-
-* Initial CRAN submission.
diff --git a/r/adbcflightsql/man/adbcflightsql-package.Rd
b/r/adbcflightsql/man/adbcflightsql-package.Rd
index 1b8456454..9efc82abd 100644
--- a/r/adbcflightsql/man/adbcflightsql-package.Rd
+++ b/r/adbcflightsql/man/adbcflightsql-package.Rd
@@ -12,6 +12,7 @@ Provides a developer-facing interface to the 'Arrow' Database
Connectivity ('ADB
Useful links:
\itemize{
\item \url{https://github.com/apache/arrow-adbc}
+ \item \url{https://arrow.apache.org/adbc/current/r/adbcflightsql/}
\item Report bugs at \url{https://github.com/apache/arrow-adbc/issues}
}
diff --git a/r/adbcflightsql/src/Makevars.in b/r/adbcflightsql/src/Makevars.in
index 86101d505..701160e03 100644
--- a/r/adbcflightsql/src/Makevars.in
+++ b/r/adbcflightsql/src/Makevars.in
@@ -28,4 +28,4 @@ all: $(SHLIB)
$(SHLIB): gostatic
gostatic:
- (cd "$(CURDIR)/go/adbc"; GOMAXPROCS=$(GOMAXPROCS)
GOPATH="$(CURDIR)/.go-path" GOCACHE="$(CURDIR)/.go-cache" CC="$(CGO_CC)"
CXX="$(CGO_CXX)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(PKG_LIBS)" "@gobin@"
build -v -tags driverlib -o $(CURDIR)/go/libadbc_driver_flightsql.a
-buildmode=c-archive "./pkg/flightsql")
+ (cd "$(CURDIR)/go/adbc"; GOMAXPROCS=$(GOMAXPROCS)
GOPATH="$(CURDIR)/.go-path" GOCACHE="$(CURDIR)/.go-cache" GOFLAGS=-modcacherw
CC="$(CGO_CC)" CXX="$(CGO_CXX)" CGO_CFLAGS="$(CGO_CFLAGS)"
CGO_LDFLAGS="$(PKG_LIBS)" "@gobin@" build -v -tags driverlib -o
$(CURDIR)/go/libadbc_driver_flightsql.a -buildmode=c-archive "./pkg/flightsql")
diff --git a/r/adbcpostgresql/NEWS.md b/r/adbcpostgresql/NEWS.md
deleted file mode 100644
index 700150c22..000000000
--- a/r/adbcpostgresql/NEWS.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# adbcdrivermanager 0.8.0
-
-- Update upstream ADBC libraries to version 0.8.0.
-
-# adbcdrivermanager 0.7.0
-
-- Update upstream ADBC libraries to version 0.7.0.
-
-# adbcpostgresql 0.6.0
-
-* Initial CRAN submission.
diff --git a/r/adbcpostgresql/cleanup b/r/adbcpostgresql/cleanup
index 4dc796871..2b0197d64 100755
--- a/r/adbcpostgresql/cleanup
+++ b/r/adbcpostgresql/cleanup
@@ -15,4 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-rm src/*.o src/nanoarrow/*.o src/common/*.o || true
+find src -name "*.o" -delete || true
+find src -name "*.so" -delete || true
diff --git a/r/adbcpostgresql/man/adbcpostgresql-package.Rd
b/r/adbcpostgresql/man/adbcpostgresql-package.Rd
index 366a96b5d..d692f515e 100644
--- a/r/adbcpostgresql/man/adbcpostgresql-package.Rd
+++ b/r/adbcpostgresql/man/adbcpostgresql-package.Rd
@@ -12,6 +12,7 @@ Provides a developer-facing interface to the 'Arrow' Database
Connectivity ('ADB
Useful links:
\itemize{
\item \url{https://github.com/apache/arrow-adbc}
+ \item \url{https://arrow.apache.org/adbc/current/r/adbcpostgresql/}
\item Report bugs at \url{https://github.com/apache/arrow-adbc/issues}
}
diff --git a/r/adbcpostgresql/src/.gitignore b/r/adbcpostgresql/src/.gitignore
index 8a47096b8..2a843f05a 100644
--- a/r/adbcpostgresql/src/.gitignore
+++ b/r/adbcpostgresql/src/.gitignore
@@ -19,17 +19,4 @@
*.so
*.dll
adbc.h
-connection.cc
-connection.h
-database.h
-database.cc
-error.h
-error.cc
-postgresql.cc
-statement.h
-statement.cc
-postgres_type.h
-postgres_util.h
-result_helper.h
-result_helper.cc
Makevars
diff --git a/r/adbcsnowflake/.Rbuildignore b/r/adbcsnowflake/.Rbuildignore
index 55797b92f..ae15f85ad 100644
--- a/r/adbcsnowflake/.Rbuildignore
+++ b/r/adbcsnowflake/.Rbuildignore
@@ -9,5 +9,6 @@
^_pkgdown\.yml$
^docs$
^pkgdown$
+^cran-comments\.md$
^src/\.go-cache$
^src/\.go-path$
diff --git a/r/adbcsnowflake/man/adbcsnowflake-package.Rd
b/r/adbcsnowflake/man/adbcsnowflake-package.Rd
index 684acc2be..2a57bdc0a 100644
--- a/r/adbcsnowflake/man/adbcsnowflake-package.Rd
+++ b/r/adbcsnowflake/man/adbcsnowflake-package.Rd
@@ -12,6 +12,7 @@ Provides a developer-facing interface to the 'Arrow' Database
Connectivity ('ADB
Useful links:
\itemize{
\item \url{https://github.com/apache/arrow-adbc}
+ \item \url{https://arrow.apache.org/adbc/current/r/adbcsnowflake/}
\item Report bugs at \url{https://github.com/apache/arrow-adbc/issues}
}
diff --git a/r/adbcsnowflake/src/Makevars.in b/r/adbcsnowflake/src/Makevars.in
index fcc1c0ee1..a91f1a62a 100644
--- a/r/adbcsnowflake/src/Makevars.in
+++ b/r/adbcsnowflake/src/Makevars.in
@@ -28,4 +28,4 @@ all: $(SHLIB)
$(SHLIB): gostatic
gostatic:
- (cd "$(CURDIR)/go/adbc"; GOMAXPROCS=$(GOMAXPROCS)
GOPATH="$(CURDIR)/.go-path" GOCACHE="$(CURDIR)/.go-cache" CC="$(CGO_CC)"
CXX="$(CGO_CXX)" CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(PKG_LIBS)" "@gobin@"
build -v -tags driverlib -o $(CURDIR)/go/libadbc_driver_snowflake.a
-buildmode=c-archive "./pkg/snowflake")
+ (cd "$(CURDIR)/go/adbc"; GOMAXPROCS=$(GOMAXPROCS)
GOPATH="$(CURDIR)/.go-path" GOCACHE="$(CURDIR)/.go-cache" GOFLAGS=-modcacherw
CC="$(CGO_CC)" CXX="$(CGO_CXX)" CGO_CFLAGS="$(CGO_CFLAGS)"
CGO_LDFLAGS="$(PKG_LIBS)" "@gobin@" build -v -tags driverlib -o
$(CURDIR)/go/libadbc_driver_snowflake.a -buildmode=c-archive "./pkg/snowflake")
diff --git a/r/adbcsqlite/NEWS.md b/r/adbcsqlite/NEWS.md
deleted file mode 100644
index 59b9be569..000000000
--- a/r/adbcsqlite/NEWS.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# adbcdrivermanager 0.8.0
-
-- Update upstream ADBC libraries to version 0.8.0.
-
-# adbcdrivermanager 0.7.0
-
-- Update upstream ADBC libraries to version 0.7.0.
-
-# adbcsqlite 0.6.0
-
-* Initial CRAN submission.
diff --git a/r/adbcsqlite/cleanup b/r/adbcsqlite/cleanup
index 4dc796871..2b0197d64 100755
--- a/r/adbcsqlite/cleanup
+++ b/r/adbcsqlite/cleanup
@@ -15,4 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-rm src/*.o src/nanoarrow/*.o src/common/*.o || true
+find src -name "*.o" -delete || true
+find src -name "*.so" -delete || true
diff --git a/r/adbcsqlite/man/adbcsqlite-package.Rd
b/r/adbcsqlite/man/adbcsqlite-package.Rd
index 50635ca37..bd062e32b 100644
--- a/r/adbcsqlite/man/adbcsqlite-package.Rd
+++ b/r/adbcsqlite/man/adbcsqlite-package.Rd
@@ -12,6 +12,7 @@ Provides a developer-facing interface to the 'Arrow' Database
Connectivity ('ADB
Useful links:
\itemize{
\item \url{https://github.com/apache/arrow-adbc}
+ \item \url{https://arrow.apache.org/adbc/current/r/adbcsqlite/}
\item Report bugs at \url{https://github.com/apache/arrow-adbc/issues}
}
diff --git a/r/adbcsqlite/src/.gitignore b/r/adbcsqlite/src/.gitignore
index c9519b201..36b4b3263 100644
--- a/r/adbcsqlite/src/.gitignore
+++ b/r/adbcsqlite/src/.gitignore
@@ -19,12 +19,6 @@
*.so
*.dll
adbc.h
-sqlite.c
-statement_reader.c
-statement_reader.h
-types.h
-utils.c
-utils.h
Makevars
sqlite3.c
sqlite3.h
diff --git a/r/adbcsqlite/src/nanoarrow/.gitignore
b/r/adbcsqlite/src/nanoarrow/.gitignore
deleted file mode 100644
index 632b0d880..000000000
--- a/r/adbcsqlite/src/nanoarrow/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-nanoarrow.c
-nanoarrow.h
-nanoarrow.hpp
