Move ArraySet and tests to common [230860589]

Fixed

Bug

Status Update

No update yet.

Description

ar...@google.com

created issue #1

Apr 29, 2022 04:05PM

Move ArraySet to common. Make sure binary/source compatibility is preserved.

Comments

ar...@google.com <ar...@google.com> Apr 29, 2022 04:07PM

Accepted by ar...@google.com.

ap...@google.com <ap...@google.com> #2May 6, 2022 11:32AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit b90079595f33f58fece04026a97faa0d243acdb1
Author: Yuichi Araki <yaraki@google.com>
Date: Wed Sep 18 16:55:49 2019

Change the way to detect mismatch between POJO and query

This fixes cursor mismatch warnings with expandProjection.

Bug: 140759491
Test: QueryMethodProcessorTest
Change-Id: I7659002e5e0d1ef60fc1af2a625c0c36da0664d8

M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
M room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
M room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt

https://android-review.googlesource.com/1123258

https://goto.google.com/android-sha1/b90079595f33f58fece04026a97faa0d243acdb1

ap...@google.com <ap...@google.com> #3May 26, 2022 09:15AM

The following changes were cherrypicked through Coastguard (

https://android-build.googleplex.com/coastguard/)
Release Track: (

https://android-build.googleplex.com/coastguard/dashboard/6093116828680192/#/cherrypickHistory/all)
Created: 2019-10-14 17:23:42.610596+00:00
Changes: aosp/1123258

ap...@google.com <ap...@google.com> #4May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit bdde5a1a970ddc9007b28de4aa29d60ffa588f08
Author: Yigit Boyar <yboyar@google.com>
Date: Thu Apr 16 16:47:05 2020

Re-factor how errors are dismissed when query is re-written

This CL changes how we handle errors/warnings if query is
re-written.
There was a bug in expandProjection where we would report warnings
for things that Room already fixes automatically (

b/140759491

).
The solution to that problem (I7659002e5e0d1ef60fc1af2a625c0c36da0664d8)
solved it by deferring validating of columns until after re-write
decision is made. Unfortunately, this required changing PojoRowAdapter
to have a dummy mapping until it is validating, make it hard to use
as it does have a non-null mapping which is not useful.

This CL partially reverts that change and instead rely on the log
deferring logic we have in Context. This way, we don't need to break
the stability of PojoRowAdapter while still having the ability to
drop warnings that room fixes. This will also play nicer when we
have different query re-writing options that can use more information
about the query results.

Bug: 153387066
Bug: 140759491
Test: existing tests pass
Change-Id: I2ec967c763d33d7a3ff02c1a13c6953b460d1e5f

M room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
M room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
M room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt

https://android-review.googlesource.com/1288456

ap...@google.com <ap...@google.com> #5May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-main

commit 54f252fbb8d6dfcaa09bd43249a48d6d8eba0b91
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Thu May 12 16:46:20 2022

Moved ArraySet.java to kotlin

Bug: 230860589
Test: N/A
Change-Id: I1f446bdba2a81e1cad00ecfc5b2b89cc3d119db9

M collection/collection/src/jvmMain/kotlin/androidx/collection/ArraySet.kt

https://android-review.googlesource.com/2096797

ap...@google.com <ap...@google.com> #6May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-main

commit 7989e24f65166348991db28c8b4ded1e12a92892
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Thu May 12 16:45:37 2022

Deleted ArraySet.kt

Bug: 230860589
Test: N/A
Change-Id: Iff94dc4a62b5fef6a367d93a55f07e07808fa119

D collection/collection/src/jvmMain/kotlin/androidx/collection/ArraySet.kt

https://android-review.googlesource.com/2096796

ap...@google.com <ap...@google.com> #7May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-main

commit 45d9a01ed442bedfaebfbc940430782e78e2e87f
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 13 14:25:12 2022

Copied ArraySet tests from collection2

Bug: 230860589
Test: ArraySetTest
Change-Id: I7e43b879260c88cb028cb92d942230bb8854f0ef

M collection/collection/src/jvmTest/kotlin/androidx/collection/ArraySetTest.kt

https://android-review.googlesource.com/2096795

ap...@google.com <ap...@google.com> #8Jun 10, 2022 12:28PM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-main

commit a85cde0e4f41be26349f84c59d14d8a925a08a2b
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 12:05:09 2022

Converted IndexBasedArrayIteratorTest to Kotlin

Test: IndexBasedArrayIteratorTest
Fix: 230860589
Change-Id: I25124a448eeb686f5a3750348e061552d20d674b

M collection/collection/src/commonTest/kotlin/androidx/collection/IndexBasedArrayIteratorTest.kt

https://android-review.googlesource.com/2109188

ap...@google.com <ap...@google.com> #9Jun 10, 2022 12:28PM

Project: platform/frameworks/support
Branch: androidx-main

commit 7d7766930b8178135f4559f4d8bbaafc9fac38cf
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 11:53:47 2022

Moved IndexBasedArrayIteratorTest.java file to commonMain

Test: N/A
Bug: 230860589
Change-Id: I60cb2dd796b1ae47bc40d6d8e42962d3ced17b59

M collection/collection/src/commonTest/kotlin/androidx/collection/IndexBasedArrayIteratorTest.kt

https://android-review.googlesource.com/2109187

ap...@google.com <ap...@google.com> #10Jun 10, 2022 12:28PM

Project: platform/frameworks/support
Branch: androidx-main

commit fd7e248c15a52caf45b54e4a033b135cec914142
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 11:01:46 2022

Moved ArraySet to commonMain

Relnote: Moved ArraySet to commonMain
Test: ArraySetTest
Bug: 230860589
Change-Id: I1380c1df7b87476800d900f655e6d6e9b4413197

M collection/collection/src/commonTest/kotlin/androidx/collection/ArraySetTest.kt
M collection/collection/src/commonMain/kotlin/androidx/collection/ArraySet.kt

https://android-review.googlesource.com/2109186

ap...@google.com <ap...@google.com> #11Jun 10, 2022 12:28PM

Project: platform/frameworks/support
Branch: androidx-main

commit a333ad612c7ecc33d696e6984d01e00e9f870c99
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 11:19:34 2022

Converted IndexBasedArrayIterator to Kotlin

Test: IndexBasedArrayIteratorTest
Bug: 230860589
Change-Id: I806af78481b175d9d330a82be60e233bd852380c

M collection/collection/src/jvmMain/java/androidx/collection/ArrayMap.java
M collection/collection/src/commonMain/kotlin/androidx/collection/IndexBasedArrayIterator.kt

https://android-review.googlesource.com/2109185

ap...@google.com <ap...@google.com> #12Jun 10, 2022 12:28PM

Project: platform/frameworks/support
Branch: androidx-main

commit 1afa143028480234b99714da56efb15b0bdf4883
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 11:05:19 2022

Moved IndexBasedArrayIterator.java file to commonMain

Test: N/A
Bug: 230860589
Change-Id: If7d78f8d72e5dc7b833e967f85707be3761e0a8d

M collection/collection/src/commonMain/kotlin/androidx/collection/IndexBasedArrayIterator.kt

https://android-review.googlesource.com/2109184