-
Notifications
You must be signed in to change notification settings - Fork 82
feat(knn): probe-core primitives for indexed Lance vector join (Spark 4.2) [1/3] #797
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
sezruby
wants to merge
3
commits into
lance-format:main
Choose a base branch
from
sezruby:knn-4.2-probe-core
base: main
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.
+1,633
−0
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.lance</groupId> | ||
| <artifactId>lance-spark-root</artifactId> | ||
| <version>0.8.0-beta.1</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>lance-spark-knn-4.2_2.13</artifactId> | ||
| <name>${project.artifactId}</name> | ||
| <description>Indexed nearest-by join on Lance — Spark 4.2 SQL Catalyst integration (SPARK-56395)</description> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <properties> | ||
| <scala.version>${scala213.version}</scala.version> | ||
| <scala.compat.version>${scala213.compat.version}</scala.compat.version> | ||
| <arrow.version>${arrow19.version}</arrow.version> | ||
| <java.release>${java17.release}</java.release> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.spark</groupId> | ||
| <artifactId>spark-sql_${scala.compat.version}</artifactId> | ||
| <version>${spark42.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.spark</groupId> | ||
| <artifactId>spark-catalyst_${scala.compat.version}</artifactId> | ||
| <version>${spark42.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <!-- | ||
| The Lance connector base. Supplies LanceRuntime / LanceConstant (used by LanceProbe) and | ||
| pulls in lance-core for the Lance Java API. The knn core (LanceKnnJoinStage, LanceProbe, | ||
| Metric, ...) lives in this module's own src, so no separate knn artifact is needed. | ||
| Exclude the netty buffer patch: Spark 4.2 (provided) supplies arrow 19.0.0 already. | ||
| --> | ||
| <dependency> | ||
| <groupId>org.lance</groupId> | ||
| <artifactId>lance-spark-base_${scala.compat.version}</artifactId> | ||
| <version>${project.version}</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.apache.arrow</groupId> | ||
| <artifactId>arrow-memory-netty-buffer-patch</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <!-- Test-runtime: the Spark 4.2 connector so the e2e test's format("lance") resolves. --> | ||
| <dependency> | ||
| <groupId>org.lance</groupId> | ||
| <artifactId>lance-spark-4.2_${scala.compat.version}</artifactId> | ||
| <version>${project.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <!-- junit-jupiter (test) is inherited from the root pom's global dependencies. --> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <version>${scala-maven-plugin.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>scala-compile-first</id> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>compile</goal> | ||
| </goals> | ||
| </execution> | ||
| <execution> | ||
| <id>scala-test-compile</id> | ||
| <phase>process-test-resources</phase> | ||
| <goals> | ||
| <goal>testCompile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <args> | ||
| <arg>-feature</arg> | ||
| <arg>-release</arg> | ||
| <arg>${java.release}</arg> | ||
| </args> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>${maven-compiler-plugin.version}</version> | ||
| <configuration> | ||
| <release>${java.release}</release> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <profiles> | ||
| <profile> | ||
| <id>java21</id> | ||
| <properties> | ||
| <java.release>21</java.release> | ||
| </properties> | ||
| </profile> | ||
| </profiles> | ||
| </project> | ||
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.
The release workflow runs
ci/bump_version.py, whose.bumpversion.tomlfile enumerates module POMs but omits this new one. After a root release bump, this parent version would remain0.8.0-beta.1, leaving the module out of the reactor/release version. Addlance-spark-knn-4.2_2.13/pom.xmlto the bump-version file list.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.
Fixed in 0b9e1e87:
.bumpversion.tomlnow includeslance-spark-knn-4.2_2.13/pom.xml, so release bumps update this module's parent version with the rest of the reactor.