address review comments

yanghua · yanghua · commit 0a76dc27481c · 2025-04-21T21:45:33.000+08:00
diff --git a/java/lance-catalog-apache-client/api/openapi.yaml b/java/lance-catalog-apache-client/api/openapi.yaml
@@ -477,10 +477,15 @@ components:
       description: |
         Result used when a table is successfully loaded.
       example:
+        location: location
         properties:
           key: properties
       properties:
+        location:
+          type: string
         properties:
           additionalProperties:
             type: string
+      required:
+      - location
 
diff --git a/java/lance-catalog-apache-client/docs/GetTableResponse.md b/java/lance-catalog-apache-client/docs/GetTableResponse.md
@@ -8,6 +8,7 @@ Result used when a table is successfully loaded.
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
+|**location** | **String** |  |  |
 |**properties** | **Map&lt;String, String&gt;** |  |  [optional] |
 
 
diff --git a/java/lance-catalog-apache-client/src/main/java/com/lancedb/lance/catalog/client/apache/model/GetTableResponse.java b/java/lance-catalog-apache-client/src/main/java/com/lancedb/lance/catalog/client/apache/model/GetTableResponse.java
@@ -25,16 +25,46 @@
 import java.util.StringJoiner;
 
 /** Result used when a table is successfully loaded. */
-@JsonPropertyOrder({GetTableResponse.JSON_PROPERTY_PROPERTIES})
+@JsonPropertyOrder({
+  GetTableResponse.JSON_PROPERTY_LOCATION,
+  GetTableResponse.JSON_PROPERTY_PROPERTIES
+})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
     comments = "Generator version: 7.12.0")
 public class GetTableResponse {
+  public static final String JSON_PROPERTY_LOCATION = "location";
+  @javax.annotation.Nonnull private String location;
+
   public static final String JSON_PROPERTY_PROPERTIES = "properties";
   @javax.annotation.Nullable private Map<String, String> properties = new HashMap<>();
 
   public GetTableResponse() {}
 
+  public GetTableResponse location(@javax.annotation.Nonnull String location) {
+
+    this.location = location;
+    return this;
+  }
+
+  /**
+   * Get location
+   *
+   * @return location
+   */
+  @javax.annotation.Nonnull
+  @JsonProperty(JSON_PROPERTY_LOCATION)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getLocation() {
+    return location;
+  }
+
+  @JsonProperty(JSON_PROPERTY_LOCATION)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public void setLocation(@javax.annotation.Nonnull String location) {
+    this.location = location;
+  }
+
   public GetTableResponse properties(@javax.annotation.Nullable Map<String, String> properties) {
 
     this.properties = properties;
@@ -76,18 +106,20 @@ public boolean equals(Object o) {
       return false;
     }
     GetTableResponse getTableResponse = (GetTableResponse) o;
-    return Objects.equals(this.properties, getTableResponse.properties);
+    return Objects.equals(this.location, getTableResponse.location)
+        && Objects.equals(this.properties, getTableResponse.properties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(properties);
+    return Objects.hash(location, properties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class GetTableResponse {\n");
+    sb.append("    location: ").append(toIndentedString(location)).append("\n");
     sb.append("    properties: ").append(toIndentedString(properties)).append("\n");
     sb.append("}");
     return sb.toString();
@@ -135,6 +167,22 @@ public String toUrlQueryString(String prefix) {
 
     StringJoiner joiner = new StringJoiner("&");
 
+    // add `location` to the URL query string
+    if (getLocation() != null) {
+      try {
+        joiner.add(
+            String.format(
+                "%slocation%s=%s",
+                prefix,
+                suffix,
+                URLEncoder.encode(String.valueOf(getLocation()), "UTF-8")
+                    .replaceAll("\\+", "%20")));
+      } catch (UnsupportedEncodingException e) {
+        // Should never happen, UTF-8 is always supported
+        throw new RuntimeException(e);
+      }
+    }
+
     // add `properties` to the URL query string
     if (getProperties() != null) {
       for (String _key : getProperties().keySet()) {
diff --git a/java/lance-catalog-springboot-server/src/main/java/com/lancedb/lance/catalog/server/springboot/api/NamespaceApi.java b/java/lance-catalog-springboot-server/src/main/java/com/lancedb/lance/catalog/server/springboot/api/NamespaceApi.java
@@ -592,7 +592,8 @@ default ResponseEntity<GetTableResponse> getTable(
             request -> {
               for (MediaType mediaType : MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
-                  String exampleString = "{ \"properties\" : { \"key\" : \"properties\" } }";
+                  String exampleString =
+                      "{ \"location\" : \"location\", \"properties\" : { \"key\" : \"properties\" } }";
                   ApiUtil.setExampleResponse(request, "application/json", exampleString);
                   break;
                 }
diff --git a/java/lance-catalog-springboot-server/src/main/java/com/lancedb/lance/catalog/server/springboot/model/GetTableResponse.java b/java/lance-catalog-springboot-server/src/main/java/com/lancedb/lance/catalog/server/springboot/model/GetTableResponse.java
@@ -34,8 +34,40 @@
     comments = "Generator version: 7.12.0")
 public class GetTableResponse {
 
+  private String location;
+
   @Valid private Map<String, String> properties = new HashMap<>();
 
+  public GetTableResponse() {
+    super();
+  }
+
+  /** Constructor with only required parameters */
+  public GetTableResponse(String location) {
+    this.location = location;
+  }
+
+  public GetTableResponse location(String location) {
+    this.location = location;
+    return this;
+  }
+
+  /**
+   * Get location
+   *
+   * @return location
+   */
+  @NotNull
+  @Schema(name = "location", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("location")
+  public String getLocation() {
+    return location;
+  }
+
+  public void setLocation(String location) {
+    this.location = location;
+  }
+
   public GetTableResponse properties(Map<String, String> properties) {
     this.properties = properties;
     return this;
@@ -73,18 +105,20 @@ public boolean equals(Object o) {
       return false;
     }
     GetTableResponse getTableResponse = (GetTableResponse) o;
-    return Objects.equals(this.properties, getTableResponse.properties);
+    return Objects.equals(this.location, getTableResponse.location)
+        && Objects.equals(this.properties, getTableResponse.properties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(properties);
+    return Objects.hash(location, properties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class GetTableResponse {\n");
+    sb.append("    location: ").append(toIndentedString(location)).append("\n");
     sb.append("    properties: ").append(toIndentedString(properties)).append("\n");
     sb.append("}");
     return sb.toString();
diff --git a/rust/lance-catalog-reqwest-client/docs/GetTableResponse.md b/rust/lance-catalog-reqwest-client/docs/GetTableResponse.md
@@ -4,6 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**location** | **String** |  | 
 **properties** | Option<**std::collections::HashMap<String, String>**> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/rust/lance-catalog-reqwest-client/src/models/get_table_response.rs b/rust/lance-catalog-reqwest-client/src/models/get_table_response.rs
@@ -14,14 +14,17 @@ use serde::{Deserialize, Serialize};
 /// GetTableResponse : Result used when a table is successfully loaded. 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct GetTableResponse {
+    #[serde(rename = "location")]
+    pub location: String,
     #[serde(rename = "properties", skip_serializing_if = "Option::is_none")]
     pub properties: Option<std::collections::HashMap<String, String>>,
 }
 
 impl GetTableResponse {
     /// Result used when a table is successfully loaded. 
-    pub fn new() -> GetTableResponse {
+    pub fn new(location: String) -> GetTableResponse {
         GetTableResponse {
+            location,
             properties: None,
         }
     }
diff --git a/spec/catalog.yaml b/spec/catalog.yaml
@@ -310,8 +310,10 @@ components:
         Result used when a table is successfully loaded.
       type: object
       required:
-        - metadata
+        - location
       properties:
+        location:
+          type: string
         properties:
           type: object
           additionalProperties:

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,17 @@ use serde::{Deserialize, Serialize};`
`14`	`14`	`/// GetTableResponse : Result used when a table is successfully loaded.`
`15`	`15`	`#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]`
`16`	`16`	`pub struct GetTableResponse {`
	`17`	`+ #[serde(rename = "location")]`
	`18`	`+ pub location: String,`
`17`	`19`	`#[serde(rename = "properties", skip_serializing_if = "Option::is_none")]`
`18`	`20`	`pub properties: Option<std::collections::HashMap<String, String>>,`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`impl GetTableResponse {`
`22`	`24`	`/// Result used when a table is successfully loaded.`
`23`		`- pub fn new() -> GetTableResponse {`
	`25`	`+ pub fn new(location: String) -> GetTableResponse {`
`24`	`26`	`GetTableResponse {`
	`27`	`+ location,`
`25`	`28`	`properties: None,`
`26`	`29`	`}`
`27`	`30`	`}`