HHH-19284 : Refactor - Extract duplicated vector distance function registration

[0xC0FFE2]

Extracted duplicated vector distance function registration code into a helper method to improve code clarity and maintenance.

https://hibernate.atlassian.net/browse/HHH-19284

---

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

---

[hibernate-github-bot]

Thanks for your pull request!

This pull request appears to follow the contribution rules.

› This message was automatically generated.

[yrodiere]

Hello @0xC0FFE2 ,

Thanks for your contribution.

While I agree your code is a slight improvement, I want to stress that refactoring for the sake of it is not something the whole Hibernate team sees with a good eye, especially if it's just some very localized problem: the cost of doing that refactoring and reviewing it often outweighs the benefits.

I'm ready to merge this, but:

1. If you are looking for ways to contribute to Hibernate, please have a look at the good first issues.
2. Please rebase your branch on the main branch to remove the "merge commit" -- we don't allow those.

[gavinking]

I'm ready to merge this

I for one would not merge this, not unless a similar change is done in the VectorContributors for the other dialects. As it is, this introduces an inconsistency between the dialects.

[0xC0FFE2]

Hello , @yrodiere @gavinking

I apologize for the inconsistency in my initial PR. Per the reviewers' feedback, I've now refactored all FunctionContributor classes to ensure consistency

• MariaDBFunctionContributor - kept as initially refactored
• OracleVectorFunctionContributor - refactored
• PGVectorFunctionContributor - refactored

For the other VectorContributor classes, I've decided to keep them in their current state as they are already concise and clearly structured. Applying similar refactoring would actually increase code length and complexity without significant benefits.

I've also rebased my branch on the main branch to remove the merge commit as requested.

Thank you for your detailed feedback.

[yrodiere]

Thank you. Please don't use spaces for indentation though -- not because one or the other is better, but for consistency with the rest of the codebase.

See:

https://github.com/hibernate/hibernate-orm/blob/main/CONTRIBUTING.md#getting-started
https://hibernate.org/community/contribute/intellij-idea/

[0xC0FFE2]

@yrodiere

Thank you for pointing this out.

I've updated the code to use tabs instead of spaces for indentation to match the project's coding style.

I'll make sure to follow the contribution guidelines more carefully in the futurre
thanks.

[yrodiere]

LGTM, thanks for the cleanup.

Though as I said above... next time you want to contribute, please consider having a look at the good first issues instead :)

[0xC0FFE2]

thanks.

[yrodiere]

Looks like format checks are still failing? Probably some trailing tabs/spaces at the end of lines, or missing line break at the end of a file? See below.

I think just running a build locally should automatically fix your format issues: ./gradlew build -x test

> The following files had format violations:
      src/main/java/org/hibernate/vector/MariaDBFunctionContributor.java
          @@ -25,19 +25,19 @@
           \t\t\tfinal·TypeConfiguration·typeConfiguration·=·functionContributions.getTypeConfiguration();
           \t\t\tfinal·BasicTypeRegistry·basicTypeRegistry·=·typeConfiguration.getBasicTypeRegistry();
           \t\t\tfinal·BasicType<Double>·doubleType·=·basicTypeRegistry.resolve(StandardBasicTypes.DOUBLE);
          -\t\t\t
          +
           \t\t\tregisterVectorDistanceFunction(functionRegistry,·"cosine_distance",·"vec_distance_cosine",·doubleType);
           \t\t\tregisterVectorDistanceFunction(functionRegistry,·"euclidean_distance",·"vec_distance_euclidean",·doubleType);
           \t\t\tfunctionRegistry.registerAlternateKey("l2_distance",·"euclidean_distance");
           \t\t}
           \t}
          -\t
          +
           \tprivate·void·registerVectorDistanceFunction(
           \t\t\tSqmFunctionRegistry·functionRegistry,
           \t\t\tString·functionName,
           \t\t\tString·templatePattern,
           \t\t\tBasicType<Double>·returnType)·{
          -\t\t
          +
           \t\tfunctionRegistry.patternDescriptorBuilder(functionName,·templatePattern·+·"(?1,?2)")
           \t\t\t\t.setArgumentsValidator(StandardArgumentsValidators.composite(
           \t\t\t\t\t\tStandardArgumentsValidators.exactly(2),
          @@ -52,4 +52,4 @@
           \tpublic·int·ordinal()·{
           \t\treturn·200;
           \t}
          -}
          +}
      src/main/java/org/hibernate/vector/OracleVectorFunctionContributor.java
          @@ -80,4 +80,4 @@
           \tpublic·int·ordinal()·{
           \t\treturn·200;
           \t}
          -}
          +}
      src/main/java/org/hibernate/vector/PGVectorFunctionContributor.java
          @@ -38,7 +38,7 @@
           
           \t\t\tregisterVectorDistanceFunction(functionRegistry,·"negative_inner_product",·"?1<#>?2",·doubleType);
           \t\t\tregisterVectorDistanceFunction(functionRegistry,·"inner_product",·"(?1<#>?2)*-1",·doubleType);
          -\t\t\t
          +
           \t\t\tregisterNamedVectorFunction(functionRegistry,·"vector_dims",·integerType,·1);
           \t\t\tregisterNamedVectorFunction(functionRegistry,·"vector_norm",·doubleType,·1);
           \t\t}
          @@ -80,4 +80,4 @@
           \tpublic·int·ordinal()·{
           \t\treturn·200;

[0xC0FFE2]

@yrodiere

I ran ./gradlew build -x test as you suggested.

Thanks and sorry for the format error.