fix: make pyo3 optional again (#1153 )

* fix: make pyo3 optional again * Update src/script/Cargo.toml Co-authored-by: dennis zhuang <killme2008@gmail.com> --------- Co-authored-by: dennis zhuang <killme2008@gmail.com>
feat: abi3 & abi37 (#1151 )
2025-12-27 16:32:54 +00:00 · 2023-03-09 14:16:48 +00:00 · 2023-03-09 20:08:07 +08:00 · 2023-03-09 16:42:40 +08:00 · 2023-03-09 14:24:29 +08:00 · 2023-03-09 03:42:04 +00:00
6 changed files with 453 additions and 433 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,13 +12,11 @@ name: Release
 env:
  RUST_TOOLCHAIN: nightly-2023-02-26

-  # FIXME(zyy17): Would be better to use `gh release list -L 1 | cut -f 3` to get the latest release version tag, but for a long time, we will stay at 'v0.1.0-alpha-*'.
-  SCHEDULED_BUILD_VERSION_PREFIX: v0.1.0-alpha
+  SCHEDULED_BUILD_VERSION_PREFIX: v0.2.0

-  # In the future, we can change SCHEDULED_PERIOD to nightly.
-  SCHEDULED_PERIOD: weekly
+  SCHEDULED_PERIOD: nightly

-  CARGO_PROFILE: weekly
+  CARGO_PROFILE: nightly

 jobs:
  build:
@@ -30,16 +28,21 @@ jobs:
          - arch: x86_64-unknown-linux-gnu
            os: ubuntu-2004-16-cores
            file: greptime-linux-amd64
-          # - arch: aarch64-unknown-linux-gnu
-          #   os: ubuntu-2004-16-cores
-          #   file: greptime-linux-arm64
-          # - arch: aarch64-apple-darwin
-          #   os: macos-latest
-          #   file: greptime-darwin-arm64
-          # - arch: x86_64-apple-darwin
-          #   os: macos-latest
-          #   file: greptime-darwin-amd64
+            continue-on-error: false
+          - arch: aarch64-unknown-linux-gnu
+            os: ubuntu-2004-16-cores
+            file: greptime-linux-arm64
+            continue-on-error: true
+          - arch: aarch64-apple-darwin
+            os: macos-latest
+            file: greptime-darwin-arm64
+            continue-on-error: true
+          - arch: x86_64-apple-darwin
+            os: macos-latest
+            file: greptime-darwin-amd64
+            continue-on-error: true
    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.continue-on-error }}
    if: github.repository == 'GreptimeTeam/greptimedb'
    steps:
      - name: Checkout sources
@@ -141,12 +144,12 @@ jobs:
      - name: Download artifacts
        uses: actions/download-artifact@v3

-      - name: Configure scheduled build version # the version would be ${SCHEDULED_BUILD_VERSION_PREFIX}-YYYYMMDD-${SCHEDULED_PERIOD}, like v0.1.0-alpha-20221119-weekly.
+      - name: Configure scheduled build version # the version would be ${SCHEDULED_BUILD_VERSION_PREFIX}-${SCHEDULED_PERIOD}-YYYYMMDD, like v0.2.0-nigthly-20230313.
        shell: bash
        if: github.event_name == 'schedule'
        run: |
          buildTime=`date "+%Y%m%d"`
-          SCHEDULED_BUILD_VERSION=${{ env.SCHEDULED_BUILD_VERSION_PREFIX }}-$buildTime-${{ env.SCHEDULED_PERIOD }}
+          SCHEDULED_BUILD_VERSION=${{ env.SCHEDULED_BUILD_VERSION_PREFIX }}-${{ env.SCHEDULED_PERIOD }}-$buildTime
          echo "SCHEDULED_BUILD_VERSION=${SCHEDULED_BUILD_VERSION}" >> $GITHUB_ENV

      - name: Create scheduled build git tag
@@ -181,30 +184,6 @@ jobs:
      - name: Checkout sources
        uses: actions/checkout@v3

-      - name: Download amd64 binary
-        uses: actions/download-artifact@v3
-        with:
-          name: greptime-linux-amd64
-          path: amd64
-
-      - name: Unzip the amd64 artifacts
-        run: |
-          cd amd64
-          tar xvf greptime-linux-amd64.tgz
-          rm greptime-linux-amd64.tgz
-
-      # - name: Download arm64 binary
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: greptime-linux-arm64
-      #     path: arm64
-
-      # - name: Unzip the arm64 artifacts
-      #   run: |
-      #     cd arm64
-      #     tar xvf greptime-linux-arm64.tgz
-      #     rm greptime-linux-arm64.tgz
-
      - name: Login to UCloud Container Registry
        uses: docker/login-action@v2
        with:
@@ -239,13 +218,54 @@ jobs:
      - name: Set up buildx
        uses: docker/setup-buildx-action@v2

-      - name: Build and push
+      - name: Download amd64 binary
+        uses: actions/download-artifact@v3
+        with:
+          name: greptime-linux-amd64
+          path: amd64
+
+      - name: Unzip the amd64 artifacts
+        run: |
+          cd amd64
+          tar xvf greptime-linux-amd64.tgz
+          rm greptime-linux-amd64.tgz
+
+      - name: Download arm64 binary
+        id: download-arm64
+        uses: actions/download-artifact@v3
+        with:
+          name: greptime-linux-arm64
+          path: arm64
+
+      - name: Unzip the arm64 artifacts
+        id: unzip-arm64
+        if: success() || steps.download-arm64.conclusion == 'success'
+        run: |
+          cd arm64
+          tar xvf greptime-linux-arm64.tgz
+          rm greptime-linux-arm64.tgz
+
+      - name: Build and push all
        uses: docker/build-push-action@v3
+        if: success() || steps.unzip-arm64.conclusion == 'success' # Build and push all platform if unzip-arm64 succeeds
+        with:
+          context: .
+          file: ./docker/ci/Dockerfile
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            greptime/greptimedb:latest
+            greptime/greptimedb:${{ env.IMAGE_TAG }}
+            uhub.service.ucloud.cn/greptime/greptimedb:latest
+            uhub.service.ucloud.cn/greptime/greptimedb:${{ env.IMAGE_TAG }}
+
+      - name: Build and push amd64 only
+        uses: docker/build-push-action@v3
+        if: success() || steps.download-arm64.conclusion == 'failure' # Only build and push amd64 platform if download-arm64 fails
        with:
          context: .
          file: ./docker/ci/Dockerfile
          push: true
-          # platforms: linux/amd64,linux/arm64
          platforms: linux/amd64
          tags: |
            greptime/greptimedb:latest
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ edition = "2021"
 license = "Apache-2.0"

 [workspace.dependencies]
-arrow = { version = "33.0", features = ["pyarrow"] }
+arrow = { version = "33.0" }
 arrow-array = "33.0"
 arrow-flight = "33.0"
 arrow-schema = { version = "33.0", features = ["serde"] }
@@ -81,7 +81,7 @@ uuid = { version = "1", features = ["serde", "v4", "fast-rng"] }
 [profile.release]
 debug = true

-[profile.weekly]
+[profile.nightly]
 inherits = "release"
 strip = true
 lto = "thin"
--- a/src/common/mem-prof/Cargo.toml
+++ b/src/common/mem-prof/Cargo.toml
@@ -15,6 +15,3 @@ tokio.workspace = true
 [dependencies.tikv-jemalloc-sys]
 version = "0.5"
 features = ["stats", "profiling", "unprefixed_malloc_on_supported_platforms"]
-
-[profile.release]
-debug = true
--- a/src/script/Cargo.toml
+++ b/src/script/Cargo.toml
@@ -6,7 +6,7 @@ license.workspace = true

 [features]
 default = ["python"]
-pyo3_backend = ["pyo3"]
+pyo3_backend = ["dep:pyo3", "arrow/pyarrow"]
 python = [
    "dep:datafusion",
    "dep:datafusion-common",
@@ -60,7 +60,7 @@ rustpython-vm = { git = "https://github.com/discord9/RustPython", optional = tru
    "default",
    "codegen",
 ] }
-pyo3 = { version = "0.18", optional = true }
+pyo3 = { version = "0.18", optional = true, features = ["abi3", "abi3-py37"] }
 session = { path = "../session" }
 snafu = { version = "0.7", features = ["backtraces"] }
 sql = { path = "../sql" }
--- a/src/store-api/src/logstore/entry_stream.rs
+++ b/src/store-api/src/logstore/entry_stream.rs
@@ -122,7 +122,7 @@ mod tests {
    #[tokio::test]
    pub async fn test_entry_stream() {
        let stream =
-            async_stream::stream!({ yield Ok(vec![SimpleEntry::new("test_entry".as_bytes())]) });
+            async_stream::stream!(yield Ok(vec![SimpleEntry::new("test_entry".as_bytes())]));

        let mut stream_impl = EntryStreamImpl {
            inner: Box::pin(stream),
Author	SHA1	Message	Date
Ning Sun	58bdf27068	fix: make pyo3 optional again (#1153 ) * fix: make pyo3 optional again * Update src/script/Cargo.toml Co-authored-by: dennis zhuang <killme2008@gmail.com> --------- Co-authored-by: dennis zhuang <killme2008@gmail.com>	2023-03-09 14:16:48 +00:00
discord9	610a895b66	feat: `abi3` & `abi37` (#1151 )	2023-03-09 20:08:07 +08:00
zyy17	a9ccc06449	ci: modify scheduled release tag to 'v0.2.0-nightly-yymmdd' (#1149 ) * ci: modify scheduled release tag to 'v0.2.0-nightly-yymmdd' Signed-off-by: zyy17 <zyylsxm@gmail.com> * refactor: modify 'profile.weekly' to 'profile.nightly' Signed-off-by: zyy17 <zyylsxm@gmail.com> --------- Signed-off-by: zyy17 <zyylsxm@gmail.com>	2023-03-09 16:42:40 +08:00
Ruihang Xia	38fe1a2f01	chore: update dependencies (#1148 ) Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2023-03-09 14:24:29 +08:00
fys	3414ac46b0	fix: remove unnecessary braces around block return value (#1147 )	2023-03-09 03:42:04 +00:00
Lei, HUANG	757b4a87a0	fix: remove profile in mem-prof crate to suppress compiler warnings (#1146 )	2023-03-09 03:39:24 +00:00
Yingwen	ba1517fceb	ci: Fix step "build and push amd64" not triggered (#1145 )	2023-03-09 11:35:38 +08:00
Yingwen	5b5d953d56	ci: tolerate error while building arm64 releases (#1143 ) * ci: allow failure while building arm64 docker * ci: Remove continue-on-error on docker step	2023-03-08 21:11:40 +08:00