Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/collections/config/classes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export class MergeWithExisting {
}

static objectTTL(current: WeaviateObjectTTLConfig, update: ObjectTTLConfigUpdate): WeaviateObjectTTLConfig {
if (current === undefined) throw Error('Object TTL config is missing from the class schema.');
if (current === undefined) return update;
return {
enabled: update.enabled ?? current.enabled,
deleteOn: update.deleteOn ?? current.deleteOn,
Expand Down
9 changes: 7 additions & 2 deletions src/collections/config/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,16 @@ class ConfigMapping {
return { enabled: false };
}
return {
...v,
enabled: v.enabled ?? false,
deleteOn: v.deleteOn,
deleteOn:
v.deleteOn == '_creationTimeUnix'
? 'creationTime'
: v.deleteOn == '_lastUpdateTimeUnix'
? 'updateTime'
: v.deleteOn,
defaultTTLSeconds: v.defaultTtl,
filterExpiredObjects: v.filterExpiredObjects,
...v,
};
}
static multiTenancy(v?: WeaviateMultiTenancyConfig): MultiTenancyConfig {
Expand Down
4 changes: 2 additions & 2 deletions test/collections/config/integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ describe('Testing of the collection.config namespace', () => {
const created = await collection.config.get();
expect(created.objectTTL).toBeDefined();
expect(created.objectTTL.enabled).toEqual(true);
expect(created.objectTTL.deleteOn).toEqual('_creationTimeUnix');
expect(created.objectTTL.deleteOn).toEqual('creationTime');
expect(created.objectTTL.defaultTTLSeconds).toEqual(120);

await collection.config.update({
Expand All @@ -1105,7 +1105,7 @@ describe('Testing of the collection.config namespace', () => {
const updated = await collection.config.get();
expect(updated.objectTTL).toBeDefined();
expect(updated.objectTTL.enabled).toEqual(true);
expect(updated.objectTTL.deleteOn).toEqual('_lastUpdateTimeUnix');
expect(updated.objectTTL.deleteOn).toEqual('updateTime');
expect(updated.objectTTL.defaultTTLSeconds).toEqual(400);

await collection.config.update({
Expand Down
Loading