{@link com.google.cloud.bigtable.gaxx.reframing.ReframingResponseObserver} pushes {@link - * com.google.bigtable.v2.ReadRowsResponse.CellChunk}s into this class and pops fully merged logical - * rows. Example usage: + * ReadRowsResponse.CellChunk}s into this class and pops fully merged logical rows. Example usage: * *
{@code
* RowMerger rowMerger = new RowMerger<>(myRowBuilder);
@@ -58,81 +59,47 @@
@InternalApi
public class RowMerger implements Reframer {
private final StateMachine stateMachine;
- private ReadRowsResponse buffer;
- private int nextChunk;
- private RowT nextRow;
+ private Queue mergedRows;
public RowMerger(RowBuilder rowBuilder) {
stateMachine = new StateMachine<>(rowBuilder);
-
- nextChunk = 0;
- buffer = ReadRowsResponse.getDefaultInstance();
+ mergedRows = new ArrayDeque<>();
}
@Override
public void push(ReadRowsResponse response) {
- Preconditions.checkState(
- buffer.getChunksCount() <= nextChunk, "Previous response not fully consumed");
-
- buffer = response;
- nextChunk = 0;
-
// If the server sends a scan heartbeat, notify the StateMachine. It will generate a synthetic
// row marker. See RowAdapter for more info.
if (!response.getLastScannedRowKey().isEmpty()) {
stateMachine.handleLastScannedRow(response.getLastScannedRowKey());
+ if (stateMachine.hasCompleteRow()) {
+ mergedRows.add(stateMachine.consumeRow());
+ }
+ }
+ for (ReadRowsResponse.CellChunk cellChunk : response.getChunksList()) {
+ stateMachine.handleChunk(cellChunk);
+ if (stateMachine.hasCompleteRow()) {
+ mergedRows.add(stateMachine.consumeRow());
+ }
}
}
@Override
public boolean hasFullFrame() {
- // Check if there an assembled row to consume
- if (nextRow != null) {
- return true;
- }
-
- // Otherwise try to assemble a new row (readNextRow will set nextRow)
- boolean newRowCompleted = readNextRow();
- return newRowCompleted;
+ return !mergedRows.isEmpty();
}
@Override
public boolean hasPartialFrame() {
- // Check if any of the buffers in this class contain data.
- // `hasFullFrame()` will check if `nextRow` has a row ready to go or if chunks in `buffer` can
- // be used to create a new `nextRow`
- if (hasFullFrame()) {
- return true;
- }
-
- // If an assembled is still not available, then that means `buffer` has been fully consumed.
- // The last place to check is the StateMachine buffer, to see if its holding on to an incomplete
- // row.
- return stateMachine.isRowInProgress();
+ // Check if buffer in this class contains data. If an assembled is still not available, then
+ // that means `buffer` has been fully consumed. The last place to check is the StateMachine
+ // buffer, to see if its holding on to an incomplete row.
+ return hasFullFrame() || stateMachine.isRowInProgress();
}
@Override
public RowT pop() {
- RowT row = nextRow;
- nextRow = null;
- return row;
- }
-
- private boolean readNextRow() {
- // StateMachine might have a complete row already from receiving a scan marker.
- if (stateMachine.hasCompleteRow()) {
- nextRow = stateMachine.consumeRow();
- return true;
- }
-
- while (nextChunk < buffer.getChunksCount()) {
- stateMachine.handleChunk(buffer.getChunks(nextChunk++));
-
- if (stateMachine.hasCompleteRow()) {
- nextRow = stateMachine.consumeRow();
- return true;
- }
- }
- return false;
+ return Preconditions.checkNotNull(
+ mergedRows.poll(), "RowMerger.pop() called when there are no rows");
}
}
From 5415c49cf52a1cefdce880a554cb9d499e6761a2 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot
Date: Thu, 22 Apr 2021 08:54:03 -0700
Subject: [PATCH 3/8] chore: regenerate README (#778)
This PR was generated using Autosynth. :rainbow:
Log from Synthtool
```
2021-04-22 15:43:00,856 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-bigtable/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-22 15:43:02,769 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.
```
Full log will be available here:
https://source.cloud.google.com/results/invocations/e6e3886e-85d3-48e8-9884-0a563f8c6163/targets
- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
.github/readme/synth.metadata/synth.metadata | 4 ++--
README.md | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index 0f54764aaf..acfcdb2d57 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-bigtable.git",
- "sha": "5ab60eedb7104d8d2b3bddc72db0a27576a65395"
+ "sha": "ac534a6ef7c08c8bf6ecb94c590643bd473baa9d"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "b33b0e2056a85fc2264b294f2cf47dcd45e95186"
+ "sha": "5a6f30b8bb7672cf237c4f75d5aa96bfba170e7f"
}
}
]
diff --git a/README.md b/README.md
index 1d9521d086..72640c6cad 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-bigtable'
```
If you are using Gradle without BOM, add this to your dependencies
```Groovy
-compile 'com.google.cloud:google-cloud-bigtable:1.23.0'
+compile 'com.google.cloud:google-cloud-bigtable:1.23.1'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.23.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.23.1"
```
## Authentication
From 221264bbbce2e5bc7fdb84808f77dbbd4d56f749 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Fri, 23 Apr 2021 01:24:14 +0200
Subject: [PATCH 4/8] build(deps): update dependency
com.google.cloud:google-cloud-shared-config to v0.11.2 (#779)
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `0.11.1` -> `0.11.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Release Notes
googleapis/java-shared-config
### [`v0.11.2`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#0112-httpswwwgithubcomgoogleapisjava-shared-configcomparev0111v0112-2021-04-22)
[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.11.1...v0.11.2)
---
### Configuration
:date: **Schedule**: At any time (no schedule defined).
:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, check this box.
---
This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable).
---
google-cloud-bigtable-bom/pom.xml | 2 +-
google-cloud-bigtable-deps-bom/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index 1a1a797363..1bfbc73071 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud
google-cloud-shared-config
- 0.11.1
+ 0.11.2
Google Cloud Bigtable BOM
diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index 63151a7dc1..7423966215 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -7,7 +7,7 @@
com.google.cloud
google-cloud-shared-config
- 0.11.1
+ 0.11.2
com.google.cloud
diff --git a/pom.xml b/pom.xml
index 4fe54a3b06..f2e66b8d57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 0.11.1
+ 0.11.2
From ae6a61063a5b640d70fd7d4444cd199066f7c8e3 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Fri, 23 Apr 2021 16:41:27 +0200
Subject: [PATCH 5/8] chore(deps): update dependency
com.google.cloud:google-cloud-bigtable to v1.23.1 (#771)
---
samples/install-without-bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 5ef6692fc4..b8f4fdecb8 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-bigtable
- 1.23.0
+ 1.23.1
From 09ffbf30109aad2b85eb0fb366881aaa776c8077 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot
Date: Fri, 23 Apr 2021 09:04:03 -0700
Subject: [PATCH 6/8] chore: regenerate README (#780)
This PR was generated using Autosynth. :rainbow:
Log from Synthtool
```
2021-04-23 14:43:38,817 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-bigtable/.github/readme/synth.py.
On branch autosynth-readme
nothing to commit, working tree clean
2021-04-23 14:43:40,084 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata.
```
Full log will be available here:
https://source.cloud.google.com/results/invocations/36dd4646-6a56-4ce4-a274-868fe7efc1f0/targets
- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
---
.github/readme/synth.metadata/synth.metadata | 2 +-
README.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata
index acfcdb2d57..3e84f801da 100644
--- a/.github/readme/synth.metadata/synth.metadata
+++ b/.github/readme/synth.metadata/synth.metadata
@@ -4,7 +4,7 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-bigtable.git",
- "sha": "ac534a6ef7c08c8bf6ecb94c590643bd473baa9d"
+ "sha": "ae6a61063a5b640d70fd7d4444cd199066f7c8e3"
}
},
{
diff --git a/README.md b/README.md
index 72640c6cad..866f55f8fc 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
com.google.cloud
google-cloud-bigtable
- 1.23.0
+ 1.23.1
```
From dbf856f93942cbec48433821da8e5a96e61a9d7e Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Fri, 23 Apr 2021 23:18:07 +0200
Subject: [PATCH 7/8] deps: update dependency
com.google.cloud:google-cloud-shared-dependencies to v1 (#781)
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `0.21.1` -> `1.0.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Release Notes
googleapis/java-shared-dependencies
### [`v1.0.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#100-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare0211v100-2021-04-23)
[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v0.21.1...v1.0.0)
##### Features
- promote to 1.0.0 ([#341](https://www.github.com/googleapis/java-shared-dependencies/issues/341)) ([eddce7b](https://www.github.com/googleapis/java-shared-dependencies/commit/eddce7bda196d757c0bb93a05574cc742e3d7ff6))
##### Dependencies
- update dependency com.google.api:api-common to v1.10.3 ([#340](https://www.github.com/googleapis/java-shared-dependencies/issues/340)) ([6a7fc33](https://www.github.com/googleapis/java-shared-dependencies/commit/6a7fc33548c199d5f310b3ee5024907882d22726))
- update dependency com.google.auth:google-auth-library-bom to v0.25.4 ([#334](https://www.github.com/googleapis/java-shared-dependencies/issues/334)) ([e5c747d](https://www.github.com/googleapis/java-shared-dependencies/commit/e5c747d245194effc258ae706e7764153010cd53))
- update dependency com.google.auth:google-auth-library-bom to v0.25.5 ([#338](https://www.github.com/googleapis/java-shared-dependencies/issues/338)) ([ffa1df5](https://www.github.com/googleapis/java-shared-dependencies/commit/ffa1df5497b5365f520b665a202b8caf6521fc9d))
- update dependency org.threeten:threetenbp to v1.5.1 ([#335](https://www.github.com/googleapis/java-shared-dependencies/issues/335)) ([c8c6df4](https://www.github.com/googleapis/java-shared-dependencies/commit/c8c6df48e7f80944544939e502f4f08543af2631))
- update google.core.version to v1.94.8 ([#342](https://www.github.com/googleapis/java-shared-dependencies/issues/342)) ([d946dd2](https://www.github.com/googleapis/java-shared-dependencies/commit/d946dd2299aac32f969a2226a1391e1e73f00e62))
##### [0.21.1](https://www.github.com/googleapis/java-shared-dependencies/compare/0.21.0...v0.21.1) (2021-04-19)
##### Bug Fixes
- release scripts from issuing overlapping phases ([#332](https://www.github.com/googleapis/java-shared-dependencies/issues/332)) ([e289825](https://www.github.com/googleapis/java-shared-dependencies/commit/e289825a3bc45b4796db7ce4347f8d9d9251a410))
##### Dependencies
- update dependency com.fasterxml.jackson:jackson-bom to v2.12.3 ([#329](https://www.github.com/googleapis/java-shared-dependencies/issues/329)) ([a77b4fc](https://www.github.com/googleapis/java-shared-dependencies/commit/a77b4fcc2ea5caf366c76a4698bac6d4c9abc92e))
- update dependency com.google.api-client:google-api-client-bom to v1.31.4 ([#326](https://www.github.com/googleapis/java-shared-dependencies/issues/326)) ([409d24f](https://www.github.com/googleapis/java-shared-dependencies/commit/409d24f8a0cac30e41ca45eb2711aecb335d70dd))
- update dependency com.google.auth:google-auth-library-bom to v0.25.3 ([#328](https://www.github.com/googleapis/java-shared-dependencies/issues/328)) ([88cfc08](https://www.github.com/googleapis/java-shared-dependencies/commit/88cfc08952881200e23ed95cfa2eebad85ec7ab3))
- update google.core.version to v1.94.7 ([#324](https://www.github.com/googleapis/java-shared-dependencies/issues/324)) ([0412c88](https://www.github.com/googleapis/java-shared-dependencies/commit/0412c88468940c1182bc0761bfe269a6688fe7b7))
- update iam.version to v1.0.12 ([#327](https://www.github.com/googleapis/java-shared-dependencies/issues/327)) ([548d5f5](https://www.github.com/googleapis/java-shared-dependencies/commit/548d5f53c4f264f1cbb9ca72fdfe4608ab16b480))
---
### Configuration
:date: **Schedule**: At any time (no schedule defined).
:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, check this box.
---
This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable).
---
google-cloud-bigtable-deps-bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index 7423966215..4e98eb2614 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -75,7 +75,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 0.21.1
+ 1.0.0
pom
import
From 7bb0ec5e0290258b0474b6482b6806f3d35bbb61 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 18:02:06 +0000
Subject: [PATCH 8/8] chore: release 1.23.2 (#782)
:robot: I have created a release \*beep\* \*boop\*
---
### [1.23.2](https://www.github.com/googleapis/java-bigtable/compare/v1.23.1...v1.23.2) (2021-04-23)
### Dependencies
* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#781](https://www.github.com/googleapis/java-bigtable/issues/781)) ([dbf856f](https://www.github.com/googleapis/java-bigtable/commit/dbf856f93942cbec48433821da8e5a96e61a9d7e))
---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
CHANGELOG.md | 7 +++++++
google-cloud-bigtable-bom/pom.xml | 14 +++++++-------
google-cloud-bigtable-deps-bom/pom.xml | 2 +-
google-cloud-bigtable-emulator/pom.xml | 8 ++++----
google-cloud-bigtable/pom.xml | 10 +++++-----
grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++----
grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++----
pom.xml | 2 +-
proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++----
proto-google-cloud-bigtable-v2/pom.xml | 8 ++++----
samples/snapshot/pom.xml | 2 +-
versions.txt | 12 ++++++------
12 files changed, 48 insertions(+), 41 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e4b52d129..2377b7460e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+### [1.23.2](https://www.github.com/googleapis/java-bigtable/compare/v1.23.1...v1.23.2) (2021-04-23)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#781](https://www.github.com/googleapis/java-bigtable/issues/781)) ([dbf856f](https://www.github.com/googleapis/java-bigtable/commit/dbf856f93942cbec48433821da8e5a96e61a9d7e))
+
### [1.23.1](https://www.github.com/googleapis/java-bigtable/compare/v1.23.0...v1.23.1) (2021-04-20)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index 1bfbc73071..40764a31ac 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-bigtable-bom
- 1.23.2-SNAPSHOT
+ 1.23.2
pom
com.google.cloud
@@ -72,32 +72,32 @@
com.google.cloud
google-cloud-bigtable
- 1.23.2-SNAPSHOT
+ 1.23.2
com.google.cloud
google-cloud-bigtable-emulator
- 0.132.2-SNAPSHOT
+ 0.132.2
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 1.23.2-SNAPSHOT
+ 1.23.2
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 1.23.2-SNAPSHOT
+ 1.23.2
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 1.23.2-SNAPSHOT
+ 1.23.2
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 1.23.2-SNAPSHOT
+ 1.23.2