Room should also provide the LF and RX variants of PagingSource [203666906]

Fixed

Feature Request

Status Update

No update yet.

Description

du...@google.com

created issue #1

Oct 20, 2021 04:41PM

Add new artifacts for room-paging-rx2/3 and -guava.

Comments

du...@google.com <du...@google.com> Mar 14, 2022 10:08PM

Reassigned to cl...@google.com.

ap...@google.com <ap...@google.com> #2Mar 22, 2022 05:19PM

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> #3Mar 23, 2022 09:01PM

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> #4Mar 24, 2022 04:53PM

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

cl...@google.com <cl...@google.com> Apr 12, 2022 06:38PM

Accepted by cl...@google.com.

ap...@google.com <ap...@google.com> #5Apr 14, 2022 05:26PM

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

commit 2f45502b3d448965f0e52067e8b39108708d1faf
Author: clarafok <clarafok@google.com>
Date: Mon Apr 11 15:50:07 2022

Implement LimitOffsetListenableFuturePagingSource

An abstract implementation of ListenableFuturePagingSource to be
implemented by Room. Supports Guava operations through ListenableFuture.

Test: ./gradlew room:room-paging-guava:cC
Bug: 203666906

Change-Id: I3ec746a072d28e856018d03aeb08931a8d42fa93

A room/room-paging-guava/src/main/kotlin/androidx/room/paging/guava/LimitOffsetListenableFuturePagingSource.kt
M room/room-paging/src/main/kotlin/androidx/room/paging/LimitOffsetPagingSource.kt
A room/room-paging-guava/src/androidTest/kotlin/androidx/room/paging/guava/LimitOffsetListenableFuturePagingSourceTest.kt
M room/room-paging/build.gradle
M room/room-paging-guava/build.gradle
M room/room-paging/src/main/kotlin/androidx/room/paging/util/RoomPagingUtil.kt

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

ap...@google.com <ap...@google.com> #6May 6, 2022 01:38AM

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

commit 76e8c1ef8e3f90ecb1376ec0d0dc418990b7e515
Author: Clara Fok <clarafok@google.com>
Date: Thu Apr 28 17:05:24 2022

Hook up room-paging-guava to room-compiler

Test: ./gradlew :room:room-compiler:test
Test: ./gradlew :room:integration-tests:room-testapp-kotlin:cC
Bug: 203666906
Change-Id: Iaa2e7b542b4398f2e364c0b68896c046589e9a09

M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/PagingEntityDao.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt
M room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
A room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/ListenableFuturePagingSourceQueryResultBinderProvider.kt
A room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ListenableFuturePagingSourceTest.kt
M room/integration-tests/kotlintestapp/build.gradle
A room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/MultiTypedPagingSourceQueryResultBinderProvider.kt
M room/room-compiler/src/main/kotlin/androidx/room/processor/ProcessorErrors.kt
M room/room-paging-guava/build.gradle
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/ItemStore.kt
M room/room-compiler/src/main/kotlin/androidx/room/ext/javapoet_ext.kt
A room/room-compiler/src/test/data/common/input/LimitOffsetListenableFuturePagingSource.java
M room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt
M testutils/testutils-common/src/main/java/androidx/testutils/FilteringExecutor.kt
M room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
A room/room-compiler/src/test/data/common/input/ListenableFuturePagingSource.java

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

ap...@google.com <ap...@google.com> #7May 12, 2022 11:08PM

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

commit a5a856d88a480cbb1d4364f6b3d64ff450411cfd
Author: clarafok <clarafok@google.com>
Date: Wed May 11 13:52:19 2022

Implement room-paging-rxjava3 LimitOffsetRxPagingSource

Test: ./gradlew room:room-paging-rxjava3:cC
Bug: 203666906
Change-Id: I0127af74e4ec38c0570f56a5783ec2157f9bb9fc

A room/room-paging-rxjava3/src/main/java/androidx/room/paging/rxjava3/LimitOffsetRxPagingSource.kt
A room/room-paging-rxjava3/src/androidTest/kotlin/androidx/room/paging/rxjava3/LimitOffsetRxPagingSourceTest.kt
M room/room-paging-rxjava3/build.gradle

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

ap...@google.com <ap...@google.com> #8May 13, 2022 05:01PM

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

commit c7b01e966accae484bb1dd081e3fa5f3f38047fc
Author: clarafok <clarafok@google.com>
Date: Thu May 12 15:28:45 2022

Hook up rxjava3 LimitOffsetRxPagingSource to room-compiler

Test: ./gradlew room:room-compiler:test
Test: ./gradlew room:integration-tests:room-testapp-kotlin:cC
Bug: 203666906
Change-Id: I57099d83a8c845263c5031990de3124971ac2363

M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/PagingEntityDao.kt
A room/room-compiler/src/test/data/common/input/Rx3PagingSource.java
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt
M room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
A room/room-compiler/src/test/data/common/input/LimitOffsetRx3PagingSource.java
M room/integration-tests/kotlintestapp/build.gradle
M room/room-compiler/src/main/kotlin/androidx/room/processor/ProcessorErrors.kt
A room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxJava3PagingSourceQueryResultBinderProvider.kt
M room/room-compiler/src/main/kotlin/androidx/room/ext/javapoet_ext.kt
A room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx3PagingSourceTest.kt
M room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt

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

ap...@google.com <ap...@google.com> #9May 13, 2022 11:37PM

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

commit c4782c289e754747e1a98a28e2700836d78d7578
Author: clarafok <clarafok@google.com>
Date: Fri May 13 14:12:02 2022

Implement rxjava2 LimitOffsetRxPagingSource

Test: ./gradlew room:room-paging-rxjava2:cC
Bug: 203666906
Change-Id: Iefd883d45b18b032bb3a29d51209fc7de169c1aa

A room/room-paging-rxjava2/src/androidTest/kotlin/androidx/room/paging/rxjava2/LimitOffsetRxPagingSourceTest.kt
M room/room-paging-rxjava2/build.gradle
A room/room-paging-rxjava2/src/main/java/androidx/room/paging/rxjava2/LimitOffsetRxPagingSource.kt

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

ap...@google.com <ap...@google.com> #10May 16, 2022 06:22PM

Marked as fixed.

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

commit d1ba57918465b84aa9564074df68d3136a4f8fcd
Author: clarafok <clarafok@google.com>
Date: Fri May 13 16:09:09 2022

Hook up room-paging-rxjava2 to room-compiler

Test: ./gradlew room:room-compiler:test
Test: ./gradlew room:integration-tests:room-testapp-kotlin:cC
Fixes: 203666906
Change-Id: Ic8f07f14491ece38b1296ca71c761511218a65a9

M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/testutil/PagingEntityDao.kt
M room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/MultiTypedPagingSourceTest.kt
M room/room-compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
M room/room-compiler/src/test/kotlin/androidx/room/testing/test_util.kt
M room/integration-tests/kotlintestapp/build.gradle
M room/room-compiler/src/main/kotlin/androidx/room/processor/ProcessorErrors.kt
A room/room-compiler/src/test/data/common/input/Rx2PagingSource.java
A room/room-compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxJava2PagingSourceQueryResultBinderProvider.kt
M room/room-compiler/src/main/kotlin/androidx/room/ext/javapoet_ext.kt
A room/room-compiler/src/test/data/common/input/LimitOffsetRx2PagingSource.java
A room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx2PagingSourceTest.kt
M room/room-compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt

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