Combine fetching and validation of the doc vectors.

Author: jtibshirani

x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/query/ScoreScriptUtils.java

@@ -90,10 +90,9 @@ BytesRef getEncodedVector() {
             } catch (IOException e) {
                 throw ExceptionsHelper.convertToElastic(e);
             }
-            return docValues.getEncodedValue();
-        }
 
-        void validateDocVector(BytesRef vector) {
+            // Validate the encoded vector's length.
+            BytesRef vector = docValues.getEncodedValue();
             if (vector == null) {
                 throw new IllegalArgumentException("A document doesn't have a value for a vector field!");
             }
@@ -103,6 +102,7 @@ void validateDocVector(BytesRef vector) {
                 throw new IllegalArgumentException("The query vector has a different number of dimensions [" +
                     queryVector.length + "] than the document vectors [" + vectorLength + "].");
             }
+            return vector;
         }
     }
 
@@ -115,7 +115,6 @@ public L1Norm(ScoreScript scoreScript, List<Number> queryVector, Object field) {
 
         public double l1norm() {
             BytesRef vector = getEncodedVector();
-            validateDocVector(vector);
             ByteBuffer byteBuffer = ByteBuffer.wrap(vector.bytes, vector.offset, vector.length);
 
             double l1norm = 0;
@@ -136,7 +135,6 @@ public L2Norm(ScoreScript scoreScript, List<Number> queryVector, Object field) {
 
         public double l2norm() {
             BytesRef vector = getEncodedVector();
-            validateDocVector(vector);
             ByteBuffer byteBuffer = ByteBuffer.wrap(vector.bytes, vector.offset, vector.length);
 
             double l2norm = 0;
@@ -157,7 +155,6 @@ public DotProduct(ScoreScript scoreScript, List<Number> queryVector, Object fiel
 
         public double dotProduct() {
             BytesRef vector = getEncodedVector();
-            validateDocVector(vector);
             ByteBuffer byteBuffer = ByteBuffer.wrap(vector.bytes, vector.offset, vector.length);
 
             double dotProduct = 0;
@@ -177,7 +174,6 @@ public CosineSimilarity(ScoreScript scoreScript, List<Number> queryVector, Objec
 
         public double cosineSimilarity() {
             BytesRef vector = getEncodedVector();
-            validateDocVector(vector);
             ByteBuffer byteBuffer = ByteBuffer.wrap(vector.bytes, vector.offset, vector.length);
 
             double dotProduct = 0.0;
@@ -251,13 +247,12 @@ BytesRef getEncodedVector() {
             } catch (IOException e) {
                 throw ExceptionsHelper.convertToElastic(e);
             }
-            return docValues.getEncodedValue();
-        }
 
-        public void validateDocVector(BytesRef vector) {
+            BytesRef vector = docValues.getEncodedValue();
             if (vector == null) {
                 throw new IllegalArgumentException("A document doesn't have a value for a vector field!");
             }
+            return vector;
         }
     }
 
@@ -269,10 +264,9 @@ public L1NormSparse(ScoreScript scoreScript,Map<String, Number> queryVector, Obj
 
         public double l1normSparse() {
             BytesRef vector = getEncodedVector();
-            validateDocVector(vector);
-
             int[] docDims = VectorEncoderDecoder.decodeSparseVectorDims(scoreScript._getIndexVersion(), vector);
             float[] docValues = VectorEncoderDecoder.decodeSparseVector(scoreScript._getIndexVersion(), vector);
+
             int queryIndex = 0;
             int docIndex = 0;
             double l1norm = 0;
@@ -309,10 +303,9 @@ public L2NormSparse(ScoreScript scoreScript, Map<String, Number> queryVector, Ob
 
         public double l2normSparse() {
             BytesRef vector = getEncodedVector();
-            validateDocVector(vector);
-
             int[] docDims = VectorEncoderDecoder.decodeSparseVectorDims(scoreScript._getIndexVersion(), vector);
             float[] docValues = VectorEncoderDecoder.decodeSparseVector(scoreScript._getIndexVersion(), vector);
+
             int queryIndex = 0;
             int docIndex = 0;
             double l2norm = 0;
@@ -352,10 +345,9 @@ public DotProductSparse(ScoreScript scoreScript, Map<String, Number> queryVector
 
         public double dotProductSparse() {
             BytesRef vector = getEncodedVector();
-            validateDocVector(vector);
-
             int[] docDims = VectorEncoderDecoder.decodeSparseVectorDims(scoreScript._getIndexVersion(), vector);
             float[] docValues = VectorEncoderDecoder.decodeSparseVector(scoreScript._getIndexVersion(), vector);
+
             return intDotProductSparse(queryValues, queryDims, docValues, docDims);
         }
     }
@@ -375,8 +367,6 @@ public CosineSimilaritySparse(ScoreScript scoreScript, Map<String, Number> query
 
         public double cosineSimilaritySparse() {
             BytesRef vector = getEncodedVector();
-            validateDocVector(vector);
-
             int[] docDims = VectorEncoderDecoder.decodeSparseVectorDims(scoreScript._getIndexVersion(), vector);
             float[] docValues = VectorEncoderDecoder.decodeSparseVector(scoreScript._getIndexVersion(), vector);