Merge "Add ability to enforce limits on docs per package and size of doc." into sc-dev (733537f1) · Commits · e / os / android_frameworks_base

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

+44 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,11 @@ public final class AppSearchConfig implements AutoCloseable {
	@VisibleForTesting		@VisibleForTesting
	static final int DEFAULT_SAMPLING_INTERVAL = 10;		static final int DEFAULT_SAMPLING_INTERVAL = 10;

			@VisibleForTesting
			static final int DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES = 512 * 1024; // 512KiB
			@VisibleForTesting
			static final int DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT = 20_000;

	/*		/*
	* Keys for ALL the flags stored in DeviceConfig.		* Keys for ALL the flags stored in DeviceConfig.
	*/		*/
	@@ -70,13 +75,19 @@ public final class AppSearchConfig implements AutoCloseable {
	"sampling_interval_for_batch_call_stats";		"sampling_interval_for_batch_call_stats";
	public static final String KEY_SAMPLING_INTERVAL_FOR_PUT_DOCUMENT_STATS =		public static final String KEY_SAMPLING_INTERVAL_FOR_PUT_DOCUMENT_STATS =
	"sampling_interval_for_put_document_stats";		"sampling_interval_for_put_document_stats";
			public static final String KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES =
			"limit_config_max_document_size_bytes";
			public static final String KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT =
			"limit_config_max_document_docunt";

	// Array contains all the corresponding keys for the cached values.		// Array contains all the corresponding keys for the cached values.
	private static final String[] KEYS_TO_ALL_CACHED_VALUES = {		private static final String[] KEYS_TO_ALL_CACHED_VALUES = {
	KEY_MIN_TIME_INTERVAL_BETWEEN_SAMPLES_MILLIS,		KEY_MIN_TIME_INTERVAL_BETWEEN_SAMPLES_MILLIS,
	KEY_SAMPLING_INTERVAL_DEFAULT,		KEY_SAMPLING_INTERVAL_DEFAULT,
	KEY_SAMPLING_INTERVAL_FOR_BATCH_CALL_STATS,		KEY_SAMPLING_INTERVAL_FOR_BATCH_CALL_STATS,
	KEY_SAMPLING_INTERVAL_FOR_PUT_DOCUMENT_STATS		KEY_SAMPLING_INTERVAL_FOR_PUT_DOCUMENT_STATS,
			KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES,
			KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT,
	};		};

	// Lock needed for all the operations in this class.		// Lock needed for all the operations in this class.
	@@ -222,6 +233,24 @@ public final class AppSearchConfig implements AutoCloseable {
	}		}
	}		}

			/** Returns the maximum serialized size an indexed document can be, in bytes. */
			public int getCachedLimitConfigMaxDocumentSizeBytes() {
			synchronized (mLock) {
			throwIfClosedLocked();
			return mBundleLocked.getInt(KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES,
			DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES);
			}
			}

			/** Returns the maximum number of active docs allowed per package. */
			public int getCachedLimitConfigMaxDocumentCount() {
			synchronized (mLock) {
			throwIfClosedLocked();
			return mBundleLocked.getInt(KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT,
			DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT);
			}
			}

	@GuardedBy("mLock")		@GuardedBy("mLock")
	private void throwIfClosedLocked() {		private void throwIfClosedLocked() {
	if (mIsClosedLocked) {		if (mIsClosedLocked) {
	@@ -264,6 +293,20 @@ public final class AppSearchConfig implements AutoCloseable {
	mBundleLocked.putInt(key, properties.getInt(key, DEFAULT_SAMPLING_INTERVAL));		mBundleLocked.putInt(key, properties.getInt(key, DEFAULT_SAMPLING_INTERVAL));
	}		}
	break;		break;
			case KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES:
			synchronized (mLock) {
			mBundleLocked.putInt(
			key,
			properties.getInt(key, DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES));
			}
			break;
			case KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT:
			synchronized (mLock) {
			mBundleLocked.putInt(
			key,
			properties.getInt(key, DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT));
			}
			break;
	default:		default:
	break;		break;
	}		}

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

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -173,8 +173,11 @@ public final class AppSearchUserInstanceManager {
	File appSearchDir = getAppSearchDir(userHandle);		File appSearchDir = getAppSearchDir(userHandle);
	File icingDir = new File(appSearchDir, "icing");		File icingDir = new File(appSearchDir, "icing");
	Log.i(TAG, "Creating new AppSearch instance at: " + icingDir);		Log.i(TAG, "Creating new AppSearch instance at: " + icingDir);
	AppSearchImpl appSearchImpl =		AppSearchImpl appSearchImpl = AppSearchImpl.create(
	AppSearchImpl.create(icingDir, initStatsBuilder, new FrameworkOptimizeStrategy());		icingDir,
			new FrameworkLimitConfig(config),
			initStatsBuilder,
			new FrameworkOptimizeStrategy());

	long prepareVisibilityStoreLatencyStartMillis = SystemClock.elapsedRealtime();		long prepareVisibilityStoreLatencyStartMillis = SystemClock.elapsedRealtime();
	VisibilityStoreImpl visibilityStore =		VisibilityStoreImpl visibilityStore =

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

0 → 100644

+41 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2021 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.server.appsearch;

			import android.annotation.NonNull;

			import com.android.server.appsearch.external.localstorage.LimitConfig;

			import java.util.Objects;

			class FrameworkLimitConfig implements LimitConfig {
			private final AppSearchConfig mAppSearchConfig;

			FrameworkLimitConfig(@NonNull AppSearchConfig appSearchConfig) {
			mAppSearchConfig = Objects.requireNonNull(appSearchConfig);
			}

			@Override
			public int getMaxDocumentSizeBytes() {
			return mAppSearchConfig.getCachedLimitConfigMaxDocumentSizeBytes();
			}

			@Override
			public int getMaxDocumentCount() {
			return mAppSearchConfig.getCachedLimitConfigMaxDocumentCount();
			}
			}

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

+177 −24

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ import com.google.android.icing.proto.SearchResultProto;
	import com.google.android.icing.proto.SearchSpecProto;		import com.google.android.icing.proto.SearchSpecProto;
	import com.google.android.icing.proto.SetSchemaResultProto;		import com.google.android.icing.proto.SetSchemaResultProto;
	import com.google.android.icing.proto.StatusProto;		import com.google.android.icing.proto.StatusProto;
			import com.google.android.icing.proto.StorageInfoProto;
	import com.google.android.icing.proto.StorageInfoResultProto;		import com.google.android.icing.proto.StorageInfoResultProto;
	import com.google.android.icing.proto.TypePropertyMask;		import com.google.android.icing.proto.TypePropertyMask;
	import com.google.android.icing.proto.UsageReport;		import com.google.android.icing.proto.UsageReport;
	@@ -147,10 +148,9 @@ public final class AppSearchImpl implements Closeable {
	@VisibleForTesting static final int CHECK_OPTIMIZE_INTERVAL = 100;		@VisibleForTesting static final int CHECK_OPTIMIZE_INTERVAL = 100;

	private final ReadWriteLock mReadWriteLock = new ReentrantReadWriteLock();		private final ReadWriteLock mReadWriteLock = new ReentrantReadWriteLock();

	private final LogUtil mLogUtil = new LogUtil(TAG);		private final LogUtil mLogUtil = new LogUtil(TAG);

	private final OptimizeStrategy mOptimizeStrategy;		private final OptimizeStrategy mOptimizeStrategy;
			private final LimitConfig mLimitConfig;

	@GuardedBy("mReadWriteLock")		@GuardedBy("mReadWriteLock")
	@VisibleForTesting		@VisibleForTesting
	@@ -169,6 +169,10 @@ public final class AppSearchImpl implements Closeable {
	@GuardedBy("mReadWriteLock")		@GuardedBy("mReadWriteLock")
	private final Map<String, Set<String>> mNamespaceMapLocked = new HashMap<>();		private final Map<String, Set<String>> mNamespaceMapLocked = new HashMap<>();

			/** Maps package name to active document count. */
			@GuardedBy("mReadWriteLock")
			private final Map<String, Integer> mDocumentCountMapLocked = new ArrayMap<>();

	/**		/**
	* The counter to check when to call {@link #checkForOptimize}. The interval is {@link		* The counter to check when to call {@link #checkForOptimize}. The interval is {@link
	* #CHECK_OPTIMIZE_INTERVAL}.		* #CHECK_OPTIMIZE_INTERVAL}.
	@@ -196,19 +200,22 @@ public final class AppSearchImpl implements Closeable {
	@NonNull		@NonNull
	public static AppSearchImpl create(		public static AppSearchImpl create(
	@NonNull File icingDir,		@NonNull File icingDir,
			@NonNull LimitConfig limitConfig,
	@Nullable InitializeStats.Builder initStatsBuilder,		@Nullable InitializeStats.Builder initStatsBuilder,
	@NonNull OptimizeStrategy optimizeStrategy)		@NonNull OptimizeStrategy optimizeStrategy)
	throws AppSearchException {		throws AppSearchException {
	return new AppSearchImpl(icingDir, initStatsBuilder, optimizeStrategy);		return new AppSearchImpl(icingDir, limitConfig, initStatsBuilder, optimizeStrategy);
	}		}

	/** @param initStatsBuilder collects stats for initialization if provided. */		/** @param initStatsBuilder collects stats for initialization if provided. */
	private AppSearchImpl(		private AppSearchImpl(
	@NonNull File icingDir,		@NonNull File icingDir,
			@NonNull LimitConfig limitConfig,
	@Nullable InitializeStats.Builder initStatsBuilder,		@Nullable InitializeStats.Builder initStatsBuilder,
	@NonNull OptimizeStrategy optimizeStrategy)		@NonNull OptimizeStrategy optimizeStrategy)
	throws AppSearchException {		throws AppSearchException {
	Objects.requireNonNull(icingDir);		Objects.requireNonNull(icingDir);
			mLimitConfig = Objects.requireNonNull(limitConfig);
	mOptimizeStrategy = Objects.requireNonNull(optimizeStrategy);		mOptimizeStrategy = Objects.requireNonNull(optimizeStrategy);

	mReadWriteLock.writeLock().lock();		mReadWriteLock.writeLock().lock();
	@@ -244,9 +251,9 @@ public final class AppSearchImpl implements Closeable {
	AppSearchLoggerHelper.copyNativeStats(		AppSearchLoggerHelper.copyNativeStats(
	initializeResultProto.getInitializeStats(), initStatsBuilder);		initializeResultProto.getInitializeStats(), initStatsBuilder);
	}		}

	checkSuccess(initializeResultProto.getStatus());		checkSuccess(initializeResultProto.getStatus());

			// Read all protos we need to construct AppSearchImpl's cache maps
	long prepareSchemaAndNamespacesLatencyStartMillis = SystemClock.elapsedRealtime();		long prepareSchemaAndNamespacesLatencyStartMillis = SystemClock.elapsedRealtime();
	SchemaProto schemaProto = getSchemaProtoLocked();		SchemaProto schemaProto = getSchemaProtoLocked();

	@@ -258,6 +265,9 @@ public final class AppSearchImpl implements Closeable {
	getAllNamespacesResultProto.getNamespacesCount(),		getAllNamespacesResultProto.getNamespacesCount(),
	getAllNamespacesResultProto);		getAllNamespacesResultProto);

			StorageInfoProto storageInfoProto = getRawStorageInfoProto();

			// Log the time it took to read the data that goes into the cache maps
	if (initStatsBuilder != null) {		if (initStatsBuilder != null) {
	initStatsBuilder		initStatsBuilder
	.setStatusCode(		.setStatusCode(
	@@ -268,20 +278,27 @@ public final class AppSearchImpl implements Closeable {
	(SystemClock.elapsedRealtime()		(SystemClock.elapsedRealtime()
	- prepareSchemaAndNamespacesLatencyStartMillis));		- prepareSchemaAndNamespacesLatencyStartMillis));
	}		}

	checkSuccess(getAllNamespacesResultProto.getStatus());		checkSuccess(getAllNamespacesResultProto.getStatus());

	// Populate schema map		// Populate schema map
	for (SchemaTypeConfigProto schema : schemaProto.getTypesList()) {		List<SchemaTypeConfigProto> schemaProtoTypesList = schemaProto.getTypesList();
			for (int i = 0; i < schemaProtoTypesList.size(); i++) {
			SchemaTypeConfigProto schema = schemaProtoTypesList.get(i);
	String prefixedSchemaType = schema.getSchemaType();		String prefixedSchemaType = schema.getSchemaType();
	addToMap(mSchemaMapLocked, getPrefix(prefixedSchemaType), schema);		addToMap(mSchemaMapLocked, getPrefix(prefixedSchemaType), schema);
	}		}

	// Populate namespace map		// Populate namespace map
	for (String prefixedNamespace : getAllNamespacesResultProto.getNamespacesList()) {		List<String> prefixedNamespaceList =
			getAllNamespacesResultProto.getNamespacesList();
			for (int i = 0; i < prefixedNamespaceList.size(); i++) {
			String prefixedNamespace = prefixedNamespaceList.get(i);
	addToMap(mNamespaceMapLocked, getPrefix(prefixedNamespace), prefixedNamespace);		addToMap(mNamespaceMapLocked, getPrefix(prefixedNamespace), prefixedNamespace);
	}		}

			// Populate document count map
			rebuildDocumentCountMapLocked(storageInfoProto);

	// logging prepare_schema_and_namespaces latency		// logging prepare_schema_and_namespaces latency
	if (initStatsBuilder != null) {		if (initStatsBuilder != null) {
	initStatsBuilder.setPrepareSchemaAndNamespacesLatencyMillis(		initStatsBuilder.setPrepareSchemaAndNamespacesLatencyMillis(
	@@ -596,10 +613,19 @@ public final class AppSearchImpl implements Closeable {
	long rewriteDocumentTypeEndTimeMillis = SystemClock.elapsedRealtime();		long rewriteDocumentTypeEndTimeMillis = SystemClock.elapsedRealtime();
	DocumentProto finalDocument = documentBuilder.build();		DocumentProto finalDocument = documentBuilder.build();

			// Check limits
			int newDocumentCount =
			enforceLimitConfigLocked(
			packageName, finalDocument.getUri(), finalDocument.getSerializedSize());

			// Insert document
	mLogUtil.piiTrace("putDocument, request", finalDocument.getUri(), finalDocument);		mLogUtil.piiTrace("putDocument, request", finalDocument.getUri(), finalDocument);
	PutResultProto putResultProto = mIcingSearchEngineLocked.put(documentBuilder.build());		PutResultProto putResultProto = mIcingSearchEngineLocked.put(finalDocument);
	mLogUtil.piiTrace("putDocument, response", putResultProto.getStatus(), putResultProto);		mLogUtil.piiTrace("putDocument, response", putResultProto.getStatus(), putResultProto);
	addToMap(mNamespaceMapLocked, prefix, documentBuilder.getNamespace());
			// Update caches
			addToMap(mNamespaceMapLocked, prefix, finalDocument.getNamespace());
			mDocumentCountMapLocked.put(packageName, newDocumentCount);

	// Logging stats		// Logging stats
	if (pStatsBuilder != null) {		if (pStatsBuilder != null) {
	@@ -630,6 +656,71 @@ public final class AppSearchImpl implements Closeable {
	}		}
	}		}

			/**
			* Checks that a new document can be added to the given packageName with the given serialized
			* size without violating our {@link LimitConfig}.
			*
			* @return the new count of documents for the given package, including the new document.
			* @throws AppSearchException with a code of {@link AppSearchResult#RESULT_OUT_OF_SPACE} if the
			* limits are violated by the new document.
			*/
			@GuardedBy("mReadWriteLock")
			private int enforceLimitConfigLocked(String packageName, String newDocUri, int newDocSize)
			throws AppSearchException {
			// Limits check: size of document
			if (newDocSize > mLimitConfig.getMaxDocumentSizeBytes()) {
			throw new AppSearchException(
			AppSearchResult.RESULT_OUT_OF_SPACE,
			"Document \""
			+ newDocUri
			+ "\" for package \""
			+ packageName
			+ "\" serialized to "
			+ newDocSize
			+ " bytes, which exceeds "
			+ "limit of "
			+ mLimitConfig.getMaxDocumentSizeBytes()
			+ " bytes");
			}

			// Limits check: number of documents
			Integer oldDocumentCount = mDocumentCountMapLocked.get(packageName);
			int newDocumentCount;
			if (oldDocumentCount == null) {
			newDocumentCount = 1;
			} else {
			newDocumentCount = oldDocumentCount + 1;
			}
			if (newDocumentCount > mLimitConfig.getMaxDocumentCount()) {
			// Our management of mDocumentCountMapLocked doesn't account for document
			// replacements, so our counter might have overcounted if the app has replaced docs.
			// Rebuild the counter from StorageInfo in case this is so.
			// TODO(b/170371356): If Icing lib exposes something in the result which says
			// whether the document was a replacement, we could subtract 1 again after the put
			// to keep the count accurate. That would allow us to remove this code.
			rebuildDocumentCountMapLocked(getRawStorageInfoProto());
			oldDocumentCount = mDocumentCountMapLocked.get(packageName);
			if (oldDocumentCount == null) {
			newDocumentCount = 1;
			} else {
			newDocumentCount = oldDocumentCount + 1;
			}
			}
			if (newDocumentCount > mLimitConfig.getMaxDocumentCount()) {
			// Now we really can't fit it in, even accounting for replacements.
			throw new AppSearchException(
			AppSearchResult.RESULT_OUT_OF_SPACE,
			"Package \""
			+ packageName
			+ "\" exceeded limit of "
			+ mLimitConfig.getMaxDocumentCount()
			+ " documents. Some documents "
			+ "must be removed to index additional ones.");
			}

			return newDocumentCount;
			}

	/**		/**
	* Retrieves a document from the AppSearch index by namespace and document ID.		* Retrieves a document from the AppSearch index by namespace and document ID.
	*		*
	@@ -1121,6 +1212,9 @@ public final class AppSearchImpl implements Closeable {
	deleteResultProto.getDeleteStats(), removeStatsBuilder);		deleteResultProto.getDeleteStats(), removeStatsBuilder);
	}		}
	checkSuccess(deleteResultProto.getStatus());		checkSuccess(deleteResultProto.getStatus());

			// Update derived maps
			updateDocumentCountAfterRemovalLocked(packageName, /numDocumentsDeleted=/ 1);
	} finally {		} finally {
	mReadWriteLock.writeLock().unlock();		mReadWriteLock.writeLock().unlock();
	if (removeStatsBuilder != null) {		if (removeStatsBuilder != null) {
	@@ -1196,6 +1290,11 @@ public final class AppSearchImpl implements Closeable {
	// not in the DB because it was not there or was successfully deleted.		// not in the DB because it was not there or was successfully deleted.
	checkCodeOneOf(		checkCodeOneOf(
	deleteResultProto.getStatus(), StatusProto.Code.OK, StatusProto.Code.NOT_FOUND);		deleteResultProto.getStatus(), StatusProto.Code.OK, StatusProto.Code.NOT_FOUND);

			// Update derived maps
			int numDocumentsDeleted =
			deleteResultProto.getDeleteStats().getNumDocumentsDeleted();
			updateDocumentCountAfterRemovalLocked(packageName, numDocumentsDeleted);
	} finally {		} finally {
	mReadWriteLock.writeLock().unlock();		mReadWriteLock.writeLock().unlock();
	if (removeStatsBuilder != null) {		if (removeStatsBuilder != null) {
	@@ -1205,6 +1304,22 @@ public final class AppSearchImpl implements Closeable {
	}		}
	}		}

			@GuardedBy("mReadWriteLock")
			private void updateDocumentCountAfterRemovalLocked(
			@NonNull String packageName, int numDocumentsDeleted) {
			if (numDocumentsDeleted > 0) {
			Integer oldDocumentCount = mDocumentCountMapLocked.get(packageName);
			// This should always be true: how can we delete documents for a package without
			// having seen that package during init? This is just a safeguard.
			if (oldDocumentCount != null) {
			// This should always be >0; how can we remove more documents than we've indexed?
			// This is just a safeguard.
			int newDocumentCount = Math.max(oldDocumentCount - numDocumentsDeleted, 0);
			mDocumentCountMapLocked.put(packageName, newDocumentCount);
			}
			}
			}

	/** Estimates the storage usage info for a specific package. */		/** Estimates the storage usage info for a specific package. */
	@NonNull		@NonNull
	public StorageInfo getStorageInfoForPackage(@NonNull String packageName)		public StorageInfo getStorageInfoForPackage(@NonNull String packageName)
	@@ -1233,7 +1348,7 @@ public final class AppSearchImpl implements Closeable {
	return new StorageInfo.Builder().build();		return new StorageInfo.Builder().build();
	}		}

	return getStorageInfoForNamespacesLocked(wantedPrefixedNamespaces);		return getStorageInfoForNamespaces(getRawStorageInfoProto(), wantedPrefixedNamespaces);
	} finally {		} finally {
	mReadWriteLock.readLock().unlock();		mReadWriteLock.readLock().unlock();
	}		}
	@@ -1264,29 +1379,45 @@ public final class AppSearchImpl implements Closeable {
	return new StorageInfo.Builder().build();		return new StorageInfo.Builder().build();
	}		}

	return getStorageInfoForNamespacesLocked(wantedPrefixedNamespaces);		return getStorageInfoForNamespaces(getRawStorageInfoProto(), wantedPrefixedNamespaces);
	} finally {		} finally {
	mReadWriteLock.readLock().unlock();		mReadWriteLock.readLock().unlock();
	}		}
	}		}

	@GuardedBy("mReadWriteLock")		/**
			* Returns the native storage info capsuled in {@link StorageInfoResultProto} directly from
			* IcingSearchEngine.
			*/
	@NonNull		@NonNull
	private StorageInfo getStorageInfoForNamespacesLocked(@NonNull Set<String> prefixedNamespaces)		public StorageInfoProto getRawStorageInfoProto() throws AppSearchException {
	throws AppSearchException {		mReadWriteLock.readLock().lock();
			try {
			throwIfClosedLocked();
	mLogUtil.piiTrace("getStorageInfo, request");		mLogUtil.piiTrace("getStorageInfo, request");
	StorageInfoResultProto storageInfoResult = mIcingSearchEngineLocked.getStorageInfo();		StorageInfoResultProto storageInfoResult = mIcingSearchEngineLocked.getStorageInfo();
	mLogUtil.piiTrace(		mLogUtil.piiTrace(
	"getStorageInfo, response", storageInfoResult.getStatus(), storageInfoResult);		"getStorageInfo, response", storageInfoResult.getStatus(), storageInfoResult);
	checkSuccess(storageInfoResult.getStatus());		checkSuccess(storageInfoResult.getStatus());
	if (!storageInfoResult.hasStorageInfo()		return storageInfoResult.getStorageInfo();
	\|\| !storageInfoResult.getStorageInfo().hasDocumentStorageInfo()) {		} finally {
			mReadWriteLock.readLock().unlock();
			}
			}

			/**
			* Extracts and returns {@link StorageInfo} from {@link StorageInfoProto} based on prefixed
			* namespaces.
			*/
			@NonNull
			private static StorageInfo getStorageInfoForNamespaces(
			@NonNull StorageInfoProto storageInfoProto, @NonNull Set<String> prefixedNamespaces) {
			if (!storageInfoProto.hasDocumentStorageInfo()) {
	return new StorageInfo.Builder().build();		return new StorageInfo.Builder().build();
	}		}
	long totalStorageSize = storageInfoResult.getStorageInfo().getTotalStorageSize();

	DocumentStorageInfoProto documentStorageInfo =		long totalStorageSize = storageInfoProto.getTotalStorageSize();
	storageInfoResult.getStorageInfo().getDocumentStorageInfo();		DocumentStorageInfoProto documentStorageInfo = storageInfoProto.getDocumentStorageInfo();
	int totalDocuments =		int totalDocuments =
	documentStorageInfo.getNumAliveDocuments()		documentStorageInfo.getNumAliveDocuments()
	+ documentStorageInfo.getNumExpiredDocuments();		+ documentStorageInfo.getNumExpiredDocuments();
	@@ -1436,6 +1567,7 @@ public final class AppSearchImpl implements Closeable {
	String packageName = entry.getKey();		String packageName = entry.getKey();
	Set<String> databaseNames = entry.getValue();		Set<String> databaseNames = entry.getValue();
	if (!installedPackages.contains(packageName) && databaseNames != null) {		if (!installedPackages.contains(packageName) && databaseNames != null) {
			mDocumentCountMapLocked.remove(packageName);
	for (String databaseName : databaseNames) {		for (String databaseName : databaseNames) {
	String removedPrefix = createPrefix(packageName, databaseName);		String removedPrefix = createPrefix(packageName, databaseName);
	mSchemaMapLocked.remove(removedPrefix);		mSchemaMapLocked.remove(removedPrefix);
	@@ -1468,6 +1600,7 @@ public final class AppSearchImpl implements Closeable {
	mOptimizeIntervalCountLocked = 0;		mOptimizeIntervalCountLocked = 0;
	mSchemaMapLocked.clear();		mSchemaMapLocked.clear();
	mNamespaceMapLocked.clear();		mNamespaceMapLocked.clear();
			mDocumentCountMapLocked.clear();
	if (initStatsBuilder != null) {		if (initStatsBuilder != null) {
	initStatsBuilder		initStatsBuilder
	.setHasReset(true)		.setHasReset(true)
	@@ -1477,6 +1610,26 @@ public final class AppSearchImpl implements Closeable {
	checkSuccess(resetResultProto.getStatus());		checkSuccess(resetResultProto.getStatus());
	}		}

			@GuardedBy("mReadWriteLock")
			private void rebuildDocumentCountMapLocked(@NonNull StorageInfoProto storageInfoProto) {
			mDocumentCountMapLocked.clear();
			List<NamespaceStorageInfoProto> namespaceStorageInfoProtoList =
			storageInfoProto.getDocumentStorageInfo().getNamespaceStorageInfoList();
			for (int i = 0; i < namespaceStorageInfoProtoList.size(); i++) {
			NamespaceStorageInfoProto namespaceStorageInfoProto =
			namespaceStorageInfoProtoList.get(i);
			String packageName = getPackageName(namespaceStorageInfoProto.getNamespace());
			Integer oldCount = mDocumentCountMapLocked.get(packageName);
			int newCount;
			if (oldCount == null) {
			newCount = namespaceStorageInfoProto.getNumAliveDocuments();
			} else {
			newCount = oldCount + namespaceStorageInfoProto.getNumAliveDocuments();
			}
			mDocumentCountMapLocked.put(packageName, newCount);
			}
			}

	/** Wrapper around schema changes */		/** Wrapper around schema changes */
	@VisibleForTesting		@VisibleForTesting
	static class RewrittenSchemaResults {		static class RewrittenSchemaResults {

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

0 → 100644

+57 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright 2021 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.server.appsearch.external.localstorage;


			/**
			* Defines limits placed on users of AppSearch and enforced by {@link AppSearchImpl}.
			*
			* @hide
			*/
			public interface LimitConfig {
			/**
			* The maximum number of bytes a single document is allowed to be.
			*
			* <p>Enforced at the time of serializing the document into a proto.
			*
			* <p>This limit has two purposes:
			*
			* <ol>
			* <li>Prevent the system service from using too much memory during indexing or querying by
			* capping the size of the data structures it needs to buffer
			* <li>Prevent apps from using a very large amount of data by storing exceptionally large
			* documents.
			* </ol>
			*/
			int getMaxDocumentSizeBytes();

			/**
			* The maximum number of documents a single app is allowed to index.
			*
			* <p>Enforced at indexing time.
			*
			* <p>This limit has two purposes:
			*
			* <ol>
			* <li>Protect icing lib's docid space from being overwhelmed by a single app. The overall
			* docid limit is currently 2^20 (~1 million)
			* <li>Prevent apps from using a very large amount of data on the system by storing too many
			* documents.
			* </ol>
			*/
			int getMaxDocumentCount();
			}