Skip to content

Split schema-loader errors and data-loader errors from CoreError #2805

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

Merged
merged 5 commits into from
Jun 20, 2025
Merged

Split schema-loader errors and data-loader errors from CoreError #2805

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9902070
Split schema-loader errors and data-loader errors from CoreError
brfrn169 Jun 20, 2025
5679f61
[skip ci] Apply suggestions from code review
brfrn169 Jun 20, 2025
c1e9ab0
[skip ci] Apply suggestions from code review
brfrn169 Jun 20, 2025
3700267
Merge branch 'master' into split-schema-loder-errors-and-data-loader-…
brfrn169 Jun 20, 2025
8188d24
Fix
brfrn169 Jun 20, 2025
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 core/src/main/java/com/scalar/db/api/AbacAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.scalar.db.api;

import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.exception.storage.ExecutionException;
import java.util.List;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/Admin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.scalar.db.api;

import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.exception.storage.ExecutionException;
import com.scalar.db.io.DataType;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/AuthAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.scalar.db.api;

import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.exception.storage.ExecutionException;
import java.util.List;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/ConditionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.scalar.db.api;

import com.scalar.db.api.ConditionalExpression.Operator;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.io.BigIntColumn;
import com.scalar.db.io.BlobColumn;
import com.scalar.db.io.BooleanColumn;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/GetBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import com.scalar.db.api.OperationBuilder.WhereAnd;
import com.scalar.db.api.OperationBuilder.WhereOr;
import com.scalar.db.api.Selection.Conjunction;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.io.Key;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/LikeExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.scalar.db.api;

import com.google.common.base.MoreObjects;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.io.TextColumn;
import java.util.Objects;
import javax.annotation.Nonnull;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/Put.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.google.common.collect.ImmutableSet;
import com.scalar.db.api.PutBuilder.BuildableFromExisting;
import com.scalar.db.api.PutBuilder.Namespace;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.io.BigIntColumn;
import com.scalar.db.io.BlobColumn;
import com.scalar.db.io.BooleanColumn;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/ReplicationAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.scalar.db.api;

import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.exception.storage.ExecutionException;
import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/ScanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import com.scalar.db.api.OperationBuilder.WhereAnd;
import com.scalar.db.api.OperationBuilder.WhereOr;
import com.scalar.db.api.Selection.Conjunction;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.io.Key;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/TableMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.scalar.db.api.Scan.Ordering.Order;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;
import com.scalar.db.io.DataType;
import com.scalar.db.util.ImmutableLinkedHashSet;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/scalar/db/api/TransactionState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.scalar.db.api;

import com.scalar.db.common.error.CoreError;
import com.scalar.db.common.CoreError;

public enum TransactionState {
PREPARED(1),
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/com/scalar/db/common/AbstractResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Suppliers;
import com.scalar.db.api.Result;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.io.Column;
import com.scalar.db.io.Value;
import com.scalar.db.util.ScalarDbUtils;
Expand Down
1 change: 0 additions & 1 deletion ...main/java/com/scalar/db/common/ActiveTransactionManagedDistributedTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.scalar.db.api.Scan;
import com.scalar.db.api.Update;
import com.scalar.db.api.Upsert;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.exception.transaction.AbortException;
import com.scalar.db.exception.transaction.CommitException;
import com.scalar.db.exception.transaction.CrudException;
Expand Down
1 change: 0 additions & 1 deletion ...n/java/com/scalar/db/common/ActiveTransactionManagedTwoPhaseCommitTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.scalar.db.api.TwoPhaseCommitTransactionManager;
import com.scalar.db.api.Update;
import com.scalar.db.api.Upsert;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.exception.transaction.AbortException;
import com.scalar.db.exception.transaction.CommitException;
import com.scalar.db.exception.transaction.CrudException;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.StorageInfo;
import com.scalar.db.api.TableMetadata;
import com.scalar.db.common.error.CoreError;
import com.scalar.db.config.DatabaseConfig;
import com.scalar.db.exception.storage.ExecutionException;
import com.scalar.db.io.DataType;
Expand Down
Loading