Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Make the refreshAsync options take affect to PrimaryKeyPartialLookupTable #4208

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+212 −78
Open

[core] Make the refreshAsync options take affect to PrimaryKeyPartialLookupTable #4208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
131 changes: 131 additions & 0 deletions ...on-flink-common/src/main/java/org/apache/paimon/flink/lookup/AsyncRefreshLookupTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
/*
* 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.flink.lookup;

import org.apache.paimon.options.Options;
import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.utils.ExecutorThreadFactory;
import org.apache.paimon.utils.ExecutorUtils;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nullable;

import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;

import static org.apache.paimon.flink.FlinkConnectorOptions.LOOKUP_REFRESH_ASYNC;
import static org.apache.paimon.flink.FlinkConnectorOptions.LOOKUP_REFRESH_ASYNC_PENDING_SNAPSHOT_COUNT;

/** A {@link LookupTable} supports async refresh. */
public abstract class AsyncRefreshLookupTable implements LookupTable {
private static final Logger LOG = LoggerFactory.getLogger(AsyncRefreshLookupTable.class);
private final FileStoreTable table;

private final int maxPendingSnapshotCount;

@Nullable private final ExecutorService refreshExecutor;

private final AtomicReference<Exception> cachedException;

private Future<?> refreshFuture;

protected final boolean refreshAsync;

public AsyncRefreshLookupTable(FileStoreTable table) {
Options options = Options.fromMap(table.options());
this.table = table;
this.refreshAsync = options.get(LOOKUP_REFRESH_ASYNC);
this.refreshExecutor =
this.refreshAsync
? Executors.newSingleThreadExecutor(
new ExecutorThreadFactory(
String.format(
"%s-lookup-refresh",
Thread.currentThread().getName())))
: null;
this.cachedException = new AtomicReference<>();
this.maxPendingSnapshotCount = options.get(LOOKUP_REFRESH_ASYNC_PENDING_SNAPSHOT_COUNT);
}

@Override
public void refresh() throws Exception {
if (!refreshAsync) {
doRefresh();
return;
}

Long latestSnapshotId = table.snapshotManager().latestSnapshotId();
Long nextSnapshotId = nextSnapshotId();
if (latestSnapshotId != null
&& nextSnapshotId != null
&& latestSnapshotId - nextSnapshotId > maxPendingSnapshotCount) {
LOG.warn(
"The latest snapshot id {} is much greater than the next snapshot id {} for {}}, "
+ "you may need to increase the parallelism of lookup operator.",
latestSnapshotId,
nextSnapshotId,
maxPendingSnapshotCount);
sync();
}

refreshAsync();
}

private void refreshAsync() {
try {
refreshFuture =
refreshExecutor.submit(
() -> {
try {
doRefresh();
} catch (Exception e) {
LOG.error("Refresh lookup table {} failed", table.name(), e);
cachedException.set(e);
}
});
} catch (RejectedExecutionException e) {
LOG.warn("Add refresh task for lookup table {} failed", table.name(), e);
}
}

/** Wait until the previous refresh task to be finished. */
public void sync() throws Exception {
if (refreshFuture != null) {
this.refreshFuture.get();
}
}

public abstract void doRefresh() throws Exception;

public abstract Long nextSnapshotId();

@Override
public void close() throws IOException {
if (refreshExecutor != null) {
ExecutorUtils.gracefulShutdown(1L, TimeUnit.MINUTES, refreshExecutor);
}
}
}
83 changes: 11 additions & 72 deletions ...aimon-flink-common/src/main/java/org/apache/paimon/flink/lookup/FullCacheLookupTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
import org.apache.paimon.sort.BinaryExternalSortBuffer;
import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.types.RowType;
import org.apache.paimon.utils.ExecutorThreadFactory;
import org.apache.paimon.utils.ExecutorUtils;
import org.apache.paimon.utils.FieldsComparator;
import org.apache.paimon.utils.FileIOUtils;
import org.apache.paimon.utils.MutableObjectIterator;
Expand All @@ -54,22 +52,15 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;

import static org.apache.paimon.flink.FlinkConnectorOptions.LOOKUP_REFRESH_ASYNC;
import static org.apache.paimon.flink.FlinkConnectorOptions.LOOKUP_REFRESH_ASYNC_PENDING_SNAPSHOT_COUNT;

/** Lookup table of full cache. */
public abstract class FullCacheLookupTable implements LookupTable {
public abstract class FullCacheLookupTable extends AsyncRefreshLookupTable {
private static final Logger LOG = LoggerFactory.getLogger(FullCacheLookupTable.class);

protected final Object lock = new Object();
protected final Object lock;
protected final Context context;
protected final RowType projectedType;
protected final boolean refreshAsync;
Expand All @@ -78,15 +69,12 @@ public abstract class FullCacheLookupTable implements LookupTable {
protected final int appendUdsFieldNumber;

protected RocksDBStateFactory stateFactory;
@Nullable private final ExecutorService refreshExecutor;
private final AtomicReference<Exception> cachedException;
private final int maxPendingSnapshotCount;
private final FileStoreTable table;
private Future<?> refreshFuture;
private LookupStreamingReader reader;
private Predicate specificPartition;

public FullCacheLookupTable(Context context) {
super(context.table);
this.table = context.table;
List<String> sequenceFields = new ArrayList<>();
if (table.primaryKeys().size() > 0) {
Expand Down Expand Up @@ -121,16 +109,7 @@ public FullCacheLookupTable(Context context) {
Options options = Options.fromMap(context.table.options());
this.projectedType = projectedType;
this.refreshAsync = options.get(LOOKUP_REFRESH_ASYNC);
this.refreshExecutor =
this.refreshAsync
? Executors.newSingleThreadExecutor(
new ExecutorThreadFactory(
String.format(
"%s-lookup-refresh",
Thread.currentThread().getName())))
: null;
this.cachedException = new AtomicReference<>();
this.maxPendingSnapshotCount = options.get(LOOKUP_REFRESH_ASYNC_PENDING_SNAPSHOT_COUNT);
this.lock = this.refreshAsync ? new Object() : null;
}

@Override
Expand Down Expand Up @@ -188,54 +167,16 @@ protected void bootstrap() throws Exception {
}

@Override
public void refresh() throws Exception {
if (refreshExecutor == null) {
doRefresh();
return;
public Long nextSnapshotId() {
if (reader != null) {
return reader.nextSnapshotId();
}

Long latestSnapshotId = table.snapshotManager().latestSnapshotId();
Long nextSnapshotId = reader.nextSnapshotId();
if (latestSnapshotId != null
&& nextSnapshotId != null
&& latestSnapshotId - nextSnapshotId > maxPendingSnapshotCount) {
LOG.warn(
"The latest snapshot id {} is much greater than the next snapshot id {} for {}}, "
+ "you may need to increase the parallelism of lookup operator.",
latestSnapshotId,
nextSnapshotId,
maxPendingSnapshotCount);
if (refreshFuture != null) {
// Wait the previous refresh task to be finished.
refreshFuture.get();
}
doRefresh();
} else {
Future<?> currentFuture = null;
try {
currentFuture =
refreshExecutor.submit(
() -> {
try {
doRefresh();
} catch (Exception e) {
LOG.error(
"Refresh lookup table {} failed",
context.table.name(),
e);
cachedException.set(e);
}
});
} catch (RejectedExecutionException e) {
LOG.warn("Add refresh task for lookup table {} failed", context.table.name(), e);
}
if (currentFuture != null) {
refreshFuture = currentFuture;
}
}
return null;
}

private void doRefresh() throws Exception {
@Override
public void doRefresh() throws Exception {
while (true) {
try (RecordReaderIterator<InternalRow> batch =
new RecordReaderIterator<>(reader.nextBatch(false))) {
Expand Down Expand Up @@ -301,9 +242,7 @@ public Predicate projectedPredicate() {
@Override
public void close() throws IOException {
try {
if (refreshExecutor != null) {
ExecutorUtils.gracefulShutdown(1L, TimeUnit.MINUTES, refreshExecutor);
}
super.close();
} finally {
stateFactory.close();
FileIOUtils.deleteDirectory(context.tempPath);
Expand Down
31 changes: 26 additions & 5 deletions ...ink-common/src/main/java/org/apache/paimon/flink/lookup/PrimaryKeyPartialLookupTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import java.util.function.Function;

/** Lookup table for primary key which supports to read the LSM tree directly. */
public class PrimaryKeyPartialLookupTable implements LookupTable {
public class PrimaryKeyPartialLookupTable extends AsyncRefreshLookupTable {

private final Function<Predicate, QueryExecutor> executorFactory;
private final FixedBucketFromPkExtractor extractor;
Expand All @@ -58,6 +58,7 @@ private PrimaryKeyPartialLookupTable(
Function<Predicate, QueryExecutor> executorFactory,
FileStoreTable table,
List<String> joinKey) {
super(table);
this.executorFactory = executorFactory;

if (table.bucketMode() != BucketMode.HASH_FIXED) {
Expand Down Expand Up @@ -131,14 +132,23 @@ public List<InternalRow> get(InternalRow key) throws IOException {
}

@Override
public void refresh() {
public void doRefresh() {
queryExecutor.refresh();
}

@Override
public Long nextSnapshotId() {
return queryExecutor.nextSnapshotId();
}

@Override
public void close() throws IOException {
if (queryExecutor != null) {
queryExecutor.close();
try {
super.close();
} finally {
if (queryExecutor != null) {
queryExecutor.close();
}
}
}

Expand Down Expand Up @@ -171,10 +181,11 @@ interface QueryExecutor extends Closeable {
InternalRow lookup(BinaryRow partition, int bucket, InternalRow key) throws IOException;

void refresh();

Long nextSnapshotId();
}

static class LocalQueryExecutor implements QueryExecutor {

private final LocalTableQuery tableQuery;
private final StreamTableScan scan;

Expand Down Expand Up @@ -228,6 +239,11 @@ public void refresh() {
}
}

@Override
public Long nextSnapshotId() {
return scan.checkpoint();
}

@Override
public void close() throws IOException {
tableQuery.close();
Expand All @@ -251,6 +267,11 @@ public InternalRow lookup(BinaryRow partition, int bucket, InternalRow key)
@Override
public void refresh() {}

@Override
public Long nextSnapshotId() {
return null;
}

@Override
public void close() throws IOException {
tableQuery.close();
Expand Down
Loading
Loading