diff options
| author | Yen-Chieh Sung <sungyc@google.com> | 2023-07-06 18:01:13 -0700 |
|---|---|---|
| committer | Yen-Chieh Sung <sungyc@google.com> | 2023-07-06 19:39:11 -0700 |
| commit | 4ac48569941d4f48b1a9bffdaf4abb2a3e8e9269 (patch) | |
| tree | 076d8d961026f2800a6ca41106aa11d54527a29b /icing/schema/schema-store.cc | |
| parent | f1f564329ad560f580c03f9e928057ad4e4fadc9 (diff) | |
| download | icing-4ac48569941d4f48b1a9bffdaf4abb2a3e8e9269.tar.gz | |
Update Icing from upstream.
Descriptions:
========================================================================
[Icing] Extend document store uri mapper
========================================================================
Implement dirty flag in PersistentStorage
========================================================================
[Icing][version 2][1/x] Implement ShouldRebuildDerivedFiles
========================================================================
[Icing][version 2][2/x] Bump kVersion to 2
========================================================================
[NumericSearch][optimization] Change numeric index bucket splitting threshold
========================================================================
[NumericSearch][optimization] Flag guard integer index bucket splitting threshold
========================================================================
Bug: 193919210
Bug: 280094535
Bug: 288969109
Bug: 259743562
NO_IFTTT="Path is only valid in G3."
Change-Id: Ie1e6f5969549f6c945ea32d03c724850ff5600a9
Diffstat (limited to 'icing/schema/schema-store.cc')
| -rw-r--r-- | icing/schema/schema-store.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/icing/schema/schema-store.cc b/icing/schema/schema-store.cc index bcc7c2c..bcacdce 100644 --- a/icing/schema/schema-store.cc +++ b/icing/schema/schema-store.cc @@ -485,9 +485,13 @@ libtextclassifier3::Status SchemaStore::RegenerateDerivedFiles( std::make_unique<SchemaProto>(std::move(base_schema)); ICING_RETURN_IF_ERROR(schema_file_->Write(std::move(base_schema_ptr))); + // LINT.IfChange(min_overlay_version_compatibility) + // Although the current version is 2, the schema is compatible with + // version 1, so min_overlay_version_compatibility should be 1. + int32_t min_overlay_version_compatibility = version_util::kVersionOne; + // LINT.ThenChange(//depot/google3/icing/file/version-util.h:kVersion) header_->SetOverlayInfo( - /*overlay_created=*/true, - /*min_overlay_version_compatibility=*/version_util::kVersionOne); + /*overlay_created=*/true, min_overlay_version_compatibility); // Rebuild in memory data - references to the old schema will be invalid // now. BuildInMemoryCache(); |