mem alloc issue no rows table, checkout v4 (#47)

meztez · Apr 3, 2024 · 679e74d · 679e74d
1 parent 6494b3c
commit 679e74d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -43,7 +43,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -20,7 +20,7 @@ jobs:
     outputs:
       distros: ${{ steps.setup-matrix.outputs.distros }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up matrix of builds
       id: setup-matrix
       run: |
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-Latest
     name: ${{ matrix.distro }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Build package
       run: |

diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml
@@ -14,7 +14,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
@@ -51,7 +51,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,12 +1,10 @@
 ## R CMD check results
 
-Duration: 1m 23.1s
+Duration: 1m 17.6s
 
 ❯ checking installed package size ... NOTE
     installed size is 14.7Mb
     sub-directories of 1Mb or more:
       libs  14.6Mb
 
 0 errors ✔ | 0 warnings ✔ | 1 note ✖
-
-* This is a new release.
diff --git a/src/bqs.cpp b/src/bqs.cpp
@@ -136,7 +136,8 @@ class BigQueryReadClient {
                 long int& rows_count,
                 long int& pages_count,
                 bool quiet,
-                RProgress::RProgress* pb) {
+                RProgress::RProgress* pb,
+                bool last_stream) {
 
     grpc::ClientContext context;
     context.AddMetadata("x-goog-request-params", "read_stream=" + stream);
@@ -193,6 +194,9 @@ class BigQueryReadClient {
       Rcpp::stop(err.c_str());
     }
     rows_count += method_request.offset();
+    if (last_stream && !quiet) {
+      pb->update(1);
+    }
   }
 
   // Split stream
@@ -372,12 +376,12 @@ SEXP bqs_ipc_stream(SEXP client,
   // Add batches to IPC stream
   for (int i = 0; i < read_session.streams_size(); i++) {
     client_ptr->ReadRows(read_session.streams(i).name(), &ipc_stream,
-                         n, rows_count, pages_count, quiet, &pb);
+                         n, rows_count, pages_count, quiet,
+                         &pb, i == read_session.streams_size() - 1);
   	if (n > 0 && rows_count >= n) {
   		break;
   	}
   }
-  pb.update(1);
 
   if (!quiet) {
     REprintf("Streamed %ld rows in %ld messages.\n", rows_count, pages_count);