From 83fc4b474e41d63377dce5dd09345a28f02d48a5 Mon Sep 17 00:00:00 2001 From: Kodai Doki Date: Mon, 20 Jan 2025 14:33:43 +0900 Subject: [PATCH 1/6] Remove unnecessary loggings in statement handlers. --- .../scalar/db/storage/cassandra/SelectStatementHandler.java | 4 ---- .../main/java/com/scalar/db/storage/cosmos/BatchHandler.java | 2 -- .../com/scalar/db/storage/cosmos/MutateStatementHandler.java | 2 -- 3 files changed, 8 deletions(-) diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java index 4d6b335b6d..37daf3fd70 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java @@ -43,8 +43,6 @@ */ @ThreadSafe public class SelectStatementHandler extends StatementHandler { - private static final Logger logger = LoggerFactory.getLogger(SelectStatementHandler.class); - /** * Constructs {@code SelectStatementHandler} with the specified {@code Session} * @@ -60,7 +58,6 @@ public ResultSet handle(Operation operation) throws ExecutionException { try { return handleInternal(operation); } catch (RuntimeException e) { - logger.error(e.getMessage(), e); throw new ExecutionException( CoreError.CASSANDRA_ERROR_OCCURRED_IN_SELECTION.buildMessage(e.getMessage()), e); } @@ -294,7 +291,6 @@ private Ordering getOrdering(Scan.Ordering ordering) { case DESC: return QueryBuilder.desc(quoteIfNecessary(ordering.getColumnName())); default: - logger.warn("Unsupported ordering specified. Using Order.ASC"); return QueryBuilder.asc(quoteIfNecessary(ordering.getColumnName())); } } diff --git a/core/src/main/java/com/scalar/db/storage/cosmos/BatchHandler.java b/core/src/main/java/com/scalar/db/storage/cosmos/BatchHandler.java index 4981297658..5422034631 100644 --- a/core/src/main/java/com/scalar/db/storage/cosmos/BatchHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cosmos/BatchHandler.java @@ -22,7 +22,6 @@ */ @ThreadSafe public class BatchHandler { - private static final Logger logger = LoggerFactory.getLogger(BatchHandler.class); private static final String MUTATION_STORED_PROCEDURE = "mutate.js"; private final CosmosClient client; private final TableMetadataManager metadataManager; @@ -88,7 +87,6 @@ private void executeStoredProcedure( } private void throwException(CosmosException exception) throws ExecutionException { - logger.error(exception.getMessage(), exception); int statusCode = exception.getSubStatusCode(); if (statusCode == CosmosErrorCode.PRECONDITION_FAILED.get()) { diff --git a/core/src/main/java/com/scalar/db/storage/cosmos/MutateStatementHandler.java b/core/src/main/java/com/scalar/db/storage/cosmos/MutateStatementHandler.java index d0956687a1..9d5604870a 100644 --- a/core/src/main/java/com/scalar/db/storage/cosmos/MutateStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cosmos/MutateStatementHandler.java @@ -18,7 +18,6 @@ /** An abstraction for handler classes for mutate statements */ @ThreadSafe public abstract class MutateStatementHandler extends StatementHandler { - private static final Logger logger = LoggerFactory.getLogger(MutateStatementHandler.class); private static final String MUTATION_STORED_PROCEDURE = "mutate.js"; public MutateStatementHandler(CosmosClient client, TableMetadataManager metadataManager) { @@ -60,7 +59,6 @@ protected void executeStoredProcedure(Mutation mutation, TableMetadata tableMeta } private void throwException(CosmosException exception) throws ExecutionException { - logger.error(exception.getMessage()); int statusCode = exception.getSubStatusCode(); if (statusCode == CosmosErrorCode.PRECONDITION_FAILED.get()) { From 5b7677cd0aca25c567bd6e6401e5369a6c7e81c6 Mon Sep 17 00:00:00 2001 From: Kodai Doki Date: Mon, 20 Jan 2025 15:37:54 +0900 Subject: [PATCH 2/6] Remove unnecessary import statements. --- .../com/scalar/db/storage/cassandra/SelectStatementHandler.java | 2 -- .../main/java/com/scalar/db/storage/cosmos/BatchHandler.java | 2 -- .../com/scalar/db/storage/cosmos/MutateStatementHandler.java | 2 -- 3 files changed, 6 deletions(-) diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java index 37daf3fd70..2437b53dbf 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java @@ -33,8 +33,6 @@ import java.util.stream.IntStream; import javax.annotation.Nonnull; import javax.annotation.concurrent.ThreadSafe; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A handler class for select statement diff --git a/core/src/main/java/com/scalar/db/storage/cosmos/BatchHandler.java b/core/src/main/java/com/scalar/db/storage/cosmos/BatchHandler.java index 5422034631..b72733b95a 100644 --- a/core/src/main/java/com/scalar/db/storage/cosmos/BatchHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cosmos/BatchHandler.java @@ -12,8 +12,6 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.concurrent.ThreadSafe; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A handler for a batch diff --git a/core/src/main/java/com/scalar/db/storage/cosmos/MutateStatementHandler.java b/core/src/main/java/com/scalar/db/storage/cosmos/MutateStatementHandler.java index 9d5604870a..0cf7c91709 100644 --- a/core/src/main/java/com/scalar/db/storage/cosmos/MutateStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cosmos/MutateStatementHandler.java @@ -12,8 +12,6 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.concurrent.ThreadSafe; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** An abstraction for handler classes for mutate statements */ @ThreadSafe From e70d365df5d74b53e50355482e346a46fb35d677 Mon Sep 17 00:00:00 2001 From: Kodai Doki Date: Tue, 21 Jan 2025 13:29:56 +0900 Subject: [PATCH 3/6] Remove unnecessary warning message loggings. --- .../main/java/com/scalar/db/storage/cassandra/BatchHandler.java | 1 - .../com/scalar/db/storage/cassandra/MutateStatementHandler.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/BatchHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/BatchHandler.java index b604e5bf4c..36662b7bb2 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/BatchHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/BatchHandler.java @@ -73,7 +73,6 @@ public void handle(List mutations) CoreError.CASSANDRA_OPERATION_FAILED_IN_BATCH.buildMessage(writeType), e); } } catch (RuntimeException e) { - logger.warn(e.getMessage(), e); throw new RetriableExecutionException( CoreError.CASSANDRA_ERROR_OCCURRED_IN_BATCH.buildMessage(e.getMessage()), e); } diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/MutateStatementHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/MutateStatementHandler.java index a5d99a2c70..522b647dac 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/MutateStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/MutateStatementHandler.java @@ -48,7 +48,6 @@ public ResultSet handle(Operation operation) throws ExecutionException { } return results; } catch (WriteTimeoutException e) { - logger.warn("Write timeout happened during mutate operation", e); if (e.getWriteType() == WriteType.CAS) { // retry needs to be done if applications need to do the operation exactly throw new RetriableExecutionException( @@ -71,7 +70,6 @@ public ResultSet handle(Operation operation) throws ExecutionException { CoreError.CASSANDRA_WRITE_TIMEOUT_WITH_OTHER_WRITE_TYPE_IN_MUTATION.buildMessage(), e); } } catch (RuntimeException e) { - logger.warn(e.getMessage(), e); throw new RetriableExecutionException( CoreError.CASSANDRA_ERROR_OCCURRED_IN_MUTATION.buildMessage(e.getMessage()), e); } From bf353c49ea96fb9814a93d558357a55a83da493b Mon Sep 17 00:00:00 2001 From: Kodai Doki Date: Tue, 21 Jan 2025 15:21:13 +0900 Subject: [PATCH 4/6] Throw AssertionError instead of logging warning messages. --- .../scalar/db/storage/cassandra/SelectStatementHandler.java | 2 +- .../com/scalar/db/storage/cassandra/StatementHandler.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java index 2437b53dbf..20f74c0242 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java @@ -289,7 +289,7 @@ private Ordering getOrdering(Scan.Ordering ordering) { case DESC: return QueryBuilder.desc(quoteIfNecessary(ordering.getColumnName())); default: - return QueryBuilder.asc(quoteIfNecessary(ordering.getColumnName())); + throw new AssertionError("Unsupported ordering is specified"); } } diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/StatementHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/StatementHandler.java index e2b5fe2862..b900f972ad 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/StatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/StatementHandler.java @@ -14,13 +14,10 @@ import com.scalar.db.exception.storage.ExecutionException; import javax.annotation.Nonnull; import javax.annotation.concurrent.ThreadSafe; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A handler class for statements */ @ThreadSafe public abstract class StatementHandler { - private static final Logger logger = LoggerFactory.getLogger(StatementHandler.class); protected final Session session; protected final StatementCache cache; @@ -119,8 +116,7 @@ public static ConsistencyLevel convert(Operation operation, Consistency consiste return ConsistencyLevel.QUORUM; } default: - logger.warn("Unsupported consistency is specified. SEQUENTIAL is being used instead"); - return ConsistencyLevel.QUORUM; + throw new AssertionError("Unsupported consistency is specified"); } } From a8470755661f76e742023825668ff3fba3448abc Mon Sep 17 00:00:00 2001 From: Kodai Doki Date: Tue, 21 Jan 2025 15:46:30 +0900 Subject: [PATCH 5/6] Remove an unnecessary logger declaration. --- .../scalar/db/storage/cassandra/MutateStatementHandler.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/MutateStatementHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/MutateStatementHandler.java index 522b647dac..2594da421c 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/MutateStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/MutateStatementHandler.java @@ -15,14 +15,10 @@ import com.scalar.db.exception.storage.RetriableExecutionException; import javax.annotation.Nonnull; import javax.annotation.concurrent.ThreadSafe; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** An abstraction for handler classes for mutate statements */ @ThreadSafe public abstract class MutateStatementHandler extends StatementHandler { - private static final Logger logger = LoggerFactory.getLogger(MutateStatementHandler.class); - public MutateStatementHandler(Session session) { super(session); } From a1226d04f4b64c66fd85d6c946c8beefa69e83be Mon Sep 17 00:00:00 2001 From: Kodai Doki Date: Tue, 21 Jan 2025 17:30:39 +0900 Subject: [PATCH 6/6] Update error messages. --- .../com/scalar/db/storage/cassandra/SelectStatementHandler.java | 2 +- .../java/com/scalar/db/storage/cassandra/StatementHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java index 20f74c0242..2cb4760877 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/SelectStatementHandler.java @@ -289,7 +289,7 @@ private Ordering getOrdering(Scan.Ordering ordering) { case DESC: return QueryBuilder.desc(quoteIfNecessary(ordering.getColumnName())); default: - throw new AssertionError("Unsupported ordering is specified"); + throw new AssertionError("Unsupported ordering is specified: " + ordering.getOrder()); } } diff --git a/core/src/main/java/com/scalar/db/storage/cassandra/StatementHandler.java b/core/src/main/java/com/scalar/db/storage/cassandra/StatementHandler.java index b900f972ad..980ca796f2 100644 --- a/core/src/main/java/com/scalar/db/storage/cassandra/StatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/cassandra/StatementHandler.java @@ -116,7 +116,7 @@ public static ConsistencyLevel convert(Operation operation, Consistency consiste return ConsistencyLevel.QUORUM; } default: - throw new AssertionError("Unsupported consistency is specified"); + throw new AssertionError("Unsupported consistency is specified: " + consistency); } }