Merge "Cache nextPageTokens that a package can use." into sc-dev am: 46db5f1018 am: 88149768d6 (5f5112ec) · Commits · e / os / android_frameworks_base

apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -795,7 +795,7 @@ public class AppSearchManagerService extends SystemService {
		AppSearchUserInstance instance =
		mAppSearchUserInstanceManager.getUserInstance(callingUser);
		SearchResultPage searchResultPage =
		instance.getAppSearchImpl().getNextPage(nextPageToken);
		instance.getAppSearchImpl().getNextPage(packageName, nextPageToken);
		invokeCallbackOnResult(
		callback,
		AppSearchResult.newSuccessfulResult(searchResultPage.getBundle()));
		@@ -821,7 +821,7 @@ public class AppSearchManagerService extends SystemService {
		verifyNotInstantApp(userContext, packageName);
		AppSearchUserInstance instance =
		mAppSearchUserInstanceManager.getUserInstance(callingUser);
		instance.getAppSearchImpl().invalidateNextPageToken(nextPageToken);
		instance.getAppSearchImpl().invalidateNextPageToken(packageName, nextPageToken);
		} catch (Throwable t) {
		Log.e(TAG, "Unable to invalidate the query page token", t);
		}
		@@ -871,7 +871,7 @@ public class AppSearchManagerService extends SystemService {
		.getGenericDocument().getBundle());
		}
		searchResultPage = instance.getAppSearchImpl().getNextPage(
		searchResultPage.getNextPageToken());
		packageName, searchResultPage.getNextPageToken());
		}
		}
		invokeCallbackOnResult(callback, AppSearchResult.newSuccessfulResult(null));

apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java

+81 −15

Original line number	Diff line number	Diff line
		@@ -173,6 +173,21 @@ public final class AppSearchImpl implements Closeable {
		@GuardedBy("mReadWriteLock")
		private final Map<String, Integer> mDocumentCountMapLocked = new ArrayMap<>();

		// Maps packages to the set of valid nextPageTokens that the package can manipulate. A token
		// is unique and constant per query (i.e. the same token '123' is used to iterate through
		// pages of search results). The tokens themselves are generated and tracked by
		// IcingSearchEngine. IcingSearchEngine considers a token valid and won't be reused
		// until we call invalidateNextPageToken on the token.
		//
		// Note that we synchronize on itself because the nextPageToken cache is checked at
		// query-time, and queries are done in parallel with a read lock. Ideally, this would be
		// guarded by the normal mReadWriteLock.writeLock, but ReentrantReadWriteLocks can't upgrade
		// read to write locks. This lock should be acquired at the smallest scope possible.
		// mReadWriteLock is a higher-level lock, so calls shouldn't be made out
		// to any functions that grab the lock.
		@GuardedBy("mNextPageTokensLocked")
		private final Map<String, Set<Long>> mNextPageTokensLocked = new ArrayMap<>();

		/**
		* The counter to check when to call {@link #checkForOptimize}. The interval is {@link
		* #CHECK_OPTIMIZE_INTERVAL}.
		@@ -837,12 +852,15 @@ public final class AppSearchImpl implements Closeable {
		String prefix = createPrefix(packageName, databaseName);
		Set<String> allowedPrefixedSchemas = getAllowedPrefixSchemasLocked(prefix, searchSpec);

		return doQueryLocked(
		SearchResultPage searchResultPage =
		doQueryLocked(
		Collections.singleton(createPrefix(packageName, databaseName)),
		allowedPrefixedSchemas,
		queryExpression,
		searchSpec,
		sStatsBuilder);
		addNextPageToken(packageName, searchResultPage.getNextPageToken());
		return searchResultPage;
		} finally {
		mReadWriteLock.readLock().unlock();
		if (logger != null) {
		@@ -956,12 +974,15 @@ public final class AppSearchImpl implements Closeable {
		}
		}

		return doQueryLocked(
		SearchResultPage searchResultPage =
		doQueryLocked(
		prefixFilters,
		prefixedSchemaFilters,
		queryExpression,
		searchSpec,
		sStatsBuilder);
		addNextPageToken(callerPackageName, searchResultPage.getNextPageToken());
		return searchResultPage;
		} finally {
		mReadWriteLock.readLock().unlock();

		@@ -1093,17 +1114,20 @@ public final class AppSearchImpl implements Closeable {
		*
		* <p>This method belongs to query group.
		*
		* @param packageName Package name of the caller.
		* @param nextPageToken The token of pre-loaded results of previously executed query.
		* @return The next page of results of previously executed query.
		* @throws AppSearchException on IcingSearchEngine error.
		* @throws AppSearchException on IcingSearchEngine error or if can't advance on nextPageToken.
		*/
		@NonNull
		public SearchResultPage getNextPage(long nextPageToken) throws AppSearchException {
		public SearchResultPage getNextPage(@NonNull String packageName, long nextPageToken)
		throws AppSearchException {
		mReadWriteLock.readLock().lock();
		try {
		throwIfClosedLocked();

		mLogUtil.piiTrace("getNextPage, request", nextPageToken);
		checkNextPageToken(packageName, nextPageToken);
		SearchResultProto searchResultProto =
		mIcingSearchEngineLocked.getNextPage(nextPageToken);
		mLogUtil.piiTrace(
		@@ -1122,16 +1146,26 @@ public final class AppSearchImpl implements Closeable {
		*
		* <p>This method belongs to query group.
		*
		* @param packageName Package name of the caller.
		* @param nextPageToken The token of pre-loaded results of previously executed query to be
		* Invalidated.
		* @throws AppSearchException if nextPageToken is unusable.
		*/
		public void invalidateNextPageToken(long nextPageToken) {
		public void invalidateNextPageToken(@NonNull String packageName, long nextPageToken)
		throws AppSearchException {
		mReadWriteLock.readLock().lock();
		try {
		throwIfClosedLocked();

		mLogUtil.piiTrace("invalidateNextPageToken, request", nextPageToken);
		checkNextPageToken(packageName, nextPageToken);
		mIcingSearchEngineLocked.invalidateNextPageToken(nextPageToken);

		synchronized (mNextPageTokensLocked) {
		// At this point, we're guaranteed that this nextPageToken exists for this package,
		// otherwise checkNextPageToken would've thrown an exception.
		mNextPageTokensLocked.get(packageName).remove(nextPageToken);
		}
		} finally {
		mReadWriteLock.readLock().unlock();
		}
		@@ -1568,6 +1602,9 @@ public final class AppSearchImpl implements Closeable {
		Set<String> databaseNames = entry.getValue();
		if (!installedPackages.contains(packageName) && databaseNames != null) {
		mDocumentCountMapLocked.remove(packageName);
		synchronized (mNextPageTokensLocked) {
		mNextPageTokensLocked.remove(packageName);
		}
		for (String databaseName : databaseNames) {
		String removedPrefix = createPrefix(packageName, databaseName);
		mSchemaMapLocked.remove(removedPrefix);
		@@ -1601,6 +1638,9 @@ public final class AppSearchImpl implements Closeable {
		mSchemaMapLocked.clear();
		mNamespaceMapLocked.clear();
		mDocumentCountMapLocked.clear();
		synchronized (mNextPageTokensLocked) {
		mNextPageTokensLocked.clear();
		}
		if (initStatsBuilder != null) {
		initStatsBuilder
		.setHasReset(true)
		@@ -2015,6 +2055,32 @@ public final class AppSearchImpl implements Closeable {
		return schemaProto.getSchema();
		}

		private void addNextPageToken(String packageName, long nextPageToken) {
		synchronized (mNextPageTokensLocked) {
		Set<Long> tokens = mNextPageTokensLocked.get(packageName);
		if (tokens == null) {
		tokens = new ArraySet<>();
		mNextPageTokensLocked.put(packageName, tokens);
		}
		tokens.add(nextPageToken);
		}
		}

		private void checkNextPageToken(String packageName, long nextPageToken)
		throws AppSearchException {
		synchronized (mNextPageTokensLocked) {
		Set<Long> nextPageTokens = mNextPageTokensLocked.get(packageName);
		if (nextPageTokens == null \|\| !nextPageTokens.contains(nextPageToken)) {
		throw new AppSearchException(
		AppSearchResult.RESULT_SECURITY_ERROR,
		"Package \""
		+ packageName
		+ "\" cannot use nextPageToken: "
		+ nextPageToken);
		}
		}
		}

		private static void addToMap(
		Map<String, Set<String>> map, String prefix, String prefixedValue) {
		Set<String> values = map.get(prefix);

services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchImplTest.java

+442 −2

File changed.

Preview size limit exceeded, changes collapsed.