Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,12 @@ public GenericTable createGenericTable(
"polaris/v1/{cat}/namespaces/{ns}/generic-tables/",
Map.of("cat", catalog, "ns", ns))
.post(
Entity.json(new CreateGenericTableRequest(id.name(), format, "doc", properties)))) {
Entity.json(
CreateGenericTableRequest.builder()
.setName(id.name())
.setFormat(format)
.setDoc("doc")
.setProperties(properties)))) {
return res.readEntity(LoadGenericTableResponse.class).getTable();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.apache.iceberg.util.PropertyUtil;
import org.apache.polaris.core.rest.PolarisEndpoints;
import org.apache.polaris.core.rest.PolarisResourcePaths;
import org.apache.polaris.service.types.CreateGenericTableRequest;
import org.apache.polaris.service.types.GenericTable;
import org.apache.polaris.spark.rest.CreateGenericTableRESTRequest;
import org.apache.polaris.spark.rest.LoadGenericTableRESTResponse;
Expand Down Expand Up @@ -202,7 +203,13 @@ public GenericTable createGenericTable(
TableIdentifier identifier, String format, String doc, Map<String, String> props) {
Endpoint.check(endpoints, PolarisEndpoints.V1_CREATE_GENERIC_TABLE);
CreateGenericTableRESTRequest request =
new CreateGenericTableRESTRequest(identifier.name(), format, doc, props);
new CreateGenericTableRESTRequest(
CreateGenericTableRequest.builder()
.setName(identifier.name())
.setFormat(format)
.setDoc(doc)
.setProperties(props)
.build());

LoadGenericTableRESTResponse response =
restClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ public CreateGenericTableRESTRequest(
super(name, format, doc, properties);
}

public CreateGenericTableRESTRequest(CreateGenericTableRequest request) {
this(request.getName(), request.getFormat(), request.getDoc(), request.getProperties());
}

@Override
public void validate() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.apache.iceberg.catalog.Namespace;
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.rest.RESTSerializers;
import org.apache.polaris.service.types.CreateGenericTableRequest;
import org.apache.polaris.service.types.GenericTable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -90,7 +91,13 @@ public void testLoadGenericTableRESTResponse(String doc, Map<String, String> pro
public void testCreateGenericTableRESTRequest(String doc, Map<String, String> properties)
throws JsonProcessingException {
CreateGenericTableRESTRequest request =
new CreateGenericTableRESTRequest("test-table", "delta", doc, properties);
new CreateGenericTableRESTRequest(
CreateGenericTableRequest.builder()
.setName("test-table")
.setFormat("delta")
.setDoc(doc)
.setProperties(properties)
.build());
String json = mapper.writeValueAsString(request);
CreateGenericTableRESTRequest deserializedRequest =
mapper.readValue(json, CreateGenericTableRESTRequest.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ public LoadGenericTableResponse createGenericTable(
GenericTableEntity createdEntity =
this.genericTableCatalog.createGenericTable(identifier, format, doc, properties);
GenericTable createdTable =
new GenericTable(
createdEntity.getName(),
createdEntity.getFormat(),
createdEntity.getDoc(),
createdEntity.getPropertiesAsMap());
GenericTable.builder()
.setName(createdEntity.getName())
.setFormat(createdEntity.getFormat())
.setDoc(createdEntity.getDoc())
.setProperties(createdEntity.getPropertiesAsMap())
.build();

return LoadGenericTableResponse.builder().setTable(createdTable).build();
}
Expand All @@ -97,11 +98,12 @@ public LoadGenericTableResponse loadGenericTable(TableIdentifier identifier) {

GenericTableEntity loadedEntity = this.genericTableCatalog.loadGenericTable(identifier);
GenericTable loadedTable =
new GenericTable(
loadedEntity.getName(),
loadedEntity.getFormat(),
loadedEntity.getDoc(),
loadedEntity.getPropertiesAsMap());
GenericTable.builder()
.setName(loadedEntity.getName())
.setFormat(loadedEntity.getFormat())
.setDoc(loadedEntity.getDoc())
.setProperties(loadedEntity.getPropertiesAsMap())
.build();

return LoadGenericTableResponse.builder().setTable(loadedTable).build();
}
Expand Down