-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
37dad0c
commit 1d996fd
Showing
4 changed files
with
149 additions
and
2 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
95 changes: 95 additions & 0 deletions
95
...park-common/src/main/java/org/apache/paimon/spark/procedure/CompactManifestProcedure.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,95 @@ | ||
| /* | ||
| * 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.spark.procedure; | ||
|
|
||
| import org.apache.paimon.operation.FileStoreCommit; | ||
| import org.apache.paimon.table.FileStoreTable; | ||
|
|
||
| import org.apache.spark.sql.catalyst.InternalRow; | ||
| import org.apache.spark.sql.connector.catalog.Identifier; | ||
| import org.apache.spark.sql.connector.catalog.TableCatalog; | ||
| import org.apache.spark.sql.types.DataTypes; | ||
| import org.apache.spark.sql.types.Metadata; | ||
| import org.apache.spark.sql.types.StructField; | ||
| import org.apache.spark.sql.types.StructType; | ||
|
|
||
| import static org.apache.spark.sql.types.DataTypes.StringType; | ||
|
|
||
| /** | ||
| * Compact manifest procedure. Usage: | ||
| * | ||
| * <pre><code> | ||
| * CALL sys.compact_manifest(table => 'tableId') | ||
| * </code></pre> | ||
| */ | ||
| public class CompactManifestProcedure extends BaseProcedure { | ||
|
|
||
| private static final ProcedureParameter[] PARAMETERS = | ||
| new ProcedureParameter[] {ProcedureParameter.required("table", StringType)}; | ||
|
|
||
| private static final StructType OUTPUT_TYPE = | ||
| new StructType( | ||
| new StructField[] { | ||
| new StructField("result", DataTypes.BooleanType, true, Metadata.empty()) | ||
| }); | ||
|
|
||
| protected CompactManifestProcedure(TableCatalog tableCatalog) { | ||
| super(tableCatalog); | ||
| } | ||
|
|
||
| @Override | ||
| public ProcedureParameter[] parameters() { | ||
| return PARAMETERS; | ||
| } | ||
|
|
||
| @Override | ||
| public StructType outputType() { | ||
| return OUTPUT_TYPE; | ||
| } | ||
|
|
||
| @Override | ||
| public InternalRow[] call(InternalRow args) { | ||
|
|
||
| Identifier tableIdent = toIdentifier(args.getString(0), PARAMETERS[0].name()); | ||
| FileStoreTable table = (FileStoreTable) loadSparkTable(tableIdent).getTable(); | ||
|
|
||
| try (FileStoreCommit commit = | ||
| table.store() | ||
| .newCommit(table.coreOptions().createCommitUser()) | ||
| .ignoreEmptyCommit(false)) { | ||
| commit.compactManifest(); | ||
| } | ||
|
|
||
| return new InternalRow[] {newInternalRow(true)}; | ||
| } | ||
|
|
||
| @Override | ||
| public String description() { | ||
| return "This procedure execute compact action on paimon table."; | ||
| } | ||
|
|
||
| public static ProcedureBuilder builder() { | ||
| return new Builder<CompactManifestProcedure>() { | ||
| @Override | ||
| public CompactManifestProcedure doBuild() { | ||
| return new CompactManifestProcedure(tableCatalog()); | ||
| } | ||
| }; | ||
| } | ||
| } |
50 changes: 50 additions & 0 deletions
50
...ommon/src/test/scala/org/apache/paimon/spark/procedure/CompactManifestProcedureTest.scala
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,50 @@ | ||
| /* | ||
| * 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.spark.procedure | ||
|
|
||
| import org.apache.paimon.spark.PaimonSparkTestBase | ||
|
|
||
| import org.apache.spark.sql.streaming.StreamTest | ||
| import org.assertj.core.api.Assertions | ||
|
|
||
| /** Test compact manifest procedure. See [[CompactManifestProcedure]]. */ | ||
| class CompactManifestProcedureTest extends PaimonSparkTestBase with StreamTest { | ||
|
|
||
| test("Paimon Procedure: compact manifest") { | ||
| spark.sql( | ||
| s""" | ||
| |CREATE TABLE T (id INT, value STRING, dt STRING, hh INT) | ||
| |TBLPROPERTIES ('bucket'='-1', 'write-only'='true', 'compaction.min.file-num'='2', 'compaction.max.file-num'='2') | ||
| |PARTITIONED BY (dt, hh) | ||
| |""".stripMargin) | ||
|
|
||
| spark.sql(s"INSERT INTO T VALUES (5, '5', '2024-01-02', 0), (6, '6', '2024-01-02', 1)") | ||
| spark.sql(s"INSERT OVERWRITE T VALUES (5, '5', '2024-01-02', 0), (6, '6', '2024-01-02', 1)") | ||
| spark.sql(s"INSERT OVERWRITE T VALUES (5, '5', '2024-01-02', 0), (6, '6', '2024-01-02', 1)") | ||
| spark.sql(s"INSERT OVERWRITE T VALUES (5, '5', '2024-01-02', 0), (6, '6', '2024-01-02', 1)") | ||
|
|
||
| Thread.sleep(10000); | ||
|
|
||
| var rows = spark.sql("SELECT sum(num_deleted_files) FROM `T$manifests`").collectAsList() | ||
| Assertions.assertThat(rows.get(0).getLong(0)).isEqualTo(6L) | ||
| spark.sql("CALL sys.compact_manifest(table => 'T')") | ||
| rows = spark.sql("SELECT sum(num_deleted_files) FROM `T$manifests`").collectAsList() | ||
| Assertions.assertThat(rows.get(0).getLong(0)).isEqualTo(0L) | ||
| } | ||
| } |