summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
Diffstat (limited to 'apex')
-rw-r--r--apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java72
-rw-r--r--apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java34
-rw-r--r--apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java3
-rw-r--r--apex/appsearch/service/java/com/android/server/appsearch/FrameworkOptimizeStrategy.java (renamed from apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/FrameworkOptimizeStrategy.java)28
4 files changed, 123 insertions, 14 deletions
diff --git a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java
index 689aa1fcd371..c44fd40617a1 100644
--- a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java
+++ b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchConfig.java
@@ -64,6 +64,12 @@ public final class AppSearchConfig implements AutoCloseable {
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;
+ @VisibleForTesting
+ static final int DEFAULT_BYTES_OPTIMIZE_THRESHOLD = 1 * 1024 * 1024; // 1 MiB
+ @VisibleForTesting
+ static final int DEFAULT_TIME_OPTIMIZE_THRESHOLD_MILLIS = Integer.MAX_VALUE;
+ @VisibleForTesting
+ static final int DEFAULT_DOC_COUNT_OPTIMIZE_THRESHOLD = 10_000;
/*
* Keys for ALL the flags stored in DeviceConfig.
@@ -79,6 +85,9 @@ public final class AppSearchConfig implements AutoCloseable {
"limit_config_max_document_size_bytes";
public static final String KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT =
"limit_config_max_document_docunt";
+ public static final String KEY_BYTES_OPTIMIZE_THRESHOLD = "bytes_optimize_threshold";
+ public static final String KEY_TIME_OPTIMIZE_THRESHOLD_MILLIS = "time_optimize_threshold";
+ public static final String KEY_DOC_COUNT_OPTIMIZE_THRESHOLD = "doc_count_optimize_threshold";
// Array contains all the corresponding keys for the cached values.
private static final String[] KEYS_TO_ALL_CACHED_VALUES = {
@@ -88,6 +97,9 @@ public final class AppSearchConfig implements AutoCloseable {
KEY_SAMPLING_INTERVAL_FOR_PUT_DOCUMENT_STATS,
KEY_LIMIT_CONFIG_MAX_DOCUMENT_SIZE_BYTES,
KEY_LIMIT_CONFIG_MAX_DOCUMENT_COUNT,
+ KEY_BYTES_OPTIMIZE_THRESHOLD,
+ KEY_TIME_OPTIMIZE_THRESHOLD_MILLIS,
+ KEY_DOC_COUNT_OPTIMIZE_THRESHOLD
};
// Lock needed for all the operations in this class.
@@ -251,6 +263,48 @@ public final class AppSearchConfig implements AutoCloseable {
}
}
+ /**
+ * Returns the cached optimize byte size threshold.
+ *
+ * An AppSearch Optimize job will be triggered if the bytes size of garbage resource exceeds
+ * this threshold.
+ */
+ int getCachedBytesOptimizeThreshold() {
+ synchronized (mLock) {
+ throwIfClosedLocked();
+ return mBundleLocked.getInt(KEY_BYTES_OPTIMIZE_THRESHOLD,
+ DEFAULT_BYTES_OPTIMIZE_THRESHOLD);
+ }
+ }
+
+ /**
+ * Returns the cached optimize time interval threshold.
+ *
+ * An AppSearch Optimize job will be triggered if the time since last optimize job exceeds
+ * this threshold.
+ */
+ int getCachedTimeOptimizeThresholdMs() {
+ synchronized (mLock) {
+ throwIfClosedLocked();
+ return mBundleLocked.getInt(KEY_TIME_OPTIMIZE_THRESHOLD_MILLIS,
+ DEFAULT_TIME_OPTIMIZE_THRESHOLD_MILLIS);
+ }
+ }
+
+ /**
+ * Returns the cached optimize document count threshold threshold.
+ *
+ * An AppSearch Optimize job will be triggered if the number of document of garbage resource
+ * exceeds this threshold.
+ */
+ int getCachedDocCountOptimizeThreshold() {
+ synchronized (mLock) {
+ throwIfClosedLocked();
+ return mBundleLocked.getInt(KEY_DOC_COUNT_OPTIMIZE_THRESHOLD,
+ DEFAULT_DOC_COUNT_OPTIMIZE_THRESHOLD);
+ }
+ }
+
@GuardedBy("mLock")
private void throwIfClosedLocked() {
if (mIsClosedLocked) {
@@ -307,6 +361,24 @@ public final class AppSearchConfig implements AutoCloseable {
properties.getInt(key, DEFAULT_LIMIT_CONFIG_MAX_DOCUMENT_COUNT));
}
break;
+ case KEY_BYTES_OPTIMIZE_THRESHOLD:
+ synchronized (mLock) {
+ mBundleLocked.putInt(key, properties.getInt(key,
+ DEFAULT_BYTES_OPTIMIZE_THRESHOLD));
+ }
+ break;
+ case KEY_TIME_OPTIMIZE_THRESHOLD_MILLIS:
+ synchronized (mLock) {
+ mBundleLocked.putInt(key, properties.getInt(key,
+ DEFAULT_TIME_OPTIMIZE_THRESHOLD_MILLIS));
+ }
+ break;
+ case KEY_DOC_COUNT_OPTIMIZE_THRESHOLD:
+ synchronized (mLock) {
+ mBundleLocked.putInt(key, properties.getInt(key,
+ DEFAULT_DOC_COUNT_OPTIMIZE_THRESHOLD));
+ }
+ break;
default:
break;
}
diff --git a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java
index ec37c3f68aaa..edd0786b0a8e 100644
--- a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java
+++ b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java
@@ -364,6 +364,12 @@ public class AppSearchManagerService extends SystemService {
++operationSuccessCount;
invokeCallbackOnResult(callback,
AppSearchResult.newSuccessfulResult(setSchemaResponse.getBundle()));
+
+ // setSchema will sync the schemas in the request to AppSearch, any existing
+ // schemas which is not included in the request will be delete if we force
+ // override incompatible schemas. And all documents of these types will be
+ // deleted as well. We should checkForOptimize for these deletion.
+ checkForOptimize(instance);
} catch (Throwable t) {
++operationFailureCount;
statusCode = throwableToFailedResult(t).getResultCode();
@@ -505,6 +511,10 @@ public class AppSearchManagerService extends SystemService {
// Now that the batch has been written. Persist the newly written data.
instance.getAppSearchImpl().persistToDisk(PersistType.Code.LITE);
invokeCallbackOnResult(callback, resultBuilder.build());
+
+ // The existing documents with same ID will be deleted, so there may be some
+ // resources that could be released after optimize().
+ checkForOptimize(instance, /*mutateBatchSize=*/ documentBundles.size());
} catch (Throwable t) {
++operationFailureCount;
statusCode = throwableToFailedResult(t).getResultCode();
@@ -1023,6 +1033,8 @@ public class AppSearchManagerService extends SystemService {
// Now that the batch has been written. Persist the newly written data.
instance.getAppSearchImpl().persistToDisk(PersistType.Code.LITE);
invokeCallbackOnResult(callback, resultBuilder.build());
+
+ checkForOptimize(instance, ids.size());
} catch (Throwable t) {
++operationFailureCount;
statusCode = throwableToFailedResult(t).getResultCode();
@@ -1092,6 +1104,8 @@ public class AppSearchManagerService extends SystemService {
instance.getAppSearchImpl().persistToDisk(PersistType.Code.LITE);
++operationSuccessCount;
invokeCallbackOnResult(callback, AppSearchResult.newSuccessfulResult(null));
+
+ checkForOptimize(instance);
} catch (Throwable t) {
++operationFailureCount;
statusCode = throwableToFailedResult(t).getResultCode();
@@ -1472,4 +1486,24 @@ public class AppSearchManagerService extends SystemService {
}
}
}
+
+ private void checkForOptimize(AppSearchUserInstance instance, int mutateBatchSize) {
+ EXECUTOR.execute(() -> {
+ try {
+ instance.getAppSearchImpl().checkForOptimize(mutateBatchSize);
+ } catch (AppSearchException e) {
+ Log.w(TAG, "Error occurred when check for optimize", e);
+ }
+ });
+ }
+
+ private void checkForOptimize(AppSearchUserInstance instance) {
+ EXECUTOR.execute(() -> {
+ try {
+ instance.getAppSearchImpl().checkForOptimize();
+ } catch (AppSearchException e) {
+ Log.w(TAG, "Error occurred when check for optimize", e);
+ }
+ });
+ }
}
diff --git a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java
index d0d2e8964cf0..4c2135f9ed1a 100644
--- a/apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java
+++ b/apex/appsearch/service/java/com/android/server/appsearch/AppSearchUserInstanceManager.java
@@ -27,7 +27,6 @@ import android.util.Log;
import com.android.internal.annotations.GuardedBy;
import com.android.server.appsearch.external.localstorage.AppSearchImpl;
-import com.android.server.appsearch.external.localstorage.FrameworkOptimizeStrategy;
import com.android.server.appsearch.external.localstorage.stats.InitializeStats;
import com.android.server.appsearch.stats.PlatformLogger;
import com.android.server.appsearch.visibilitystore.VisibilityStoreImpl;
@@ -177,7 +176,7 @@ public final class AppSearchUserInstanceManager {
icingDir,
new FrameworkLimitConfig(config),
initStatsBuilder,
- new FrameworkOptimizeStrategy());
+ new FrameworkOptimizeStrategy(config));
long prepareVisibilityStoreLatencyStartMillis = SystemClock.elapsedRealtime();
VisibilityStoreImpl visibilityStore =
diff --git a/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/FrameworkOptimizeStrategy.java b/apex/appsearch/service/java/com/android/server/appsearch/FrameworkOptimizeStrategy.java
index 8ec30e186306..d9344493ac34 100644
--- a/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/FrameworkOptimizeStrategy.java
+++ b/apex/appsearch/service/java/com/android/server/appsearch/FrameworkOptimizeStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2021 The Android Open Source Project
+ * 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.
@@ -13,14 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.server.appsearch.external.localstorage;
+package com.android.server.appsearch;
import android.annotation.NonNull;
-import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.appsearch.external.localstorage.AppSearchImpl;
+import com.android.server.appsearch.external.localstorage.OptimizeStrategy;
import com.google.android.icing.proto.GetOptimizeInfoResultProto;
+import java.util.Objects;
+
/**
* An implementation of {@link OptimizeStrategy} will determine when to trigger {@link
* AppSearchImpl#optimize()} in Jetpack environment.
@@ -28,17 +31,18 @@ import com.google.android.icing.proto.GetOptimizeInfoResultProto;
* @hide
*/
public class FrameworkOptimizeStrategy implements OptimizeStrategy {
-
- @VisibleForTesting static final int DOC_COUNT_OPTIMIZE_THRESHOLD = 100_000;
- @VisibleForTesting static final int BYTES_OPTIMIZE_THRESHOLD = 1 * 1024 * 1024 * 1024; // 1GB
-
- @VisibleForTesting
- static final long TIME_OPTIMIZE_THRESHOLD_MILLIS = 7 * 24 * 60 * 60 * 1000; // 1 week
+ private final AppSearchConfig mAppSearchConfig;
+ FrameworkOptimizeStrategy(@NonNull AppSearchConfig config) {
+ mAppSearchConfig = Objects.requireNonNull(config);
+ }
@Override
public boolean shouldOptimize(@NonNull GetOptimizeInfoResultProto optimizeInfo) {
- return optimizeInfo.getOptimizableDocs() >= DOC_COUNT_OPTIMIZE_THRESHOLD
- || optimizeInfo.getEstimatedOptimizableBytes() >= BYTES_OPTIMIZE_THRESHOLD
- || optimizeInfo.getTimeSinceLastOptimizeMs() >= TIME_OPTIMIZE_THRESHOLD_MILLIS;
+ return optimizeInfo.getOptimizableDocs()
+ >= mAppSearchConfig.getCachedDocCountOptimizeThreshold()
+ || optimizeInfo.getEstimatedOptimizableBytes()
+ >= mAppSearchConfig.getCachedBytesOptimizeThreshold()
+ || optimizeInfo.getTimeSinceLastOptimizeMs()
+ >= mAppSearchConfig.getCachedTimeOptimizeThresholdMs();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 04:35:08 +0000