-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[spark] support distributed execution of vector search on spark #8108
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
Open
Stefanietry
wants to merge
1
commit into
apache:master
Choose a base branch
from
Stefanietry:opt_vector_search_on_spark
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+555
−24
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
64 changes: 64 additions & 0 deletions
64
paimon-core/src/main/java/org/apache/paimon/table/source/VectorSearchBuilderFactory.java
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,64 @@ | ||
| /* | ||
| * 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.table.source; | ||
|
|
||
| import org.apache.paimon.factories.FactoryException; | ||
| import org.apache.paimon.factories.FactoryUtil; | ||
| import org.apache.paimon.table.InnerTable; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** Factory for {@link VectorSearchBuilder}. */ | ||
| public class VectorSearchBuilderFactory { | ||
|
|
||
| private VectorSearchBuilderFactory() {} | ||
|
|
||
| public static VectorSearchBuilder create(InnerTable table) { | ||
| ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); | ||
| if (classLoader == null) { | ||
| classLoader = VectorSearchBuilderFactory.class.getClassLoader(); | ||
| } | ||
|
|
||
| List<VectorSearchBuilderProvider> providers = | ||
| FactoryUtil.discoverFactories(classLoader, VectorSearchBuilderProvider.class); | ||
| List<VectorSearchBuilder> builders = new ArrayList<>(); | ||
| List<String> matchedProviders = new ArrayList<>(); | ||
| for (VectorSearchBuilderProvider provider : providers) { | ||
| VectorSearchBuilder builder = provider.create(table); | ||
| if (builder != null) { | ||
| builders.add(builder); | ||
| matchedProviders.add(provider.getClass().getName()); | ||
| } | ||
| } | ||
|
|
||
| if (builders.size() > 1) { | ||
| throw new FactoryException( | ||
| String.format( | ||
| "Multiple VectorSearchBuilder providers matched table '%s': %s", | ||
| table.name(), String.join(", ", matchedProviders))); | ||
| } | ||
|
|
||
| if (builders.size() == 1) { | ||
| return builders.get(0); | ||
| } | ||
|
|
||
| return new VectorSearchBuilderImpl(table); | ||
| } | ||
| } |
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
30 changes: 30 additions & 0 deletions
30
paimon-core/src/main/java/org/apache/paimon/table/source/VectorSearchBuilderProvider.java
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,30 @@ | ||
| /* | ||
| * 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.table.source; | ||
|
|
||
| import org.apache.paimon.table.InnerTable; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| /** SPI for engine specific {@link VectorSearchBuilder} creation. */ | ||
| public interface VectorSearchBuilderProvider { | ||
|
|
||
| @Nullable | ||
| VectorSearchBuilder create(InnerTable table); | ||
| } |
63 changes: 63 additions & 0 deletions
63
...rk/paimon-spark-common/src/main/java/org/apache/paimon/spark/read/SparkEngineContext.java
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,63 @@ | ||
| /* | ||
| * 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.read; | ||
|
|
||
| import org.apache.paimon.utils.SerializableFunction; | ||
|
|
||
| import org.apache.spark.api.java.JavaSparkContext; | ||
| import org.apache.spark.broadcast.Broadcast; | ||
| import org.apache.spark.sql.SparkSession; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.stream.Stream; | ||
|
|
||
| /** | ||
| * Tiny wrapper around the active {@link SparkSession} that exposes RDD style {@code map} / {@code | ||
| * flatMap} primitives over a Java {@link List}. Used by Paimon-on-Spark to dispatch | ||
| * embarrassingly-parallel work (e.g. per-split vector search) to the cluster without forcing the | ||
| * caller to depend on Spark types directly. | ||
| */ | ||
| public class SparkEngineContext { | ||
|
|
||
| private final JavaSparkContext jsc; | ||
|
|
||
| public SparkEngineContext() { | ||
| this.jsc = JavaSparkContext.fromSparkContext(SparkSession.active().sparkContext()); | ||
| } | ||
|
|
||
| public <T> Broadcast<T> broadcast(T value) { | ||
| return jsc.broadcast(value); | ||
| } | ||
|
|
||
| public <I, O> List<O> map(List<I> data, SerializableFunction<I, O> func, int parallelism) { | ||
| if (data.isEmpty()) { | ||
| return Collections.emptyList(); | ||
| } | ||
| return jsc.parallelize(data, parallelism).map(func::apply).collect(); | ||
| } | ||
|
|
||
| public <I, O> List<O> flatMap( | ||
| List<I> data, SerializableFunction<I, Stream<O>> func, int parallelism) { | ||
| if (data.isEmpty()) { | ||
| return Collections.emptyList(); | ||
| } | ||
| return jsc.parallelize(data, parallelism).flatMap(x -> func.apply(x).iterator()).collect(); | ||
| } | ||
| } |
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.
This helper cannot round-trip an empty
ScoredGlobalIndexResult.serialize()writes onlyscoreSize=0for scored results whose bitmap is empty, and the existing deserializer interpretsscoreSize == 0as a plainGlobalIndexResult; thisdeserialize(byte[])method then fails theinstanceof ScoredGlobalIndexResultcheck. In the distributed reader, a split group can legitimately produce an empty scored result when the scalar pre-filter excludes all rows in that group, so this can make filtered distributed searches fail even though the local path handles empty optionals. We probably need an explicit scored/non-scored marker in the serialization format, or avoid serializing empty scored results as successful task results.