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.

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

[Improve][Zeta] Remove serialize(deserialize) cost when use shuffle action #4722

Merged
merged 1 commit into from
May 15, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ public enum CheckpointType {
private final boolean auto;
private final String name;

public static CheckpointType fromName(String name) {
for (CheckpointType type : CheckpointType.values()) {
if (type.name.equals(name)) {
return type;
}
}
throw new IllegalArgumentException("Unknown checkpoint type: " + name);
}

CheckpointType(boolean auto, String name) {
this.auto = auto;
this.name = name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public Record read(ObjectDataInput in) throws IOException {
if (dataType == RecordDataType.CHECKPOINT_BARRIER.ordinal()) {
data =
new CheckpointBarrier(
in.readLong(), in.readLong(), CheckpointType.valueOf(in.readString()));
in.readLong(), in.readLong(), CheckpointType.fromName(in.readString()));
} else if (dataType == RecordDataType.SEATUNNEL_ROW.ordinal()) {
String tableId = in.readString();
byte rowKind = in.readByte();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@

import org.apache.seatunnel.api.table.type.Record;

import com.google.auto.service.AutoService;
import com.hazelcast.nio.serialization.Serializer;
import com.hazelcast.nio.serialization.SerializerHook;

@AutoService(SerializerHook.class)
public class RecordSerializerHook implements SerializerHook<Record> {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ private synchronized void shuffleFlush() {
for (Map.Entry<String, Queue<Record<?>>> shuffleBatch : shuffleBuffer.entrySet()) {
IQueue<Record<?>> shuffleQueue = shuffles.get(shuffleBatch.getKey());
Queue<Record<?>> shuffleQueueBatch = shuffleBatch.getValue();
if (!shuffleQueue.addAll(shuffleBatch.getValue())) {
if (shuffleQueue.remainingCapacity() <= 0
|| !shuffleQueue.addAll(shuffleBatch.getValue())) {
for (; ; ) {
Record<?> shuffleItem = shuffleQueueBatch.poll();
if (shuffleItem == null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# 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.
#

org.apache.seatunnel.engine.server.serializable.RecordSerializerHook