fix IT

Signed-off-by: Peng Huo <[email protected]>
opensearch-project · Jun 28, 2024 · 1ee02fd · 1ee02fd
1 parent 514d51a
commit 1ee02fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/flint-core/src/main/scala/org/opensearch/flint/core/storage/FlintOpenSearchClient.java b/flint-core/src/main/scala/org/opensearch/flint/core/storage/FlintOpenSearchClient.java
@@ -64,7 +64,7 @@ public class FlintOpenSearchClient implements FlintClient {
       Set.of(' ', ',', ':', '"', '+', '/', '\\', '|', '?', '#', '>', '<');
 
   private final static Function<String, String> SHARD_ID_PREFERENCE =
-      shardId -> "_shards:"+shardId;
+      shardId -> shardId == null ? shardId : "_shards:"+shardId;
 
   private final FlintOptions options;
 

diff --git a/flint-spark-integration/src/main/scala/org/apache/spark/opensearch/table/PartitionInfo.scala b/flint-spark-integration/src/main/scala/org/apache/spark/opensearch/table/PartitionInfo.scala
@@ -26,9 +26,12 @@ object PartitionInfo {
   /**
    * Creates a PartitionInfo instance.
    *
-   * @param partitionName The name of the partition.
-   * @param settings The settings of the partition.
-   * @return An instance of PartitionInfo.
+   * @param partitionName
+   *   The name of the partition.
+   * @param settings
+   *   The settings of the partition.
+   * @return
+   *   An instance of PartitionInfo.
    */
   def apply(partitionName: String, settings: String): PartitionInfo = {
     val shards =
@@ -39,8 +42,10 @@ object PartitionInfo {
   /**
    * Extracts the number of shards from the settings string.
    *
-   * @param settingStr The settings string.
-   * @return The number of shards.
+   * @param settingStr
+   *   The settings string.
+   * @return
+   *   The number of shards.
    */
   def numberOfShards(settingStr: String): Int = {
     val setting = JsonMethods.parse(settingStr)