Update default YDB container name for integration tests

Author: alex268

coordination/pom.xml

@@ -41,19 +41,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <environmentVariables>
-                        <YDB_DOCKER_IMAGE>cr.yandex/yc/yandex-docker-local-ydb:trunk</YDB_DOCKER_IMAGE>
-                        <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
-                    </environmentVariables>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

query/pom.xml

@@ -36,19 +36,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <environmentVariables>
-                        <YDB_DOCKER_IMAGE>cr.yandex/yc/yandex-docker-local-ydb:trunk</YDB_DOCKER_IMAGE>
-                        <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
-                    </environmentVariables>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

query/src/test/java/tech/ydb/query/QueryExampleTest.java

@@ -116,8 +116,14 @@ public void step02_upsertTablesData() {
         );
 
         // Upsert list of series to table
-        retryCtx.supplyResult(session -> session.createQuery(
-                "UPSERT INTO series SELECT * FROM AS_TABLE($values)",
+        retryCtx.supplyResult(session -> session.createQuery(""
+                + "DECLARE $values AS List<Struct<"
+                + "  series_id: Uint64,"
+                + "  title: Text,"
+                + "  release_date: Date,"
+                + "  series_info: Text"
+                + ">>;"
+                + "UPSERT INTO series SELECT * FROM AS_TABLE($values)",
                 TxMode.SERIALIZABLE_RW,
                 Params.of("$values", seriesData)
         ).execute()).join().getStatus().expectSuccess("upsert problem");
@@ -143,8 +149,15 @@ public void step02_upsertTablesData() {
         );
 
         // Upsert list of seasons to table
-        retryCtx.supplyResult(session -> session.createQuery(
-                "UPSERT INTO seasons SELECT * FROM AS_TABLE($values)",
+        retryCtx.supplyResult(session -> session.createQuery(""
+                + "DECLARE $values AS List<Struct<"
+                + "  series_id: Uint64,"
+                + "  season_id: Uint64,"
+                + "  title: Text,"
+                + "  first_aired: Date,"
+                + "  last_aired: Date"
+                + ">>;"
+                + "UPSERT INTO seasons SELECT * FROM AS_TABLE($values)",
                 TxMode.SERIALIZABLE_RW,
                 Params.of("$values", seasonsData)
         ).execute()).join().getStatus().expectSuccess("upsert problem");
@@ -170,8 +183,15 @@ public void step02_upsertTablesData() {
         );
 
         // Upsert list of series to episodes
-        retryCtx.supplyResult(session -> session.createQuery(
-                "UPSERT INTO episodes SELECT * FROM AS_TABLE($values)",
+        retryCtx.supplyResult(session -> session.createQuery(""
+                + "DECLARE $values AS List<Struct<"
+                + "  series_id: Uint64,"
+                + "  season_id: Uint64,"
+                + "  episode_id: Uint64,"
+                + "  title: Text,"
+                + "  air_date: Date"
+                + ">>;"
+                + "UPSERT INTO episodes SELECT * FROM AS_TABLE($values)",
                 TxMode.SERIALIZABLE_RW,
                 Params.of("$values", episodesData)
         ).execute()).join().getStatus().expectSuccess("upsert problem");

query/src/test/java/tech/ydb/query/impl/QueryIntegrationTest.java

@@ -252,7 +252,11 @@ public void testSimpleCRUD() {
 
         try (QueryClient client = QueryClient.newClient(ydbTransport).build()) {
             for (Entity entity: entities) {
-                String query = "UPSERT INTO `" + TEST_TABLE + "` (id, name, payload, is_valid) "
+                String query = "DECLARE $id AS Int32;"
+                        + "DECLARE $name AS Text;"
+                        + "DECLARE $payload AS Bytes;"
+                        + "DECLARE $is_valid AS Bool;"
+                        + "UPSERT INTO `" + TEST_TABLE + "` (id, name, payload, is_valid) "
                         + "VALUES ($id, $name, $payload, $is_valid)";
 
                 Params params = Params.of(
@@ -459,6 +463,12 @@ public void testMultiStatement() {
         try (QueryClient client = QueryClient.newClient(ydbTransport).build()) {
             try (QuerySession session = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
                 String query = ""
+                        + "DECLARE $s1 AS Int32;"
+                        + "DECLARE $s2 AS Int32;"
+                        + "DECLARE $id1 AS Int32;"
+                        + "DECLARE $id2 AS Int32;"
+                        + "DECLARE $name1 AS Text;"
+                        + "DECLARE $name2 AS Text;"
                         + "SELECT * FROM `" + TEST_TABLE + "` WHERE id = $s1;"
                         + "INSERT INTO `" + TEST_TABLE + "` (id, name) VALUES ($id1, $name1);"
                         + "SELECT * FROM `" + TEST_TABLE + "` WHERE id = $s2;"

table/pom.xml

@@ -41,19 +41,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <environmentVariables>
-                        <YDB_DOCKER_IMAGE>cr.yandex/yc/yandex-docker-local-ydb:trunk</YDB_DOCKER_IMAGE>
-                        <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
-                    </environmentVariables>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

tests/common/src/main/java/tech/ydb/test/integration/YdbEnvironment.java

@@ -9,7 +9,7 @@
  * @author Aleksandr Gorshenin
  */
 public class YdbEnvironment {
-    private static final String YDB_DEFAULT_IMAGE = "cr.yandex/yc/yandex-docker-local-ydb:latest";
+    private static final String YDB_DEFAULT_IMAGE = "ydbplatform/local-ydb:latest";
 
     private final Supplier<String> ydbEndpoint = createParam("YDB_ENDPOINT", null);
     private final Supplier<String> ydbDatabase = createParam("YDB_DATABASE", null);