Fixed UDF jar metadata handling in UDFInfo when multiple UDFs share the same jar
#17732
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,136 @@ | ||
| /* | ||
| * 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.iotdb.commons.executable; | ||
|
|
||
| import org.apache.tsfile.utils.ReadWriteIOUtils; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.OutputStream; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| public class ReferenceCountedJarMetaKeeper { | ||
|
|
||
| private final Map<String, String> jarNameToMd5Map = new HashMap<>(); | ||
| private final Map<String, Integer> jarNameToReferenceCountMap = new HashMap<>(); | ||
|
|
||
| public synchronized boolean containsJar(final String jarName) { | ||
| return jarNameToMd5Map.containsKey(jarName); | ||
| } | ||
|
|
||
| public synchronized boolean needToSaveJar(final String jarName) { | ||
| return !containsJar(jarName); | ||
| } | ||
|
|
||
| public synchronized boolean jarNameExistsAndMatchesMd5(final String jarName, final String md5) { | ||
| return containsJar(jarName) && Objects.equals(jarNameToMd5Map.get(jarName), md5); | ||
| } | ||
|
|
||
| public synchronized void addReference(final String jarName, final String md5) { | ||
| if (jarNameToReferenceCountMap.containsKey(jarName)) { | ||
|
Check warning on line 49 in iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/executable/ReferenceCountedJarMetaKeeper.java
|
||
| jarNameToReferenceCountMap.put(jarName, jarNameToReferenceCountMap.get(jarName) + 1); | ||
| return; | ||
| } | ||
|
|
||
| jarNameToReferenceCountMap.put(jarName, 1); | ||
| jarNameToMd5Map.put(jarName, md5); | ||
| } | ||
|
|
||
| public synchronized void removeReference(final String jarName) { | ||
| final Integer referenceCount = jarNameToReferenceCountMap.get(jarName); | ||
| if (referenceCount == null || referenceCount <= 1) { | ||
| jarNameToReferenceCountMap.remove(jarName); | ||
| jarNameToMd5Map.remove(jarName); | ||
| return; | ||
| } | ||
|
|
||
| jarNameToReferenceCountMap.put(jarName, referenceCount - 1); | ||
| } | ||
|
|
||
| public synchronized void clear() { | ||
| jarNameToMd5Map.clear(); | ||
| jarNameToReferenceCountMap.clear(); | ||
| } | ||
|
|
||
| public synchronized Map<String, String> getJarNameToMd5Map() { | ||
| return new HashMap<>(jarNameToMd5Map); | ||
| } | ||
|
|
||
| public synchronized void serializeJarNameToMd5(final OutputStream outputStream) | ||
| throws IOException { | ||
| ReadWriteIOUtils.write(jarNameToMd5Map.size(), outputStream); | ||
| for (final Map.Entry<String, String> entry : jarNameToMd5Map.entrySet()) { | ||
| ReadWriteIOUtils.write(entry.getKey(), outputStream); | ||
| ReadWriteIOUtils.write(entry.getValue(), outputStream); | ||
| } | ||
| } | ||
|
|
||
| public synchronized void deserializeJarNameToMd5(final InputStream inputStream) | ||
| throws IOException { | ||
| clear(); | ||
|
|
||
| int size = ReadWriteIOUtils.readInt(inputStream); | ||
| while (size > 0) { | ||
| addReference( | ||
| ReadWriteIOUtils.readString(inputStream), ReadWriteIOUtils.readString(inputStream)); | ||
| size--; | ||
| } | ||
| } | ||
|
|
||
| public synchronized void serializeJarNameToMd5AndReferenceCount(final OutputStream outputStream) | ||
| throws IOException { | ||
| int size = 0; | ||
| for (final Map.Entry<String, Integer> entry : jarNameToReferenceCountMap.entrySet()) { | ||
| if (entry.getValue() > 0 && jarNameToMd5Map.containsKey(entry.getKey())) { | ||
| size++; | ||
| } | ||
| } | ||
|
|
||
| ReadWriteIOUtils.write(size, outputStream); | ||
| for (final Map.Entry<String, Integer> entry : jarNameToReferenceCountMap.entrySet()) { | ||
| final String jarName = entry.getKey(); | ||
| final int referenceCount = entry.getValue(); | ||
| if (referenceCount <= 0 || !jarNameToMd5Map.containsKey(jarName)) { | ||
| continue; | ||
| } | ||
| ReadWriteIOUtils.write(jarName, outputStream); | ||
| ReadWriteIOUtils.write(jarNameToMd5Map.get(jarName), outputStream); | ||
| ReadWriteIOUtils.write(referenceCount, outputStream); | ||
| } | ||
| } | ||
|
Comment on lines
+99
to
+119
Contributor
There was a problem hiding this comment. Is it possible or necessary to serialize an entry whose count is zero?
Collaborator
Author
There was a problem hiding this comment. Good point. A zero reference count should not be serialized: under the normal add/remove path, removeReference removes both maps when the count reaches zero. I updated the snapshot logic to serialize only entries with a positive reference count and matching md5 metadata, and to skip non-positive counts when loading snapshots as a defensive cleanup. Added a regression test for the zero-count snapshot case as well. |
||
|
|
||
| public synchronized void deserializeJarNameToMd5AndReferenceCount(final InputStream inputStream) | ||
| throws IOException { | ||
| clear(); | ||
|
|
||
| final int jarSize = ReadWriteIOUtils.readInt(inputStream); | ||
| for (int i = 0; i < jarSize; i++) { | ||
| final String jarName = ReadWriteIOUtils.readString(inputStream); | ||
| final String md5 = ReadWriteIOUtils.readString(inputStream); | ||
| final int referenceCount = ReadWriteIOUtils.readInt(inputStream); | ||
| if (referenceCount > 0) { | ||
| jarNameToMd5Map.put(jarName, md5); | ||
| jarNameToReferenceCountMap.put(jarName, referenceCount); | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After deserializeExistedJarToMD5, rebuildJarMetadataFromUDFTable() clears both maps and rebuilds from udfTable. That makes udfTable the source of truth on load.
A short comment here explaining that deserialized existedJarToMD5 is intentionally discarded would help future readers.