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
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ lance-io = { version = "=12.0.0-beta.5", path = "./rust/lance-io", default-featu
lance-linalg = { version = "=12.0.0-beta.5", path = "./rust/lance-linalg" }
lance-namespace = { version = "=12.0.0-beta.5", path = "./rust/lance-namespace" }
lance-namespace-impls = { version = "=12.0.0-beta.5", path = "./rust/lance-namespace-impls" }
lance-namespace-reqwest-client = "0.11.0"
lance-namespace-reqwest-client = "0.11.1"
lance-select = { version = "=12.0.0-beta.5", path = "./rust/lance-select" }
lance-tokenizer = { version = "=12.0.0-beta.5", path = "./rust/lance-tokenizer" }
lance-table = { version = "=12.0.0-beta.5", path = "./rust/lance-table" }
Expand Down
4 changes: 2 additions & 2 deletions java/lance-jni/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@
<dependency>
<groupId>org.lance</groupId>
<artifactId>lance-namespace-core</artifactId>
<version>0.7.7</version>
<version>0.11.1</version>
</dependency>
<dependency>
<groupId>org.lance</groupId>
<artifactId>lance-namespace-apache-client</artifactId>
<version>0.7.7</version>
<version>0.11.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
22 changes: 16 additions & 6 deletions java/src/main/java/org/lance/namespace/DirectoryNamespace.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.lance.namespace.model.BatchDeleteTableVersionsRequest;
import org.lance.namespace.model.BatchDeleteTableVersionsResponse;
import org.lance.namespace.model.CountTableRowsRequest;
import org.lance.namespace.model.CountTableRowsResponse;
import org.lance.namespace.model.CreateMaterializedViewRequest;
import org.lance.namespace.model.CreateMaterializedViewResponse;
import org.lance.namespace.model.CreateNamespaceRequest;
Expand Down Expand Up @@ -83,14 +84,17 @@
import org.lance.namespace.model.MergeInsertIntoTableRequest;
import org.lance.namespace.model.MergeInsertIntoTableResponse;
import org.lance.namespace.model.NamespaceExistsRequest;
import org.lance.namespace.model.NamespaceExistsResponse;
import org.lance.namespace.model.QueryTableRequest;
import org.lance.namespace.model.QueryTableResponse;
import org.lance.namespace.model.RegisterTableRequest;
import org.lance.namespace.model.RegisterTableResponse;
import org.lance.namespace.model.RenameTableRequest;
import org.lance.namespace.model.RenameTableResponse;
import org.lance.namespace.model.RestoreTableRequest;
import org.lance.namespace.model.RestoreTableResponse;
import org.lance.namespace.model.TableExistsRequest;
import org.lance.namespace.model.TableExistsResponse;
import org.lance.namespace.model.UpdateTableRequest;
import org.lance.namespace.model.UpdateTableResponse;
import org.lance.namespace.model.UpdateTableSchemaMetadataRequest;
Expand All @@ -101,6 +105,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.apache.arrow.memory.BufferAllocator;

import java.io.Closeable;
Expand Down Expand Up @@ -239,6 +244,7 @@ public class DirectoryNamespace implements LanceNamespace, Closeable {

private static ObjectMapper createObjectMapper() {
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new JavaTimeModule());
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
return mapper;
}
Expand Down Expand Up @@ -329,10 +335,11 @@ public DropNamespaceResponse dropNamespace(DropNamespaceRequest request) {
}

@Override
public void namespaceExists(NamespaceExistsRequest request) {
public NamespaceExistsResponse namespaceExists(NamespaceExistsRequest request) {
ensureInitialized();
String requestJson = toJson(request);
namespaceExistsNative(nativeDirectoryNamespaceHandle, requestJson);
return new NamespaceExistsResponse();
}

@Override
Expand Down Expand Up @@ -360,10 +367,11 @@ public RegisterTableResponse registerTable(RegisterTableRequest request) {
}

@Override
public void tableExists(TableExistsRequest request) {
public TableExistsResponse tableExists(TableExistsRequest request) {
ensureInitialized();
String requestJson = toJson(request);
tableExistsNative(nativeDirectoryNamespaceHandle, requestJson);
return new TableExistsResponse();
}

@Override
Expand All @@ -383,10 +391,11 @@ public DeregisterTableResponse deregisterTable(DeregisterTableRequest request) {
}

@Override
public Long countTableRows(CountTableRowsRequest request) {
public CountTableRowsResponse countTableRows(CountTableRowsRequest request) {
ensureInitialized();
String requestJson = toJson(request);
return countTableRowsNative(nativeDirectoryNamespaceHandle, requestJson);
Long count = countTableRowsNative(nativeDirectoryNamespaceHandle, requestJson);
return new CountTableRowsResponse().count(count);
}

@Override
Expand Down Expand Up @@ -451,10 +460,11 @@ public DeleteFromTableResponse deleteFromTable(DeleteFromTableRequest request) {
}

@Override
public byte[] queryTable(QueryTableRequest request) {
public QueryTableResponse queryTable(QueryTableRequest request) {
ensureInitialized();
String requestJson = toJson(request);
return queryTableNative(nativeDirectoryNamespaceHandle, requestJson);
byte[] data = queryTableNative(nativeDirectoryNamespaceHandle, requestJson);
return new QueryTableResponse().data(data);
}

@Override
Expand Down
24 changes: 17 additions & 7 deletions java/src/main/java/org/lance/namespace/RestNamespace.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.lance.namespace.model.BatchDeleteTableVersionsRequest;
import org.lance.namespace.model.BatchDeleteTableVersionsResponse;
import org.lance.namespace.model.CountTableRowsRequest;
import org.lance.namespace.model.CountTableRowsResponse;
import org.lance.namespace.model.CreateMaterializedViewRequest;
import org.lance.namespace.model.CreateMaterializedViewResponse;
import org.lance.namespace.model.CreateNamespaceRequest;
Expand Down Expand Up @@ -83,14 +84,17 @@
import org.lance.namespace.model.MergeInsertIntoTableRequest;
import org.lance.namespace.model.MergeInsertIntoTableResponse;
import org.lance.namespace.model.NamespaceExistsRequest;
import org.lance.namespace.model.NamespaceExistsResponse;
import org.lance.namespace.model.QueryTableRequest;
import org.lance.namespace.model.QueryTableResponse;
import org.lance.namespace.model.RegisterTableRequest;
import org.lance.namespace.model.RegisterTableResponse;
import org.lance.namespace.model.RenameTableRequest;
import org.lance.namespace.model.RenameTableResponse;
import org.lance.namespace.model.RestoreTableRequest;
import org.lance.namespace.model.RestoreTableResponse;
import org.lance.namespace.model.TableExistsRequest;
import org.lance.namespace.model.TableExistsResponse;
import org.lance.namespace.model.UpdateTableRequest;
import org.lance.namespace.model.UpdateTableResponse;
import org.lance.namespace.model.UpdateTableSchemaMetadataRequest;
Expand All @@ -100,6 +104,7 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.apache.arrow.memory.BufferAllocator;

import java.io.Closeable;
Expand Down Expand Up @@ -149,7 +154,8 @@ public class RestNamespace implements LanceNamespace, Closeable {
JniLoader.ensureLoaded();
}

private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private static final ObjectMapper OBJECT_MAPPER =
new ObjectMapper().registerModule(new JavaTimeModule());

private long nativeRestNamespaceHandle;
private BufferAllocator allocator;
Expand Down Expand Up @@ -241,10 +247,11 @@ public DropNamespaceResponse dropNamespace(DropNamespaceRequest request) {
}

@Override
public void namespaceExists(NamespaceExistsRequest request) {
public NamespaceExistsResponse namespaceExists(NamespaceExistsRequest request) {
ensureInitialized();
String requestJson = toJson(request);
namespaceExistsNative(nativeRestNamespaceHandle, requestJson);
return new NamespaceExistsResponse();
}

@Override
Expand Down Expand Up @@ -272,10 +279,11 @@ public RegisterTableResponse registerTable(RegisterTableRequest request) {
}

@Override
public void tableExists(TableExistsRequest request) {
public TableExistsResponse tableExists(TableExistsRequest request) {
ensureInitialized();
String requestJson = toJson(request);
tableExistsNative(nativeRestNamespaceHandle, requestJson);
return new TableExistsResponse();
}

@Override
Expand All @@ -295,10 +303,11 @@ public DeregisterTableResponse deregisterTable(DeregisterTableRequest request) {
}

@Override
public Long countTableRows(CountTableRowsRequest request) {
public CountTableRowsResponse countTableRows(CountTableRowsRequest request) {
ensureInitialized();
String requestJson = toJson(request);
return countTableRowsNative(nativeRestNamespaceHandle, requestJson);
Long count = countTableRowsNative(nativeRestNamespaceHandle, requestJson);
return new CountTableRowsResponse().count(count);
}

@Override
Expand Down Expand Up @@ -362,10 +371,11 @@ public DeleteFromTableResponse deleteFromTable(DeleteFromTableRequest request) {
}

@Override
public byte[] queryTable(QueryTableRequest request) {
public QueryTableResponse queryTable(QueryTableRequest request) {
ensureInitialized();
String requestJson = toJson(request);
return queryTableNative(nativeRestNamespaceHandle, requestJson);
byte[] data = queryTableNative(nativeRestNamespaceHandle, requestJson);
return new QueryTableResponse().data(data);
}

@Override
Expand Down
16 changes: 10 additions & 6 deletions java/src/test/java/org/lance/namespace/CustomNamespace.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.lance.namespace.model.BatchDeleteTableVersionsRequest;
import org.lance.namespace.model.BatchDeleteTableVersionsResponse;
import org.lance.namespace.model.CountTableRowsRequest;
import org.lance.namespace.model.CountTableRowsResponse;
import org.lance.namespace.model.CreateNamespaceRequest;
import org.lance.namespace.model.CreateNamespaceResponse;
import org.lance.namespace.model.CreateTableIndexRequest;
Expand Down Expand Up @@ -84,14 +85,17 @@
import org.lance.namespace.model.MergeInsertIntoTableRequest;
import org.lance.namespace.model.MergeInsertIntoTableResponse;
import org.lance.namespace.model.NamespaceExistsRequest;
import org.lance.namespace.model.NamespaceExistsResponse;
import org.lance.namespace.model.QueryTableRequest;
import org.lance.namespace.model.QueryTableResponse;
import org.lance.namespace.model.RegisterTableRequest;
import org.lance.namespace.model.RegisterTableResponse;
import org.lance.namespace.model.RenameTableRequest;
import org.lance.namespace.model.RenameTableResponse;
import org.lance.namespace.model.RestoreTableRequest;
import org.lance.namespace.model.RestoreTableResponse;
import org.lance.namespace.model.TableExistsRequest;
import org.lance.namespace.model.TableExistsResponse;
import org.lance.namespace.model.UpdateTableRequest;
import org.lance.namespace.model.UpdateTableResponse;
import org.lance.namespace.model.UpdateTableSchemaMetadataRequest;
Expand Down Expand Up @@ -174,8 +178,8 @@ public DropNamespaceResponse dropNamespace(DropNamespaceRequest request) {
}

@Override
public void namespaceExists(NamespaceExistsRequest request) {
inner.namespaceExists(request);
public NamespaceExistsResponse namespaceExists(NamespaceExistsRequest request) {
return inner.namespaceExists(request);
}

// Table operations
Expand All @@ -196,8 +200,8 @@ public RegisterTableResponse registerTable(RegisterTableRequest request) {
}

@Override
public void tableExists(TableExistsRequest request) {
inner.tableExists(request);
public TableExistsResponse tableExists(TableExistsRequest request) {
return inner.tableExists(request);
}

@Override
Expand All @@ -211,7 +215,7 @@ public DeregisterTableResponse deregisterTable(DeregisterTableRequest request) {
}

@Override
public Long countTableRows(CountTableRowsRequest request) {
public CountTableRowsResponse countTableRows(CountTableRowsRequest request) {
return inner.countTableRows(request);
}

Expand Down Expand Up @@ -250,7 +254,7 @@ public DeleteFromTableResponse deleteFromTable(DeleteFromTableRequest request) {
}

@Override
public byte[] queryTable(QueryTableRequest request) {
public QueryTableResponse queryTable(QueryTableRequest request) {
return inner.queryTable(request);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ void testCountTableRows() throws Exception {
// Count rows
CountTableRowsRequest countReq =
new CountTableRowsRequest().id(Arrays.asList("workspace", "test_table"));
long count = namespaceClient.countTableRows(countReq);
long count = namespaceClient.countTableRows(countReq).getCount();
assertEquals(3, count);
}

Expand All @@ -1183,7 +1183,7 @@ void testCountTableRowsWithFilter() throws Exception {
new CountTableRowsRequest()
.id(Arrays.asList("workspace", "test_table"))
.predicate("age > 28");
long count = namespaceClient.countTableRows(countReq);
long count = namespaceClient.countTableRows(countReq).getCount();
assertEquals(2, count); // Alice (30) and Charlie (35)
}

Expand All @@ -1210,7 +1210,7 @@ void testInsertIntoTable() throws Exception {
// Verify row count increased
CountTableRowsRequest countReq =
new CountTableRowsRequest().id(Arrays.asList("workspace", "test_table"));
long count = namespaceClient.countTableRows(countReq);
long count = namespaceClient.countTableRows(countReq).getCount();
assertEquals(6, count);
}

Expand All @@ -1233,7 +1233,7 @@ void testQueryTable() throws Exception {
.id(Arrays.asList("workspace", "test_table"))
.k(10)
.vector(new QueryTableRequestVector());
byte[] resultBytes = namespaceClient.queryTable(queryReq);
byte[] resultBytes = namespaceClient.queryTable(queryReq).getData();
assertNotNull(resultBytes);
assertTrue(resultBytes.length > 0);
}
Expand Down
4 changes: 2 additions & 2 deletions python/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "pylance"
dynamic = ["version"]
dependencies = ["pyarrow>=14", "numpy>=1.22", "lance-namespace>=0.8.5,<0.9"]
dependencies = ["pyarrow>=14", "numpy>=1.22", "lance-namespace>=0.11.1,<0.12"]
description = "python wrapper for Lance columnar format"
authors = [{ name = "Lance Devs", email = "dev@lance.org" }]
license = { file = "LICENSE" }
Expand Down
Loading
Loading