Skip to content

Conversation

@kderusso
Copy link
Member

@kderusso kderusso commented Apr 29, 2025

I was able to duplicate the issues in #126401 with ./gradlew :x-pack:plugin:yamlRestTest

Logfile generated when testing locally located in: x-pack/plugin/build/testrun/yamlRestTest/temp/yamlRestTest5952494005017454472/yamlRestTest-0/logs/yamlRestTest.log

A followup test I've been running to validate the circular dependency:

./gradlew ":x-pack:plugin:search-business-rules:yamlRestTest" --tests "org.elasticsearch.xpack.searchbusinessrules.SearchBusinessRulesClientYamlTestSuiteIT.test {p0=search-business-rules/10_pinned_retriever/pinned retriever error case - duplicate doc}" -Dtests.seed=C17BA63AF804192E -Dtests.locale=dje-Latn-NE -Dtests.timezone=Canada/Pacific -Druntime.java=24

@kderusso kderusso changed the title Fix compilation error Playing with pinned retriever CI Apr 29, 2025
@kderusso kderusso marked this pull request as ready for review April 30, 2025 01:00
@kderusso kderusso requested a review from mridula-s109 April 30, 2025 01:00
@elasticsearchmachine elasticsearchmachine added the needs:triage Requires assignment of a team area label label Apr 30, 2025
@mridula-s109 mridula-s109 merged commit 247c78d into elastic:pinned-retriever Apr 30, 2025
13 of 16 checks passed
mridula-s109 added a commit that referenced this pull request May 1, 2025
* Created PinnedQueryRetriever Builder

* Added retriever build test file

* Changed the test to accept all the retrievers as its not licensed

* [CI] Auto commit changes from spotless

* Added integration test and fixed the code style issues

* Fixed merge issues

* Added cluster test feature to the integration tests

* Update docs/changelog/126401.yaml

* Registered retriever plugin

* Enhanced changelog description

* Added validation to the constructor creation

* Introduced validations in the code and incorporated in tests - compiling version

* Included PinnedRankDoc to enhance the explain query, validations for inputs anfd sorting. Fixed the tests after these changes

* Working on improving integration test and introducing cluster features

* Removed cluster test temporarily

* Got pinnedretriever yaml to working state without cluster

* [CI] Auto commit changes from spotless

* Resolved no source yaml error

* Cluster loaded successfully

* [CI] Auto commit changes from spotless

* Fixed integration test

* Made validate sort less strict

* Included shareddoc sorting in the validate sort

* All yaml issues resolved

* Explanation yaml files added

* Trying to add clustering to the test

* [CI] Auto commit changes from spotless

* Removed explicit feature specification

* Deleted the empty file

* Put the node feature in the proper place

* Added additional validation in ids and docs

* Cleaned the create pinned query validation

* made unit tests robust

* Remove query.es from version control

* Remove result.json from version control

* [CI] Auto commit changes from spotless

* Everything except explanation is fixed

* added duplicate doc test

* Applied checkstyle fix, spotless and a failing yaml

* Improvements based on PR comments

* [CI] Auto commit changes from spotless

* Modified the unit test to accomodate the change in createPinnedQuery

* Split the yaml to test for basic and trial, cleanedup and acted on all the comments

* Remove result.json and query.es from version control

* Removed unnecessary comments

* Removed redundant file

* Fixing CI build error

* [CI] Auto commit changes from spotless

* Removed pinnedBy as it wasnt necessary

* Removed unnecessary ToXContent Information

* Fixed transport version charges and cleaned up null checks:
"

* [CI] Auto commit changes from spotless

* Retriever status changed to 9.1 version

* cleaned up 2 yamltestsuite for different licenses

* Trying to get the clustering works

* Cleaned up the yaml clustering and also reorganised the yaml tests

* Unnecessary file introduction removed

* Reverted the plugins to the previous state as the changes werent necessary

* Removed unnecessary transport versioning from pinnedrankdoc

* reverted

* [CI] Auto commit changes from spotless

* Edited the SearchBusinessRules to remove the class from getFeatures

* [CI] Auto commit changes from spotless

* Cleaned up Pinned retriever to allow only id or docs

* Added more test to the pinned retriever

* did spotless

* Introduced new transport versioning

* Cleaning it up

* Resolved validate module error

* BWT issues

* [CI] Auto commit changes from spotless

* fix NPE occuring in ci

* trying to fix duplicate feature issue

* [CI] Auto commit changes from spotless

* modified the tests

* Playing with pinned retriever CI  (#127530)

* Fix compilation error

* Remove SearchPlugin from META-INF

* Remove duplicate FeatureSpecification

* Add service as test resource

* Move to test

* More file moving

* Remove from module-info, remove file

* Make search business rules plugin extensible

* fix ent search plugin

* Delete dup files

* [CI] Auto commit changes from spotless

* Add module info back in

---------

Co-authored-by: elasticsearchmachine <[email protected]>

* top document no pinned

* Removing this to see if it works without this transport version check, as i had made changes related to the cluster error

* Fixed the retriever builder comments and error message

* removed the unnencessary explain

* Fixed all the tests in the yaml file

* added extra test case

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <[email protected]>
Co-authored-by: Kathleen DeRusso <[email protected]>
mridula-s109 added a commit to mridula-s109/elasticsearch that referenced this pull request May 2, 2025
* Created PinnedQueryRetriever Builder

* Added retriever build test file

* Changed the test to accept all the retrievers as its not licensed

* [CI] Auto commit changes from spotless

* Added integration test and fixed the code style issues

* Fixed merge issues

* Added cluster test feature to the integration tests

* Update docs/changelog/126401.yaml

* Registered retriever plugin

* Enhanced changelog description

* Added validation to the constructor creation

* Introduced validations in the code and incorporated in tests - compiling version

* Included PinnedRankDoc to enhance the explain query, validations for inputs anfd sorting. Fixed the tests after these changes

* Working on improving integration test and introducing cluster features

* Removed cluster test temporarily

* Got pinnedretriever yaml to working state without cluster

* [CI] Auto commit changes from spotless

* Resolved no source yaml error

* Cluster loaded successfully

* [CI] Auto commit changes from spotless

* Fixed integration test

* Made validate sort less strict

* Included shareddoc sorting in the validate sort

* All yaml issues resolved

* Explanation yaml files added

* Trying to add clustering to the test

* [CI] Auto commit changes from spotless

* Removed explicit feature specification

* Deleted the empty file

* Put the node feature in the proper place

* Added additional validation in ids and docs

* Cleaned the create pinned query validation

* made unit tests robust

* Remove query.es from version control

* Remove result.json from version control

* [CI] Auto commit changes from spotless

* Everything except explanation is fixed

* added duplicate doc test

* Applied checkstyle fix, spotless and a failing yaml

* Improvements based on PR comments

* [CI] Auto commit changes from spotless

* Modified the unit test to accomodate the change in createPinnedQuery

* Split the yaml to test for basic and trial, cleanedup and acted on all the comments

* Remove result.json and query.es from version control

* Removed unnecessary comments

* Removed redundant file

* Fixing CI build error

* [CI] Auto commit changes from spotless

* Removed pinnedBy as it wasnt necessary

* Removed unnecessary ToXContent Information

* Fixed transport version charges and cleaned up null checks:
"

* [CI] Auto commit changes from spotless

* Retriever status changed to 9.1 version

* cleaned up 2 yamltestsuite for different licenses

* Trying to get the clustering works

* Cleaned up the yaml clustering and also reorganised the yaml tests

* Unnecessary file introduction removed

* Reverted the plugins to the previous state as the changes werent necessary

* Removed unnecessary transport versioning from pinnedrankdoc

* reverted

* [CI] Auto commit changes from spotless

* Edited the SearchBusinessRules to remove the class from getFeatures

* [CI] Auto commit changes from spotless

* Cleaned up Pinned retriever to allow only id or docs

* Added more test to the pinned retriever

* did spotless

* Introduced new transport versioning

* Cleaning it up

* Resolved validate module error

* BWT issues

* [CI] Auto commit changes from spotless

* fix NPE occuring in ci

* trying to fix duplicate feature issue

* [CI] Auto commit changes from spotless

* modified the tests

* Playing with pinned retriever CI  (elastic#127530)

* Fix compilation error

* Remove SearchPlugin from META-INF

* Remove duplicate FeatureSpecification

* Add service as test resource

* Move to test

* More file moving

* Remove from module-info, remove file

* Make search business rules plugin extensible

* fix ent search plugin

* Delete dup files

* [CI] Auto commit changes from spotless

* Add module info back in

---------

Co-authored-by: elasticsearchmachine <[email protected]>

* top document no pinned

* Removing this to see if it works without this transport version check, as i had made changes related to the cluster error

* Fixed the retriever builder comments and error message

* removed the unnencessary explain

* Fixed all the tests in the yaml file

* added extra test case

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <[email protected]>
Co-authored-by: Kathleen DeRusso <[email protected]>
(cherry picked from commit b742b02)

# Conflicts:
#	server/src/main/java/org/elasticsearch/TransportVersions.java
mridula-s109 added a commit that referenced this pull request May 2, 2025
* Pinned retriever (#126401)

* Created PinnedQueryRetriever Builder

* Added retriever build test file

* Changed the test to accept all the retrievers as its not licensed

* [CI] Auto commit changes from spotless

* Added integration test and fixed the code style issues

* Fixed merge issues

* Added cluster test feature to the integration tests

* Update docs/changelog/126401.yaml

* Registered retriever plugin

* Enhanced changelog description

* Added validation to the constructor creation

* Introduced validations in the code and incorporated in tests - compiling version

* Included PinnedRankDoc to enhance the explain query, validations for inputs anfd sorting. Fixed the tests after these changes

* Working on improving integration test and introducing cluster features

* Removed cluster test temporarily

* Got pinnedretriever yaml to working state without cluster

* [CI] Auto commit changes from spotless

* Resolved no source yaml error

* Cluster loaded successfully

* [CI] Auto commit changes from spotless

* Fixed integration test

* Made validate sort less strict

* Included shareddoc sorting in the validate sort

* All yaml issues resolved

* Explanation yaml files added

* Trying to add clustering to the test

* [CI] Auto commit changes from spotless

* Removed explicit feature specification

* Deleted the empty file

* Put the node feature in the proper place

* Added additional validation in ids and docs

* Cleaned the create pinned query validation

* made unit tests robust

* Remove query.es from version control

* Remove result.json from version control

* [CI] Auto commit changes from spotless

* Everything except explanation is fixed

* added duplicate doc test

* Applied checkstyle fix, spotless and a failing yaml

* Improvements based on PR comments

* [CI] Auto commit changes from spotless

* Modified the unit test to accomodate the change in createPinnedQuery

* Split the yaml to test for basic and trial, cleanedup and acted on all the comments

* Remove result.json and query.es from version control

* Removed unnecessary comments

* Removed redundant file

* Fixing CI build error

* [CI] Auto commit changes from spotless

* Removed pinnedBy as it wasnt necessary

* Removed unnecessary ToXContent Information

* Fixed transport version charges and cleaned up null checks:
"

* [CI] Auto commit changes from spotless

* Retriever status changed to 9.1 version

* cleaned up 2 yamltestsuite for different licenses

* Trying to get the clustering works

* Cleaned up the yaml clustering and also reorganised the yaml tests

* Unnecessary file introduction removed

* Reverted the plugins to the previous state as the changes werent necessary

* Removed unnecessary transport versioning from pinnedrankdoc

* reverted

* [CI] Auto commit changes from spotless

* Edited the SearchBusinessRules to remove the class from getFeatures

* [CI] Auto commit changes from spotless

* Cleaned up Pinned retriever to allow only id or docs

* Added more test to the pinned retriever

* did spotless

* Introduced new transport versioning

* Cleaning it up

* Resolved validate module error

* BWT issues

* [CI] Auto commit changes from spotless

* fix NPE occuring in ci

* trying to fix duplicate feature issue

* [CI] Auto commit changes from spotless

* modified the tests

* Playing with pinned retriever CI  (#127530)

* Fix compilation error

* Remove SearchPlugin from META-INF

* Remove duplicate FeatureSpecification

* Add service as test resource

* Move to test

* More file moving

* Remove from module-info, remove file

* Make search business rules plugin extensible

* fix ent search plugin

* Delete dup files

* [CI] Auto commit changes from spotless

* Add module info back in

---------

Co-authored-by: elasticsearchmachine <[email protected]>

* top document no pinned

* Removing this to see if it works without this transport version check, as i had made changes related to the cluster error

* Fixed the retriever builder comments and error message

* removed the unnencessary explain

* Fixed all the tests in the yaml file

* added extra test case

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <[email protected]>
Co-authored-by: Kathleen DeRusso <[email protected]>
(cherry picked from commit b742b02)

# Conflicts:
#	server/src/main/java/org/elasticsearch/TransportVersions.java

* Fixed the compile issue

* changed pinned retriever name
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs:triage Requires assignment of a team area label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants