Skip to content

Commit c7e430b

Browse files
authored
Revert master (apache#5925)
* Revert "udate" This reverts commit 092e35c. * Revert "[HUDI-3475] Initialize hudi table management module." This reverts commit 4640a3b.
1 parent 092e35c commit c7e430b

43 files changed

Lines changed: 0 additions & 3234 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

hudi-client/hudi-client-common/src/main/java/org/apache/hudi/table/action/cluster/ClusteringPlanActionExecutor.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121
import org.apache.hudi.avro.model.HoodieClusteringPlan;
2222
import org.apache.hudi.avro.model.HoodieRequestedReplaceMetadata;
2323
import org.apache.hudi.common.engine.HoodieEngineContext;
24-
import org.apache.hudi.common.model.ActionType;
2524
import org.apache.hudi.common.model.HoodieRecordPayload;
2625
import org.apache.hudi.common.model.WriteOperationType;
27-
import org.apache.hudi.common.table.HoodieTableMetaClient;
2826
import org.apache.hudi.common.table.timeline.HoodieInstant;
2927
import org.apache.hudi.common.table.timeline.HoodieTimeline;
3028
import org.apache.hudi.common.table.timeline.TimelineMetadataUtils;
@@ -41,9 +39,7 @@
4139

4240
import java.io.IOException;
4341
import java.util.Collections;
44-
import java.util.List;
4542
import java.util.Map;
46-
import java.util.stream.Collectors;
4743

4844
public class ClusteringPlanActionExecutor<T extends HoodieRecordPayload, I, K, O> extends BaseActionExecutor<T, I, K, O, Option<HoodieClusteringPlan>> {
4945

@@ -106,22 +102,6 @@ public Option<HoodieClusteringPlan> execute() {
106102
throw new HoodieIOException("Exception scheduling clustering", ioe);
107103
}
108104
}
109-
110-
if (config.isTableManagerEnabled() && config.getTableManagerConfig().getTableManagerActions().contains(ActionType.replacecommit.name())) {
111-
submitClusteringToService();
112-
}
113-
114105
return planOption;
115106
}
116-
117-
private void submitClusteringToService() {
118-
HoodieTableMetaClient metaClient = table.getMetaClient();
119-
List<String> instantsToSubmit = metaClient.getActiveTimeline()
120-
.filterPendingReplaceTimeline()
121-
.getInstants()
122-
.map(HoodieInstant::getTimestamp)
123-
.collect(Collectors.toList());
124-
HoodieTableManagerClient tableManagerClient = new HoodieTableManagerClient(metaClient, config.getTableManagerConfig());
125-
tableManagerClient.submitClustering(instantsToSubmit);
126-
}
127107
}

hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/client/SparkRDDWriteClient.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,6 @@ protected void completeCompaction(HoodieCommitMetadata metadata,
333333
protected HoodieWriteMetadata<JavaRDD<WriteStatus>> compact(String compactionInstantTime, boolean shouldComplete) {
334334
HoodieSparkTable<T> table = HoodieSparkTable.create(config, context);
335335
preWrite(compactionInstantTime, WriteOperationType.COMPACT, table.getMetaClient());
336-
// do not compact a complete instant.
337-
if (table.getActiveTimeline().filterCompletedInstants().containsInstant(compactionInstantTime)) {
338-
return null;
339-
}
340336
HoodieTimeline pendingCompactionTimeline = table.getActiveTimeline().filterPendingCompactionTimeline();
341337
HoodieInstant inflightInstant = HoodieTimeline.getCompactionInflightInstant(compactionInstantTime);
342338
if (pendingCompactionTimeline.containsInstant(inflightInstant)) {

hudi-table-management-service/pom.xml

Lines changed: 0 additions & 333 deletions
This file was deleted.

0 commit comments

Comments
 (0)