paradedb · Weijun-H · Oct 9, 2024 · Oct 9, 2024 · Oct 9, 2024 · Oct 9, 2024
@@ -62,6 +62,7 @@ jobs:
         run: echo "PGRX_VERSION=$(cargo tree --depth 1 -i pgrx -p pg_analytics | head -n 1 | cut -f2 -dv)" >> $GITHUB_ENV
 
       - name: Install pgrx & pg_analytics
+        working-directory: pg_analytics/
         run: |
           cargo install -j $(nproc) --locked cargo-pgrx --version ${{ env.PGRX_VERSION }}
           cargo pgrx init --pg${{ matrix.pg_version }}=/usr/lib/postgresql/${{ matrix.pg_version }}/bin/pg_config
@@ -76,6 +77,7 @@ jobs:
         run: cargo run install
 
       - name: Run Official ${{ matrix.name }} Benchmark
+        working-directory: pg_analytics/
         run: |
           cargo pgrx start pg${{ matrix.pg_version }}
           cargo paradedb bench hits run ${{ matrix.flags }} --url postgresql://localhost:288${{ matrix.pg_version }}/postgres

@@ -122,6 +122,7 @@ jobs:
       # The integration tests also test upgrading the extension when passed the '-u' flag (only on promotion PRs)
       - name: Run pg_analytics Cargo Test Suite
         if: steps.check_skip.outputs.skip_remaining_steps != 'true'
+        working-directory: pg_analytics/
         env:
           LLVM_PROFILE_FILE: target/coverage/pg_analytics-%p-%m.profraw
           RUST_BACKTRACE: full
@@ -131,7 +132,7 @@ jobs:
 
           echo ""
           echo "Enabling code coverage..."
-          echo -e "\n# Enable code coverage on Linux only, for CI builds\n[target.'cfg(target_os=\"linux\")']\nrustflags = [\"-Cinstrument-coverage\"]" >> .cargo/config.toml
+          echo -e "\n# Enable code coverage on Linux only, for CI builds\n[target.'cfg(target_os=\"linux\")']\nrustflags = [\"-Cinstrument-coverage\"]" >> ../.cargo/config.toml
           mkdir -p target/coverage target/coverage-report
 
           echo ""

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,52 +1,11 @@
-[package]
-name = "pg_analytics"
-description = "Postgres for analytics, powered by DuckDB"
-version = "0.2.0"
-edition = "2021"
-license = "AGPL-3.0"
+[workspace]
+members = ["pg_analytics"]
+resolver = "2"
 
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[features]
-default = ["pg17"]
-pg13 = ["pgrx/pg13", "pgrx-tests/pg13", "supabase-wrappers/pg13"]
-pg14 = ["pgrx/pg14", "pgrx-tests/pg14", "supabase-wrappers/pg14"]
-pg15 = ["pgrx/pg15", "pgrx-tests/pg15", "supabase-wrappers/pg15"]
-pg16 = ["pgrx/pg16", "pgrx-tests/pg16", "supabase-wrappers/pg16"]
-pg17 = ["pgrx/pg17", "pgrx-tests/pg17", "supabase-wrappers/pg17"]
-pg_test = []
-
-[dependencies]
+[workspace.dependencies]
 anyhow = "1.0.88"
 async-std = { version = "1.13.0", features = ["tokio1", "attributes"] }
-chrono = "0.4.38"
-duckdb = { git = "https://github.com/paradedb/duckdb-rs.git", features = [
-  "bundled",
-  "extensions-full",
-], rev = "e532dd6" }
-pgrx = "0.12.5"
-serde = "1.0.210"
-serde_json = "1.0.128"
-signal-hook = "0.3.17"
-sqlparser = "0.50.0"
-strum = { version = "0.26.3", features = ["derive"] }
-supabase-wrappers = { git = "https://github.com/paradedb/wrappers.git", default-features = false, rev = "c32abb7" }
 thiserror = "1.0.63"
-uuid = "1.10.0"
-
-[dev-dependencies]
-aws-config = "1.5.6"
-aws-sdk-s3 = "1.49.0"
-bigdecimal = { version = "0.3.1", features = ["serde"] }
-bytes = "1.7.1"
-datafusion = "37.1.0"
-deltalake = { version = "0.17.3", features = ["datafusion"] }
-futures = "0.3.30"
-pgrx-tests = "0.12.5"
-rstest = "0.19.0"
-serde_arrow = { version = "0.11.7", features = ["arrow-51"] }
-soa_derive = "0.13.0"
 sqlx = { version = "0.7.4", features = [
   "postgres",
   "runtime-async-std",
@@ -55,12 +14,3 @@ sqlx = { version = "0.7.4", features = [
   "uuid",
   "chrono",
 ] }
-tempfile = "3.12.0"
-testcontainers = "0.16.7"
-testcontainers-modules = { version = "0.4.3", features = ["localstack"] }
-time = { version = "0.3.36", features = ["serde"] }
-geojson = "0.24.1"
-
-[[bin]]
-name = "pgrx_embed_pg_analytics"
-path = "src/bin/pgrx_embed.rs"
diff --git a/pg_analytics/Cargo.toml b/pg_analytics/Cargo.toml
@@ -0,0 +1,59 @@
+[package]
+name = "pg_analytics"
+description = "Postgres for analytics, powered by DuckDB"
+version = "0.2.0"
+edition = "2021"
+license = "AGPL-3.0"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+default = ["pg17"]
+pg13 = ["pgrx/pg13", "pgrx-tests/pg13", "supabase-wrappers/pg13"]
+pg14 = ["pgrx/pg14", "pgrx-tests/pg14", "supabase-wrappers/pg14"]
+pg15 = ["pgrx/pg15", "pgrx-tests/pg15", "supabase-wrappers/pg15"]
+pg16 = ["pgrx/pg16", "pgrx-tests/pg16", "supabase-wrappers/pg16"]
+pg17 = ["pgrx/pg17", "pgrx-tests/pg17", "supabase-wrappers/pg17"]
+pg_test = []
+
+[dependencies]
+anyhow = { workspace = true }
+async-std = { workspace = true }
+chrono = "0.4.38"
+duckdb = { git = "https://github.com/paradedb/duckdb-rs.git", features = [
+  "bundled",
+  "extensions-full",
+], rev = "e532dd6" }
+pgrx = "0.12.5"
+serde = "1.0.210"
+serde_json = "1.0.128"
+signal-hook = "0.3.17"
+sqlparser = "0.50.0"
+strum = { version = "0.26.3", features = ["derive"] }
+supabase-wrappers = { git = "https://github.com/paradedb/wrappers.git", default-features = false, rev = "c32abb7" }
+thiserror = { workspace = true }
+uuid = "1.10.0"
+
+[dev-dependencies]
+aws-config = "1.5.6"
+aws-sdk-s3 = "1.49.0"
+bigdecimal = { version = "0.3.1", features = ["serde"] }
+bytes = "1.7.1"
+datafusion = "37.1.0"
+deltalake = { version = "0.17.3", features = ["datafusion"] }
+futures = "0.3.30"
+pgrx-tests = "0.12.5"
+rstest = "0.19.0"
+serde_arrow = { version = "0.11.7", features = ["arrow-51"] }
+soa_derive = "0.13.0"
+sqlx = { workspace = true }
+tempfile = "3.12.0"
+testcontainers = "0.16.7"
+testcontainers-modules = { version = "0.4.3", features = ["localstack"] }
+time = { version = "0.3.36", features = ["serde"] }
+geojson = "0.24.1"
+
+[[bin]]
+name = "pgrx_embed_pg_analytics"
+path = "src/bin/pgrx_embed.rs"
diff --git a/pg_analytics.control → pg_analytics/pg_analytics.control b/pg_analytics.control → pg_analytics/pg_analytics.control
diff --git a/sql/pg_analytics--0.1.0--0.1.1.sql → ...lytics/sql/pg_analytics--0.1.0--0.1.1.sql b/sql/pg_analytics--0.1.0--0.1.1.sql → ...lytics/sql/pg_analytics--0.1.0--0.1.1.sql
diff --git a/sql/pg_analytics--0.1.1--0.1.2.sql → ...lytics/sql/pg_analytics--0.1.1--0.1.2.sql b/sql/pg_analytics--0.1.1--0.1.2.sql → ...lytics/sql/pg_analytics--0.1.1--0.1.2.sql
diff --git a/sql/pg_analytics--0.1.2--0.1.3.sql → ...lytics/sql/pg_analytics--0.1.2--0.1.3.sql b/sql/pg_analytics--0.1.2--0.1.3.sql → ...lytics/sql/pg_analytics--0.1.2--0.1.3.sql
diff --git a/sql/pg_analytics--0.1.3--0.1.4.sql → ...lytics/sql/pg_analytics--0.1.3--0.1.4.sql b/sql/pg_analytics--0.1.3--0.1.4.sql → ...lytics/sql/pg_analytics--0.1.3--0.1.4.sql
diff --git a/sql/pg_analytics--0.1.4--0.2.0.sql → ...lytics/sql/pg_analytics--0.1.4--0.2.0.sql b/sql/pg_analytics--0.1.4--0.2.0.sql → ...lytics/sql/pg_analytics--0.1.4--0.2.0.sql
diff --git a/src/api/csv.rs → pg_analytics/src/api/csv.rs b/src/api/csv.rs → pg_analytics/src/api/csv.rs
diff --git a/src/api/duckdb.rs → pg_analytics/src/api/duckdb.rs b/src/api/duckdb.rs → pg_analytics/src/api/duckdb.rs
diff --git a/src/api/mod.rs → pg_analytics/src/api/mod.rs b/src/api/mod.rs → pg_analytics/src/api/mod.rs
diff --git a/src/api/parquet.rs → pg_analytics/src/api/parquet.rs b/src/api/parquet.rs → pg_analytics/src/api/parquet.rs
diff --git a/src/api/time_bucket.rs → pg_analytics/src/api/time_bucket.rs b/src/api/time_bucket.rs → pg_analytics/src/api/time_bucket.rs
diff --git a/src/bin/pgrx_embed.rs → pg_analytics/src/bin/pgrx_embed.rs b/src/bin/pgrx_embed.rs → pg_analytics/src/bin/pgrx_embed.rs
diff --git a/src/debug_guc.rs → pg_analytics/src/debug_guc.rs b/src/debug_guc.rs → pg_analytics/src/debug_guc.rs
diff --git a/src/duckdb/connection.rs → pg_analytics/src/duckdb/connection.rs b/src/duckdb/connection.rs → pg_analytics/src/duckdb/connection.rs
diff --git a/src/duckdb/csv.rs → pg_analytics/src/duckdb/csv.rs b/src/duckdb/csv.rs → pg_analytics/src/duckdb/csv.rs
diff --git a/src/duckdb/delta.rs → pg_analytics/src/duckdb/delta.rs b/src/duckdb/delta.rs → pg_analytics/src/duckdb/delta.rs
diff --git a/src/duckdb/iceberg.rs → pg_analytics/src/duckdb/iceberg.rs b/src/duckdb/iceberg.rs → pg_analytics/src/duckdb/iceberg.rs
diff --git a/src/duckdb/json.rs → pg_analytics/src/duckdb/json.rs b/src/duckdb/json.rs → pg_analytics/src/duckdb/json.rs
diff --git a/src/duckdb/mod.rs → pg_analytics/src/duckdb/mod.rs b/src/duckdb/mod.rs → pg_analytics/src/duckdb/mod.rs
diff --git a/src/duckdb/parquet.rs → pg_analytics/src/duckdb/parquet.rs b/src/duckdb/parquet.rs → pg_analytics/src/duckdb/parquet.rs
diff --git a/src/duckdb/secret.rs → pg_analytics/src/duckdb/secret.rs b/src/duckdb/secret.rs → pg_analytics/src/duckdb/secret.rs
diff --git a/src/duckdb/spatial.rs → pg_analytics/src/duckdb/spatial.rs b/src/duckdb/spatial.rs → pg_analytics/src/duckdb/spatial.rs
diff --git a/src/duckdb/utils.rs → pg_analytics/src/duckdb/utils.rs b/src/duckdb/utils.rs → pg_analytics/src/duckdb/utils.rs
diff --git a/src/fdw/base.rs → pg_analytics/src/fdw/base.rs b/src/fdw/base.rs → pg_analytics/src/fdw/base.rs
diff --git a/src/fdw/csv.rs → pg_analytics/src/fdw/csv.rs b/src/fdw/csv.rs → pg_analytics/src/fdw/csv.rs
diff --git a/src/fdw/delta.rs → pg_analytics/src/fdw/delta.rs b/src/fdw/delta.rs → pg_analytics/src/fdw/delta.rs
diff --git a/src/fdw/handler.rs → pg_analytics/src/fdw/handler.rs b/src/fdw/handler.rs → pg_analytics/src/fdw/handler.rs
diff --git a/src/fdw/iceberg.rs → pg_analytics/src/fdw/iceberg.rs b/src/fdw/iceberg.rs → pg_analytics/src/fdw/iceberg.rs
diff --git a/src/fdw/json.rs → pg_analytics/src/fdw/json.rs b/src/fdw/json.rs → pg_analytics/src/fdw/json.rs
diff --git a/src/fdw/mod.rs → pg_analytics/src/fdw/mod.rs b/src/fdw/mod.rs → pg_analytics/src/fdw/mod.rs
diff --git a/src/fdw/parquet.rs → pg_analytics/src/fdw/parquet.rs b/src/fdw/parquet.rs → pg_analytics/src/fdw/parquet.rs
diff --git a/src/fdw/spatial.rs → pg_analytics/src/fdw/spatial.rs b/src/fdw/spatial.rs → pg_analytics/src/fdw/spatial.rs
diff --git a/src/fdw/trigger.rs → pg_analytics/src/fdw/trigger.rs b/src/fdw/trigger.rs → pg_analytics/src/fdw/trigger.rs
diff --git a/src/hooks/executor.rs → pg_analytics/src/hooks/executor.rs b/src/hooks/executor.rs → pg_analytics/src/hooks/executor.rs
diff --git a/src/hooks/mod.rs → pg_analytics/src/hooks/mod.rs b/src/hooks/mod.rs → pg_analytics/src/hooks/mod.rs
diff --git a/src/hooks/query.rs → pg_analytics/src/hooks/query.rs b/src/hooks/query.rs → pg_analytics/src/hooks/query.rs
diff --git a/src/hooks/utility.rs → pg_analytics/src/hooks/utility.rs b/src/hooks/utility.rs → pg_analytics/src/hooks/utility.rs
diff --git a/src/lib.rs → pg_analytics/src/lib.rs b/src/lib.rs → pg_analytics/src/lib.rs
diff --git a/src/schema/cell.rs → pg_analytics/src/schema/cell.rs b/src/schema/cell.rs → pg_analytics/src/schema/cell.rs
diff --git a/src/schema/datetime.rs → pg_analytics/src/schema/datetime.rs b/src/schema/datetime.rs → pg_analytics/src/schema/datetime.rs
diff --git a/src/schema/mod.rs → pg_analytics/src/schema/mod.rs b/src/schema/mod.rs → pg_analytics/src/schema/mod.rs
diff --git a/tests/datetime.rs → pg_analytics/tests/datetime.rs b/tests/datetime.rs → pg_analytics/tests/datetime.rs
diff --git a/tests/explain.rs → pg_analytics/tests/explain.rs b/tests/explain.rs → pg_analytics/tests/explain.rs
diff --git a/tests/fixtures/arrow.rs → pg_analytics/tests/fixtures/arrow.rs b/tests/fixtures/arrow.rs → pg_analytics/tests/fixtures/arrow.rs
diff --git a/tests/fixtures/db.rs → pg_analytics/tests/fixtures/db.rs b/tests/fixtures/db.rs → pg_analytics/tests/fixtures/db.rs
diff --git a/tests/fixtures/mod.rs → pg_analytics/tests/fixtures/mod.rs b/tests/fixtures/mod.rs → pg_analytics/tests/fixtures/mod.rs
diff --git a/tests/fixtures/tables/duckdb_types.rs → ...ics/tests/fixtures/tables/duckdb_types.rs b/tests/fixtures/tables/duckdb_types.rs → ...ics/tests/fixtures/tables/duckdb_types.rs
diff --git a/tests/fixtures/tables/mod.rs → pg_analytics/tests/fixtures/tables/mod.rs b/tests/fixtures/tables/mod.rs → pg_analytics/tests/fixtures/tables/mod.rs
diff --git a/tests/fixtures/tables/nyc_trips.rs → ...lytics/tests/fixtures/tables/nyc_trips.rs b/tests/fixtures/tables/nyc_trips.rs → ...lytics/tests/fixtures/tables/nyc_trips.rs
diff --git a/tests/json.rs → pg_analytics/tests/json.rs b/tests/json.rs → pg_analytics/tests/json.rs
diff --git a/tests/scan.rs → pg_analytics/tests/scan.rs b/tests/scan.rs → pg_analytics/tests/scan.rs
diff --git a/tests/settings.rs → pg_analytics/tests/settings.rs b/tests/settings.rs → pg_analytics/tests/settings.rs
diff --git a/tests/spatial.rs → pg_analytics/tests/spatial.rs b/tests/spatial.rs → pg_analytics/tests/spatial.rs
diff --git a/tests/table_config.rs → pg_analytics/tests/table_config.rs b/tests/table_config.rs → pg_analytics/tests/table_config.rs