-
Notifications
You must be signed in to change notification settings - Fork 990
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[core] Support timestamp field type in record level expire (#4417)
- Loading branch information
Showing
6 changed files
with
243 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
...on-core/src/test/java/org/apache/paimon/table/RecordLevelExpireWithTimestampBaseTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.paimon.table; | ||
|
|
||
| import org.apache.paimon.CoreOptions; | ||
| import org.apache.paimon.catalog.PrimaryKeyTableTestBase; | ||
| import org.apache.paimon.data.GenericRow; | ||
| import org.apache.paimon.data.Timestamp; | ||
| import org.apache.paimon.options.Options; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.time.Duration; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| abstract class RecordLevelExpireWithTimestampBaseTest extends PrimaryKeyTableTestBase { | ||
|
|
||
| @Override | ||
| protected Options tableOptions() { | ||
| Options options = new Options(); | ||
| options.set(CoreOptions.BUCKET, 1); | ||
| options.set(CoreOptions.RECORD_LEVEL_EXPIRE_TIME, Duration.ofSeconds(1)); | ||
| options.set(CoreOptions.RECORD_LEVEL_TIME_FIELD, "col1"); | ||
| options.set(CoreOptions.RECORD_LEVEL_TIME_FIELD_TYPE, CoreOptions.TimeFieldType.TIMESTAMP); | ||
| return options; | ||
| } | ||
|
|
||
| @Test | ||
| public void testTimestampTypeExpire() throws Exception { | ||
| long millis = System.currentTimeMillis(); | ||
| Timestamp timestamp1 = Timestamp.fromEpochMillis(millis - 60 * 1000); | ||
| Timestamp timestamp2 = Timestamp.fromEpochMillis(millis); | ||
| Timestamp timestamp3 = Timestamp.fromEpochMillis(millis + 60 * 1000); | ||
|
|
||
| // create at least two files in one bucket | ||
| writeCommit(GenericRow.of(1, 1, timestamp1), GenericRow.of(1, 2, timestamp2)); | ||
| writeCommit(GenericRow.of(1, 3, timestamp3)); | ||
|
|
||
| // no compaction, can be queried | ||
| assertThat(query(new int[] {0, 1})) | ||
| .containsExactlyInAnyOrder( | ||
| GenericRow.of(1, 1), GenericRow.of(1, 2), GenericRow.of(1, 3)); | ||
| Thread.sleep(2000); | ||
|
|
||
| // compact, expired | ||
| compact(1); | ||
| assertThat(query(new int[] {0, 1})).containsExactlyInAnyOrder(GenericRow.of(1, 3)); | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
paimon-core/src/test/java/org/apache/paimon/table/RecordLevelExpireWithTimestampLTZTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.paimon.table; | ||
|
|
||
| import org.apache.paimon.catalog.Catalog; | ||
| import org.apache.paimon.catalog.CatalogContext; | ||
| import org.apache.paimon.catalog.CatalogFactory; | ||
| import org.apache.paimon.catalog.Identifier; | ||
| import org.apache.paimon.fs.Path; | ||
| import org.apache.paimon.schema.Schema; | ||
| import org.apache.paimon.types.DataTypes; | ||
| import org.apache.paimon.utils.TraceableFileIO; | ||
|
|
||
| import org.junit.jupiter.api.BeforeEach; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| class RecordLevelExpireWithTimestampLTZTest extends RecordLevelExpireWithTimestampBaseTest { | ||
|
|
||
| @Override | ||
| @BeforeEach | ||
| public void beforeEachBase() throws Exception { | ||
| CatalogContext context = | ||
| CatalogContext.create( | ||
| new Path(TraceableFileIO.SCHEME + "://" + tempPath.toString())); | ||
| Catalog catalog = CatalogFactory.createCatalog(context); | ||
| Identifier identifier = new Identifier("default", "T"); | ||
| catalog.createDatabase(identifier.getDatabaseName(), true); | ||
| Schema schema = | ||
| Schema.newBuilder() | ||
| .column("pt", DataTypes.INT()) | ||
| .column("pk", DataTypes.INT()) | ||
| .column("col1", DataTypes.TIMESTAMP_WITH_LOCAL_TIME_ZONE()) | ||
| .partitionKeys("pt") | ||
| .primaryKey("pk", "pt") | ||
| .options(tableOptions().toMap()) | ||
| .build(); | ||
| catalog.createTable(identifier, schema, true); | ||
| table = (FileStoreTable) catalog.getTable(identifier); | ||
| commitUser = UUID.randomUUID().toString(); | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
paimon-core/src/test/java/org/apache/paimon/table/RecordLevelExpireWithTimestampTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.paimon.table; | ||
|
|
||
| import org.apache.paimon.catalog.Catalog; | ||
| import org.apache.paimon.catalog.CatalogContext; | ||
| import org.apache.paimon.catalog.CatalogFactory; | ||
| import org.apache.paimon.catalog.Identifier; | ||
| import org.apache.paimon.fs.Path; | ||
| import org.apache.paimon.schema.Schema; | ||
| import org.apache.paimon.types.DataTypes; | ||
| import org.apache.paimon.utils.TraceableFileIO; | ||
|
|
||
| import org.junit.jupiter.api.BeforeEach; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| class RecordLevelExpireWithTimestampTest extends RecordLevelExpireWithTimestampBaseTest { | ||
|
|
||
| @Override | ||
| @BeforeEach | ||
| public void beforeEachBase() throws Exception { | ||
| CatalogContext context = | ||
| CatalogContext.create( | ||
| new Path(TraceableFileIO.SCHEME + "://" + tempPath.toString())); | ||
| Catalog catalog = CatalogFactory.createCatalog(context); | ||
| Identifier identifier = new Identifier("default", "T"); | ||
| catalog.createDatabase(identifier.getDatabaseName(), true); | ||
| Schema schema = | ||
| Schema.newBuilder() | ||
| .column("pt", DataTypes.INT()) | ||
| .column("pk", DataTypes.INT()) | ||
| .column("col1", DataTypes.TIMESTAMP()) | ||
| .partitionKeys("pt") | ||
| .primaryKey("pk", "pt") | ||
| .options(tableOptions().toMap()) | ||
| .build(); | ||
| catalog.createTable(identifier, schema, true); | ||
| table = (FileStoreTable) catalog.getTable(identifier); | ||
| commitUser = UUID.randomUUID().toString(); | ||
| } | ||
| } |