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

Add sparse vector property #2345

Merged
merged 3 commits into from
Nov 14, 2023
Merged

Add sparse vector property #2345

merged 3 commits into from
Nov 14, 2023

Conversation

Anaethelion
Copy link
Contributor

This add the SparseVectorProperty as part of the Property union.

Copy link
Member

@swallez swallez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Before merging, can you add output/openapi/elasticsearch-serverless-openapi.json to the .gitattributes file so that its diff is not expanded by default?

@Anaethelion Anaethelion merged commit 45873c6 into main Nov 14, 2023
5 checks passed
@Anaethelion Anaethelion deleted the add_sparse_vector_property branch November 14, 2023 14:52
Copy link
Contributor

The backport to 8.11 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.11 8.11
# Navigate to the new working tree
cd .worktrees/backport-8.11
# Create a new branch
git switch --create backport-2345-to-8.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 45873c6fd4d1695892b81aba61f42418703905c3
# Push it to GitHub
git push --set-upstream origin backport-2345-to-8.11
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.11

Then, create a pull request where the base branch is 8.11 and the compare/head branch is backport-2345-to-8.11.

Anaethelion added a commit that referenced this pull request Nov 14, 2023
* Add SparseVectorProperty to Property union

* make contrib

* Add output/openapi/elasticsearch-serverless-openapi.json to .gitattributes

(cherry picked from commit 45873c6)
Anaethelion added a commit that referenced this pull request Nov 14, 2023
* Add sparse vector property (#2345)

* Add SparseVectorProperty to Property union

* make contrib

* Add output/openapi/elasticsearch-serverless-openapi.json to .gitattributes

(cherry picked from commit 45873c6)

* Remove openapi output from 8.11 gitattributes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants