Merge branch 'master' into feat/data-loader/metadata-service

scalar-labs · Jan 20, 2025 · 153c2d1 · 153c2d1
2 parents d984eea + 8c96c1a
commit 153c2d1
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 4 deletions.
diff --git a/core/src/main/java/com/scalar/db/api/AbacOperationAttributes.java b/core/src/main/java/com/scalar/db/api/AbacOperationAttributes.java
@@ -1,5 +1,6 @@
 package com.scalar.db.api;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.Optional;
 
@@ -16,6 +17,11 @@ public static void setReadTag(Map<String, String> attributes, String policyName,
     attributes.put(READ_TAG_PREFIX + policyName, readTag);
   }
 
+  public static void setReadTag(
+      ImmutableMap.Builder<String, String> attributesBuilder, String policyName, String readTag) {
+    attributesBuilder.put(READ_TAG_PREFIX + policyName, readTag);
+  }
+
   public static void clearReadTag(Map<String, String> attributes, String policyName) {
     attributes.remove(READ_TAG_PREFIX + policyName);
   }
@@ -29,6 +35,11 @@ public static void setWriteTag(
     attributes.put(WRITE_TAG_PREFIX + policyName, writeTag);
   }
 
+  public static void setWriteTag(
+      ImmutableMap.Builder<String, String> attributesBuilder, String policyName, String writeTag) {
+    attributesBuilder.put(WRITE_TAG_PREFIX + policyName, writeTag);
+  }
+
   public static void clearWriteTag(Map<String, String> attributes, String policyName) {
     attributes.remove(WRITE_TAG_PREFIX + policyName);
   }

diff --git a/core/src/test/java/com/scalar/db/api/AbacOperationAttributesTest.java b/core/src/test/java/com/scalar/db/api/AbacOperationAttributesTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.ImmutableMap;
 import com.scalar.db.io.Key;
 import java.util.HashMap;
 import java.util.Map;
@@ -11,7 +12,7 @@
 public class AbacOperationAttributesTest {
 
   @Test
-  public void setReadTag_ShouldSetReadTag() {
+  public void setReadTag_MapGiven_ShouldSetReadTag() {
     // Arrange
     Map<String, String> attributes = new HashMap<>();
     String policyName = "policyName";
@@ -25,6 +26,21 @@ public void setReadTag_ShouldSetReadTag() {
         .containsEntry(AbacOperationAttributes.READ_TAG_PREFIX + policyName, readTag);
   }
 
+  @Test
+  public void setReadTag_ImmutableMapBuilderGiven_ShouldSetReadTag() {
+    // Arrange
+    ImmutableMap.Builder<String, String> attributesBuilder = ImmutableMap.builder();
+    String policyName = "policyName";
+    String readTag = "readTag";
+
+    // Act
+    AbacOperationAttributes.setReadTag(attributesBuilder, policyName, readTag);
+
+    // Assert
+    assertThat(attributesBuilder.build())
+        .containsEntry(AbacOperationAttributes.READ_TAG_PREFIX + policyName, readTag);
+  }
+
   @Test
   public void clearReadTag_ShouldClearReadTag() {
     // Arrange
@@ -60,7 +76,7 @@ public void clearReadTags_ShouldClearReadTags() {
   }
 
   @Test
-  public void setWriteTag_ShouldSetWriteTag() {
+  public void setWriteTag_MapGiven_ShouldSetWriteTag() {
     // Arrange
     Map<String, String> attributes = new HashMap<>();
     String policyName = "policyName";
@@ -74,6 +90,21 @@ public void setWriteTag_ShouldSetWriteTag() {
         .containsEntry(AbacOperationAttributes.WRITE_TAG_PREFIX + policyName, writeTag);
   }
 
+  @Test
+  public void setWriteTag_ImmutableMapBuilderGiven_ShouldSetWriteTag() {
+    // Arrange
+    ImmutableMap.Builder<String, String> attributesBuilder = ImmutableMap.builder();
+    String policyName = "policyName";
+    String writeTag = "writeTag";
+
+    // Act
+    AbacOperationAttributes.setWriteTag(attributesBuilder, policyName, writeTag);
+
+    // Assert
+    assertThat(attributesBuilder.build())
+        .containsEntry(AbacOperationAttributes.WRITE_TAG_PREFIX + policyName, writeTag);
+  }
+
   @Test
   public void clearWriteTag_ShouldClearWriteTag() {
     // Arrange

diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java
@@ -83,7 +83,9 @@ public class JdbcAdminTest {
           RdbEngine.SQLITE,
           new RdbEngineSqlite(),
           RdbEngine.YUGABYTE,
-          new RdbEngineYugabyte());
+          new RdbEngineYugabyte(),
+          RdbEngine.MARIADB,
+          new RdbEngineMariaDB());
 
   @Mock private BasicDataSource dataSource;
   @Mock private Connection connection;
@@ -119,6 +121,7 @@ private JdbcAdmin createJdbcAdminFor(RdbEngineStrategy rdbEngineStrategy) {
   private void mockUndefinedTableError(RdbEngine rdbEngine, SQLException sqlException) {
     switch (rdbEngine) {
       case MYSQL:
+      case MARIADB:
         when(sqlException.getErrorCode()).thenReturn(1049);
         break;
       case POSTGRESQL:
@@ -3450,6 +3453,7 @@ private SQLException prepareDuplicatedKeyException(RdbEngine rdbEngine) {
       case SQL_SERVER:
       case MYSQL:
       case ORACLE:
+      case MARIADB:
         duplicateKeyException = mock(SQLException.class);
         when(duplicateKeyException.getSQLState()).thenReturn("23000");
         break;

diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/RdbEngine.java b/core/src/test/java/com/scalar/db/storage/jdbc/RdbEngine.java
@@ -11,7 +11,8 @@ public enum RdbEngine {
   ORACLE,
   SQL_SERVER,
   SQLITE,
-  YUGABYTE;
+  YUGABYTE,
+  MARIADB;
 
   public static RdbEngineStrategy createRdbEngineStrategy(RdbEngine rdbEngine) {
     switch (rdbEngine) {
@@ -27,6 +28,8 @@ public static RdbEngineStrategy createRdbEngineStrategy(RdbEngine rdbEngine) {
         return new RdbEngineSqlite();
       case YUGABYTE:
         return new RdbEngineYugabyte();
+      case MARIADB:
+        return new RdbEngineMariaDB();
       default:
         throw new AssertionError();
     }

diff --git a/core/src/test/java/com/scalar/db/storage/jdbc/query/QueryBuilderTest.java b/core/src/test/java/com/scalar/db/storage/jdbc/query/QueryBuilderTest.java
@@ -334,6 +334,7 @@ public void selectQueryTest(RdbEngine rdbEngineType) throws SQLException {
       case MYSQL:
       case POSTGRESQL:
       case YUGABYTE:
+      case MARIADB:
         expectedQuery =
             "SELECT c1,c2 FROM n1.t1 WHERE p1=? AND c1>=? AND c1<=? "
                 + "ORDER BY c1 ASC,c2 DESC LIMIT 10";
@@ -1300,6 +1301,7 @@ public void upsertQueryTest(RdbEngine rdbEngineType) throws SQLException {
     preparedStatement = mock(PreparedStatement.class);
     switch (rdbEngineType) {
       case MYSQL:
+      case MARIADB:
         expectedQuery =
             "INSERT INTO n1.t1 (p1,v1,v2,v3) VALUES (?,?,?,?)"
                 + " ON DUPLICATE KEY UPDATE v1=?,v2=?,v3=?";
@@ -1340,6 +1342,7 @@ public void upsertQueryTest(RdbEngine rdbEngineType) throws SQLException {
       case POSTGRESQL:
       case SQLITE:
       case YUGABYTE:
+      case MARIADB:
         verify(preparedStatement).setString(1, "p1Value");
         verify(preparedStatement).setString(2, "v1Value");
         verify(preparedStatement).setString(3, "v2Value");
@@ -1364,6 +1367,7 @@ public void upsertQueryTest(RdbEngine rdbEngineType) throws SQLException {
     preparedStatement = mock(PreparedStatement.class);
     switch (rdbEngineType) {
       case MYSQL:
+      case MARIADB:
         expectedQuery =
             "INSERT INTO n1.t1 (p1,c1,v1,v2,v3) VALUES (?,?,?,?,?)"
                 + " ON DUPLICATE KEY UPDATE v1=?,v2=?,v3=?";
@@ -1406,6 +1410,7 @@ public void upsertQueryTest(RdbEngine rdbEngineType) throws SQLException {
       case POSTGRESQL:
       case SQLITE:
       case YUGABYTE:
+      case MARIADB:
         verify(preparedStatement).setString(1, "p1Value");
         verify(preparedStatement).setString(2, "c1Value");
         verify(preparedStatement).setString(3, "v1Value");
@@ -1434,6 +1439,7 @@ public void upsertQueryTest(RdbEngine rdbEngineType) throws SQLException {
     preparedStatement = mock(PreparedStatement.class);
     switch (rdbEngineType) {
       case MYSQL:
+      case MARIADB:
         expectedQuery =
             "INSERT INTO n1.t1 (p1,p2,c1,c2,v1,v2,v3,v4) VALUES (?,?,?,?,?,?,?,?)"
                 + " ON DUPLICATE KEY UPDATE v1=?,v2=?,v3=?,v4=?";
@@ -1480,6 +1486,7 @@ public void upsertQueryTest(RdbEngine rdbEngineType) throws SQLException {
       case POSTGRESQL:
       case SQLITE:
       case YUGABYTE:
+      case MARIADB:
         verify(preparedStatement).setString(1, "p1Value");
         verify(preparedStatement).setString(2, "p2Value");
         verify(preparedStatement).setString(3, "c1Value");
@@ -1518,6 +1525,7 @@ public void upsertQueryTest(RdbEngine rdbEngineType) throws SQLException {
     preparedStatement = mock(PreparedStatement.class);
     switch (rdbEngineType) {
       case MYSQL:
+      case MARIADB:
         expectedQuery =
             "INSERT INTO n1.t1 (p1,p2,c1,c2,v1,v2,v3,v4,v5) VALUES (?,?,?,?,?,?,?,?,?)"
                 + " ON DUPLICATE KEY UPDATE v1=?,v2=?,v3=?,v4=?,v5=?";
@@ -1565,6 +1573,7 @@ public void upsertQueryTest(RdbEngine rdbEngineType) throws SQLException {
       case POSTGRESQL:
       case SQLITE:
       case YUGABYTE:
+      case MARIADB:
         verify(preparedStatement).setString(1, "p1Value");
         verify(preparedStatement).setString(2, "p2Value");
         verify(preparedStatement).setString(3, "c1Value");
@@ -1617,6 +1626,7 @@ public void upsertQueryWithoutValuesTest(RdbEngine rdbEngineType) throws SQLExce
     preparedStatement = mock(PreparedStatement.class);
     switch (rdbEngineType) {
       case MYSQL:
+      case MARIADB:
         expectedQuery = "INSERT IGNORE INTO n1.t1 (p1) VALUES (?)";
         break;
       case POSTGRESQL:
@@ -1649,6 +1659,7 @@ public void upsertQueryWithoutValuesTest(RdbEngine rdbEngineType) throws SQLExce
       case POSTGRESQL:
       case SQLITE:
       case YUGABYTE:
+      case MARIADB:
         verify(preparedStatement).setString(1, "p1Value");
         break;
       case ORACLE:
@@ -1661,6 +1672,7 @@ public void upsertQueryWithoutValuesTest(RdbEngine rdbEngineType) throws SQLExce
     preparedStatement = mock(PreparedStatement.class);
     switch (rdbEngineType) {
       case MYSQL:
+      case MARIADB:
         expectedQuery = "INSERT IGNORE INTO n1.t1 (p1,c1) VALUES (?,?)";
         break;
       case POSTGRESQL:
@@ -1698,6 +1710,7 @@ public void upsertQueryWithoutValuesTest(RdbEngine rdbEngineType) throws SQLExce
       case POSTGRESQL:
       case SQLITE:
       case YUGABYTE:
+      case MARIADB:
         verify(preparedStatement).setString(1, "p1Value");
         verify(preparedStatement).setString(2, "c1Value");
         break;
@@ -1713,6 +1726,7 @@ public void upsertQueryWithoutValuesTest(RdbEngine rdbEngineType) throws SQLExce
     preparedStatement = mock(PreparedStatement.class);
     switch (rdbEngineType) {
       case MYSQL:
+      case MARIADB:
         expectedQuery = "INSERT IGNORE INTO n1.t1 (p1,p2,c1,c2) VALUES (?,?,?,?)";
         break;
       case POSTGRESQL:
@@ -1754,6 +1768,7 @@ public void upsertQueryWithoutValuesTest(RdbEngine rdbEngineType) throws SQLExce
       case POSTGRESQL:
       case SQLITE:
       case YUGABYTE:
+      case MARIADB:
         verify(preparedStatement).setString(1, "p1Value");
         verify(preparedStatement).setString(2, "p2Value");
         verify(preparedStatement).setString(3, "c1Value");