resolve conflict of git rebase

Author: norah-li

data/semantickernel-data-oracle/src/main/java/com/microsoft/semantickernel/data/jdbc/oracle/OracleVectorStoreQueryProvider.java

@@ -45,6 +45,7 @@
 import java.sql.SQLException;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -328,6 +329,25 @@ private void setUpsertStatementValues(PreparedStatement upsertStatement, Object
                 // Some field types require special treatment to convert the java type to the
                 // DB type
                 if (field instanceof VectorStoreRecordVectorField) {
+
+                    // Convert the vector field to a string
+                    if (field.getFieldType().equals(String.class)) {
+                        String json = (valueNode == null || valueNode.isNull())
+                            ? null
+                            : valueNode.asText();
+                        double[] values = (json == null)
+                            ? null
+                            : objectMapper.readValue(json, double[].class);
+
+                        int dim = ((VectorStoreRecordVectorField) field).getDimensions();
+                        if (values != null && values.length != dim) {
+                            throw new SKException("Vector dimension mismatch: expected " + dim);
+                        }
+
+                        upsertStatement.setObject(i + 1, values, OracleTypes.VECTOR_FLOAT32);
+                        continue;
+                    }
+
                     // If the vector field is not set as a string convert to an array of doubles
                     // and set the value
                     if (!field.getFieldType().equals(String.class)) {
@@ -336,6 +356,7 @@ private void setUpsertStatementValues(PreparedStatement upsertStatement, Object
                             : StreamSupport.stream((
                                 (ArrayNode)valueNode).spliterator(), false)
                                 .mapToDouble(d -> d.asDouble()).toArray();
+
                         upsertStatement.setObject(i + 1, values, OracleTypes.VECTOR_FLOAT32);
                         continue;
                     }

data/semantickernel-data-oracle/src/main/java/com/microsoft/semantickernel/data/jdbc/oracle/OracleVectorStoreRecordMapper.java

@@ -6,6 +6,7 @@
  */
 package com.microsoft.semantickernel.data.jdbc.oracle;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -210,6 +211,17 @@ public OracleVectorStoreRecordMapper<Record> build() {
                         }
                         if (options != null && options.isIncludeVectors()) {
                             for (VectorStoreRecordVectorField field : vectorStoreRecordDefinition.getVectorFields()) {
+
+                                // String vector
+                                if (field.getFieldType().equals(String.class)) {
+                                    float[] arr = resultSet.getObject(field.getEffectiveStorageName(), float[].class);
+                                    String str = (arr == null)
+                                        ? null
+                                        : objectMapper.writeValueAsString(arr);
+                                    objectNode.put(field.getEffectiveStorageName(), str);
+                                    continue;
+                                }
+
                                 Object value = resultSet.getObject(field.getEffectiveStorageName(), float[].class);
                                 JsonNode genericNode = objectMapper.valueToTree(value);
                                 objectNode.set(field.getEffectiveStorageName(), genericNode);
@@ -227,6 +239,8 @@ public OracleVectorStoreRecordMapper<Record> build() {
                         throw new SKException(
                             "Failure to serialize object, by default the JDBC connector uses Jackson, ensure your model object can be serialized by Jackson, i.e the class is visible, has getters, constructor, annotations etc.",
                             e);
+                    } catch (JsonProcessingException e) {
+                      throw new RuntimeException(e);
                     }
                 });
         }