Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(controller):set datastore api param 'ignoreNonExistingTable'=true #1297

Merged
merged 3 commits into from
Sep 23, 2022
Merged

fix(controller):set datastore api param 'ignoreNonExistingTable'=true #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1acf22b
set datastore api param 'ignoreNonExistingTable'=true
goldenxinxing Sep 23, 2022
0d3954a
add warn log for empty table
goldenxinxing Sep 23, 2022
08fa1a1
update unit test
goldenxinxing Sep 23, 2022
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
2 changes: 1 addition & 1 deletion ...controller/src/main/java/ai/starwhale/mlops/api/protocol/datastore/QueryTableRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ public class QueryTableRequest {
private int limit = -1;
private boolean keepNone;
private boolean rawResult;
private boolean ignoreNonExistingTable;
private boolean ignoreNonExistingTable = true;
}
2 changes: 1 addition & 1 deletion .../controller/src/main/java/ai/starwhale/mlops/api/protocol/datastore/ScanTableRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ public class ScanTableRequest {
private int limit = -1;
private boolean keepNone;
private boolean rawResult;
private boolean ignoreNonExistingTable;
private boolean ignoreNonExistingTable = true;
}
10 changes: 8 additions & 2 deletions server/controller/src/main/java/ai/starwhale/mlops/datastore/DataStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

@Slf4j
@Component
public class DataStore {

Expand Down Expand Up @@ -253,9 +255,13 @@ var record = new HashMap<String, String>();

private MemoryTable getTable(String tableName, boolean allowNull) {
var table = tables.get(tableName);
if (table == null && !allowNull) {
throw new SwValidationException(SwValidationException.ValidSubject.DATASTORE).tip(
if (table == null) {
if (allowNull) {
log.warn("not found table:{}!", tableName);
} else {
throw new SwValidationException(SwValidationException.ValidSubject.DATASTORE).tip(
"invalid table name " + tableName);
}
}
return table;
}
Expand Down
4 changes: 2 additions & 2 deletions server/controller/src/test/java/ai/starwhale/mlops/api/DataStoreControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,7 @@ public void testNullTableName() {
@Test
public void testTableNotExists() {
this.req.setTableName("table not exists");
this.req.setIgnoreNonExistingTable(false);
assertThrows(SwValidationException.class,
() -> DataStoreControllerTest.this.controller.queryTable(this.req),
"");
Expand All @@ -649,7 +650,6 @@ public void testTableNotExists() {
@Test
public void testTableNotExistsIgnore() {
this.req.setTableName("table not exists");
this.req.setIgnoreNonExistingTable(true);

var resp = DataStoreControllerTest.this.controller.queryTable(this.req);
assertThat("test", resp.getStatusCode().is2xxSuccessful(), is(true));
Expand Down Expand Up @@ -1216,6 +1216,7 @@ public void testNullTableName() {
@Test
public void testInvalidTableName() {
this.req.getTables().get(0).setTableName("invalid");
this.req.setIgnoreNonExistingTable(false);
assertThrows(SwValidationException.class,
() -> DataStoreControllerTest.this.controller.scanTable(this.req),
"");
Expand All @@ -1224,7 +1225,6 @@ public void testInvalidTableName() {
@Test
public void testTableNotExistsIgnore() {
this.req.getTables().get(0).setTableName("invalid");
this.req.setIgnoreNonExistingTable(true);

var resp = DataStoreControllerTest.this.controller.scanTable(this.req);
assertThat("test", resp.getStatusCode().is2xxSuccessful(), is(true));
Expand Down