Fix based on feedback

Author: brfrn169

core/src/main/java/com/scalar/db/storage/jdbc/JdbcDatabase.java

@@ -396,11 +396,9 @@ private List<Put> dividePutForSourceTables(Put put, VirtualTableInfo virtualTabl
           putBuilderForLeftSourceTable.condition(ConditionBuilder.putIf(leftExpressions));
         }
         if (!rightExpressions.isEmpty()) {
-          if (virtualTableInfo.getJoinType() == VirtualTableJoinType.LEFT_OUTER
+          if (isAllIsNullOnRightColumnsInLeftOuterJoin(virtualTableInfo, rightExpressions)
               && JdbcOperationAttributes
-                  .isLeftOuterVirtualTablePutIfIsNullOnRightColumnsConversionEnabled(put)
-              && rightExpressions.stream()
-                  .allMatch(e -> e.getOperator() == ConditionalExpression.Operator.IS_NULL)) {
+                  .isLeftOuterVirtualTablePutIfIsNullOnRightColumnsConversionEnabled(put)) {
             // In a LEFT_OUTER join, when all conditions on the right source table columns are
             // IS_NULL, we cannot distinguish whether we should check for the existence of a
             // right-side record with NULL values or for the case where the right-side record does
@@ -479,11 +477,9 @@ private List<Delete> divideDeleteForSourceTables(Delete delete, VirtualTableInfo
           deleteBuilderForLeftSourceTable.condition(ConditionBuilder.deleteIf(leftExpressions));
         }
         if (!rightExpressions.isEmpty()) {
-          if (virtualTableInfo.getJoinType() == VirtualTableJoinType.LEFT_OUTER
+          if (isAllIsNullOnRightColumnsInLeftOuterJoin(virtualTableInfo, rightExpressions)
               && !JdbcOperationAttributes
-                  .isLeftOuterVirtualTableDeleteIfIsNullOnRightColumnsAllowed(delete)
-              && rightExpressions.stream()
-                  .allMatch(e -> e.getOperator() == ConditionalExpression.Operator.IS_NULL)) {
+                  .isLeftOuterVirtualTableDeleteIfIsNullOnRightColumnsAllowed(delete)) {
             // In a LEFT_OUTER join, when all conditions on the right source table columns are
             // IS_NULL, we cannot distinguish whether we should check for the existence of a
             // right-side record with NULL values or for the case where the right-side record does
@@ -509,6 +505,13 @@ private List<Delete> divideDeleteForSourceTables(Delete delete, VirtualTableInfo
     return Arrays.asList(deleteForLeftSourceTable, deleteForRightSourceTable);
   }
 
+  private boolean isAllIsNullOnRightColumnsInLeftOuterJoin(
+      VirtualTableInfo virtualTableInfo, List<ConditionalExpression> rightExpressions) {
+    return virtualTableInfo.getJoinType() == VirtualTableJoinType.LEFT_OUTER
+        && rightExpressions.stream()
+            .allMatch(e -> e.getOperator() == ConditionalExpression.Operator.IS_NULL);
+  }
+
   private void close(Connection connection) {
     try {
       if (connection != null) {

core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationAttributes.java

@@ -13,7 +13,7 @@ public final class JdbcOperationAttributes {
           OPERATION_ATTRIBUTE_PREFIX
               + "left-outer-virtual-table-put-if-is-null-on-right-columns-conversion-enabled";
 
-  public static final String LEFT_OUTER_VIRTUAL_TABLE_DELETE_IF_IS_NULL_FOR_RIGHT_ALLOWED =
+  public static final String LEFT_OUTER_VIRTUAL_TABLE_DELETE_IF_IS_NULL_ON_RIGHT_COLUMNS_ALLOWED =
       OPERATION_ATTRIBUTE_PREFIX
           + "left-outer-virtual-table-delete-if-is-null-on-right-columns-allowed";
 
@@ -35,14 +35,15 @@ public static void setLeftOuterVirtualTablePutIfIsNullOnRightColumnsConversionEn
 
   public static boolean isLeftOuterVirtualTableDeleteIfIsNullOnRightColumnsAllowed(Delete delete) {
     return delete
-        .getAttribute(LEFT_OUTER_VIRTUAL_TABLE_DELETE_IF_IS_NULL_FOR_RIGHT_ALLOWED)
+        .getAttribute(LEFT_OUTER_VIRTUAL_TABLE_DELETE_IF_IS_NULL_ON_RIGHT_COLUMNS_ALLOWED)
         .map(Boolean::parseBoolean)
         .orElse(false);
   }
 
   public static void setLeftOuterVirtualTableDeleteIfIsNullOnRightColumnsAllowed(
       Map<String, String> attributes, boolean allowed) {
     attributes.put(
-        LEFT_OUTER_VIRTUAL_TABLE_DELETE_IF_IS_NULL_FOR_RIGHT_ALLOWED, Boolean.toString(allowed));
+        LEFT_OUTER_VIRTUAL_TABLE_DELETE_IF_IS_NULL_ON_RIGHT_COLUMNS_ALLOWED,
+        Boolean.toString(allowed));
   }
 }

core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationAttributesTest.java

@@ -171,7 +171,8 @@ public class JdbcOperationAttributesTest {
     // Assert
     assertThat(attributes)
         .containsEntry(
-            JdbcOperationAttributes.LEFT_OUTER_VIRTUAL_TABLE_DELETE_IF_IS_NULL_FOR_RIGHT_ALLOWED,
+            JdbcOperationAttributes
+                .LEFT_OUTER_VIRTUAL_TABLE_DELETE_IF_IS_NULL_ON_RIGHT_COLUMNS_ALLOWED,
             "true");
   }
 }