move drop scheme before create

rekby · rekby · commit 6514f75a48db · 2025-04-07T16:20:01.000+03:00
diff --git a/dev-1/lesson-3.1/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-3.1/java/src/main/java/tech/ydb/app/Application.java
@@ -19,6 +19,7 @@ public static void main(String[] args) {
                 var schemaYdbRepository = new SchemaYdbRepository(retryCtx);
                 var issueYdbRepository = new IssueYdbRepository(retryCtx);
 
+                schemaYdbRepository.dropSchema();
                 schemaYdbRepository.createSchema();
 
                 issueYdbRepository.addIssue("Ticket 1");
@@ -28,8 +29,6 @@ public static void main(String[] args) {
                 for (var ticket : issueYdbRepository.findAll()) {
                     System.out.println("Ticket: {id: " + ticket.id() + ", title: " + ticket.title() + ", timestamp: " + ticket.now() + "}");
                 }
-
-                schemaYdbRepository.dropSchema();
             }
         }
     }
diff --git a/dev-1/lesson-4.1/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-4.1/java/src/main/java/tech/ydb/app/Application.java
@@ -19,6 +19,7 @@ public static void main(String[] args) {
                 var schemaYdbRepository = new SchemaYdbRepository(retryCtx);
                 var issueYdbRepository = new IssueYdbRepository(retryCtx);
 
+                schemaYdbRepository.dropSchema();
                 schemaYdbRepository.createSchema();
 
                 issueYdbRepository.addIssue("Ticket 1", "Author 1");
@@ -54,8 +55,6 @@ public static void main(String[] args) {
                 for (var ticket : issueYdbRepository.findAll()) {
                     printIssue(ticket);
                 }
-
-                schemaYdbRepository.dropSchema();
             }
         }
     }
diff --git a/dev-1/lesson-4.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java b/dev-1/lesson-4.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java
@@ -47,8 +47,8 @@ public void dropSchema() {
         retryCtx.supplyResult(
                 session -> session.createQuery(
                         """
-                                DROP TABLE issues;
-                                DROP TABLE links;
+                                DROP TABLE IF EXISTS issues;
+                                DROP TABLE IF EXISTS links;
                                 """, TxMode.NONE
                 ).execute()
         ).join().getStatus().expectSuccess("Can't drop table issues");
diff --git a/dev-1/lesson-5.1/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-5.1/java/src/main/java/tech/ydb/app/Application.java
@@ -19,6 +19,7 @@ public static void main(String[] args) {
                 var schemaYdbRepository = new SchemaYdbRepository(retryCtx);
                 var issueYdbRepository = new IssueYdbRepository(retryCtx);
 
+                schemaYdbRepository.dropSchema();
                 schemaYdbRepository.createSchema();
 
                 issueYdbRepository.addIssue("Ticket 1", "Author 1");
@@ -34,8 +35,6 @@ public static void main(String[] args) {
 
                 System.out.println("Find by index `authorIndex`: ");
                 printIssue(issueYdbRepository.findByAuthor("Author 2"));
-
-                schemaYdbRepository.dropSchema();
             }
         }
     }
diff --git a/dev-1/lesson-5.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java b/dev-1/lesson-5.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java
@@ -55,8 +55,8 @@ public void dropSchema() {
         retryCtx.supplyResult(
                 session -> session.createQuery(
                         """
-                                DROP TABLE issues;
-                                DROP TABLE links;
+                                DROP TABLE IF EXISTS issues;
+                                DROP TABLE IF EXISTS links;
                                 """, TxMode.NONE
                 ).execute()
         ).join().getStatus().expectSuccess("Can't drop table issues");
diff --git a/dev-1/lesson-6.1/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-6.1/java/src/main/java/tech/ydb/app/Application.java
@@ -21,6 +21,7 @@ public static void main(String[] args) throws InterruptedException {
             var schemaYdbRepository = new SchemaYdbRepository(retryCtx);
             var issueYdbRepository = new IssueYdbRepository(retryCtx);
 
+            schemaYdbRepository.dropSchema();
             schemaYdbRepository.createSchema();
 
             issueYdbRepository.addIssue("Ticket 1", "Author 1");
@@ -58,8 +59,6 @@ public static void main(String[] args) throws InterruptedException {
             for (var ticket : issueYdbRepository.findAll()) {
                 printIssue(ticket);
             }
-
-            schemaYdbRepository.dropSchema();
         }
     }
 
diff --git a/dev-1/lesson-6.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java b/dev-1/lesson-6.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java
@@ -72,9 +72,9 @@ public void dropSchema() {
         retryCtx.supplyResult(
                 session -> session.createQuery(
                         """
-                                DROP TABLE issues;
-                                DROP TABLE links;
-                                DROP TOPIC task_status;
+                                DROP TABLE IF EXISTS issues;
+                                DROP TABLE IF EXISTS links;
+                                DROP TOPIC IF EXISTS task_status;
                                 """, TxMode.NONE
                 ).execute()
         ).join().getStatus().expectSuccess("Can't drop table issues");
diff --git a/dev-1/lesson-6.2/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-6.2/java/src/main/java/tech/ydb/app/Application.java
@@ -40,6 +40,7 @@ public static void main(String[] args) throws IOException, InterruptedException
 
             var retryCtx = SessionRetryContext.create(queryClient).build();
 
+            dropSchema(retryCtx);
             createSchema(retryCtx);
 
             var writer = topicClient.createSyncWriter(
@@ -121,8 +122,6 @@ public static void main(String[] args) throws IOException, InterruptedException
             printTableFile(retryCtx);
 
             readerJob.join();
-
-            dropSchema(retryCtx);
         }
     }
 
@@ -254,10 +253,10 @@ CREATE TOPIC file_topic (
 
     private static void dropSchema(SessionRetryContext retryCtx) {
         executeSchema(retryCtx, """
-                DROP TABLE file;
-                DROP TABLE file_progress;
-                DROP TABLE write_file_progress;
-                DROP TOPIC file_topic;
+                DROP TABLE IF EXISTS file;
+                DROP TABLE IF EXISTS file_progress;
+                DROP TABLE IF EXISTS write_file_progress;
+                DROP TOPIC IF EXISTS file_topic;
                 """);
     }
 
diff --git a/dev-1/lesson-6.3/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-6.3/java/src/main/java/tech/ydb/app/Application.java
@@ -44,6 +44,7 @@ public static void main(String[] args) throws IOException, InterruptedException
 
             var retryCtx = SessionRetryContext.create(queryClient).build();
 
+            dropSchema(retryCtx);
             createSchema(retryCtx);
 
             var reader = topicClient.createSyncReader(
@@ -83,12 +84,12 @@ public static void main(String[] args) throws IOException, InterruptedException
                 var origLineNumber = new AtomicLong(1);
 
                 lines.forEach(line -> {
-                            if (origLineNumber.getAndIncrement() < lineNumber.get()) {
+                    if (origLineNumber.getAndIncrement() < lineNumber.get()) {
                                 return;
                             }
 
-                            var lineNumberCur = lineNumber.getAndIncrement();
-                            retryCtx.supplyStatus(
+                    var lineNumberCur = lineNumber.getAndIncrement();
+                    retryCtx.supplyStatus(
                                     session -> {
                                         var transaction = session.beginTransaction(TxMode.SERIALIZABLE_RW).join().getValue();
                                         var writer = topicClient.createSyncWriter(
@@ -138,8 +139,6 @@ public static void main(String[] args) throws IOException, InterruptedException
             readerJob.join();
 
             printTableFile(retryCtx);
-
-            dropSchema(retryCtx);
         }
     }
 
@@ -242,9 +241,9 @@ CREATE TOPIC file_topic (
 
     private static void dropSchema(SessionRetryContext retryCtx) {
         executeSchema(retryCtx, """
-                DROP TABLE file;
-                DROP TABLE write_file_progress;
-                DROP TOPIC file_topic;
+                DROP TABLE IF EXISTS file;
+                DROP TABLE IF EXISTS write_file_progress;
+                DROP TOPIC IF EXISTS file_topic;
                 """);
     }
 
diff --git a/dev-1/lesson-7.1/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-7.1/java/src/main/java/tech/ydb/app/Application.java
@@ -22,6 +22,7 @@ public static void main(String[] args) throws InterruptedException {
             var schemaYdbRepository = new SchemaYdbRepository(retryCtx);
             var issueYdbRepository = new IssueYdbRepository(retryCtx);
 
+            schemaYdbRepository.dropSchema();
             schemaYdbRepository.createSchema();
 
             var first = issueYdbRepository.addIssue("Ticket 1", "Author 1");
@@ -40,8 +41,6 @@ public static void main(String[] args) throws InterruptedException {
             for (var ticket : issueYdbRepository.findAll()) {
                 printIssue(ticket);
             }
-
-            schemaYdbRepository.dropSchema();
         }
     }
 
diff --git a/dev-1/lesson-7.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java b/dev-1/lesson-7.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java
@@ -80,10 +80,8 @@ public void dropSchema() {
         retryCtx.supplyResult(
                 session -> session.createQuery(
                         """
-                                ALTER TABLE issues DROP CHANGEFEED updates;
-                                                                
-                                DROP TABLE issues;
-                                DROP TABLE links;
+                                DROP TABLE IF EXISTS issues;
+                                DROP TABLE IF EXISTS links;
                                 """, TxMode.NONE
                 ).execute()
         ).join().getStatus().expectSuccess("Can't drop tables");
diff --git a/dev-1/lesson-8.1/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-8.1/java/src/main/java/tech/ydb/app/Application.java
@@ -20,6 +20,7 @@ public static void main(String[] args) {
             var schemaYdbRepository = new SchemaYdbRepository(retryCtx);
             var issueYdbRepository = new IssueYdbRepository(retryCtx);
 
+            schemaYdbRepository.dropSchema();
             schemaYdbRepository.createSchema();
             issueYdbRepository.saveAll(List.of(
                     new TitleAuthor("Ticket 1", "Author 1"),
@@ -50,8 +51,6 @@ public static void main(String[] args) {
             for (var ticket : issueYdbRepository.findAll()) {
                 printIssue(ticket);
             }
-
-            schemaYdbRepository.dropSchema();
         }
     }
 
diff --git a/dev-1/lesson-8.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java b/dev-1/lesson-8.1/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java
@@ -78,10 +78,8 @@ public void dropSchema() {
         retryCtx.supplyResult(
                 session -> session.createQuery(
                         """
-                                ALTER TABLE issues DROP CHANGEFEED updates;
-
-                                DROP TABLE issues;
-                                DROP TABLE links;
+                                DROP TABLE IF EXISTS issues;
+                                DROP TABLE IF EXISTS links;
                                 """, TxMode.NONE
                 ).execute()
         ).join().getStatus().expectSuccess("Can't drop table issues");
diff --git a/dev-1/lesson-8.2/java/src/main/java/tech/ydb/app/Application.java b/dev-1/lesson-8.2/java/src/main/java/tech/ydb/app/Application.java
@@ -31,6 +31,7 @@ public static void main(String[] args) {
             var issueYdbRepository = new IssueYdbRepository(retryCtx);
             var nativeApiYdbRepository = new KeyValueApiYdbRepository(retryTableCtx);
 
+            schemaYdbRepository.dropSchema();
             schemaYdbRepository.createSchema();
 
             var titleAuthorList = new ArrayList<TitleAuthor>();
@@ -71,8 +72,6 @@ public static void main(String[] args) {
             for (var issue : nativeApiYdbRepository.readRows("/local/issues", lastIssue.id())) {
                 printIssue(issue);
             }
-
-            schemaYdbRepository.dropSchema();
         }
     }
 
diff --git a/dev-1/lesson-8.2/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java b/dev-1/lesson-8.2/java/src/main/java/tech/ydb/app/SchemaYdbRepository.java
@@ -80,10 +80,8 @@ public void dropSchema() {
         retryCtx.supplyResult(
                 session -> session.createQuery(
                         """
-                                ALTER TABLE issues DROP CHANGEFEED updates;
-
-                                DROP TABLE issues;
-                                DROP TABLE links;
+                                DROP TABLE IF EXISTS issues;
+                                DROP TABLE IF EXISTS links;
                                 """, TxMode.NONE
                 ).execute()
         ).join().getStatus().expectSuccess("Can't drop table issues");

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public static void main(String[] args) {`
`19`	`19`	`var schemaYdbRepository = new SchemaYdbRepository(retryCtx);`
`20`	`20`	`var issueYdbRepository = new IssueYdbRepository(retryCtx);`
`21`	`21`
	`22`	`+ schemaYdbRepository.dropSchema();`
`22`	`23`	`schemaYdbRepository.createSchema();`
`23`	`24`
`24`	`25`	`issueYdbRepository.addIssue("Ticket 1");`
`@@ -28,8 +29,6 @@ public static void main(String[] args) {`
`28`	`29`	`for (var ticket : issueYdbRepository.findAll()) {`
`29`	`30`	`System.out.println("Ticket: {id: " + ticket.id() + ", title: " + ticket.title() + ", timestamp: " + ticket.now() + "}");`
`30`	`31`	`}`
`31`		`-`
`32`		`- schemaYdbRepository.dropSchema();`
`33`	`32`	`}`
`34`	`33`	`}`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public static void main(String[] args) throws InterruptedException {`
`21`	`21`	`var schemaYdbRepository = new SchemaYdbRepository(retryCtx);`
`22`	`22`	`var issueYdbRepository = new IssueYdbRepository(retryCtx);`
`23`	`23`
	`24`	`+ schemaYdbRepository.dropSchema();`
`24`	`25`	`schemaYdbRepository.createSchema();`
`25`	`26`
`26`	`27`	`issueYdbRepository.addIssue("Ticket 1", "Author 1");`
`@@ -58,8 +59,6 @@ public static void main(String[] args) throws InterruptedException {`
`58`	`59`	`for (var ticket : issueYdbRepository.findAll()) {`
`59`	`60`	`printIssue(ticket);`
`60`	`61`	`}`
`61`		`-`
`62`		`- schemaYdbRepository.dropSchema();`
`63`	`62`	`}`
`64`	`63`	`}`
`65`	`64`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public static void main(String[] args) throws InterruptedException {`
`22`	`22`	`var schemaYdbRepository = new SchemaYdbRepository(retryCtx);`
`23`	`23`	`var issueYdbRepository = new IssueYdbRepository(retryCtx);`
`24`	`24`
	`25`	`+ schemaYdbRepository.dropSchema();`
`25`	`26`	`schemaYdbRepository.createSchema();`
`26`	`27`
`27`	`28`	`var first = issueYdbRepository.addIssue("Ticket 1", "Author 1");`
`@@ -40,8 +41,6 @@ public static void main(String[] args) throws InterruptedException {`
`40`	`41`	`for (var ticket : issueYdbRepository.findAll()) {`
`41`	`42`	`printIssue(ticket);`
`42`	`43`	`}`
`43`		`-`
`44`		`- schemaYdbRepository.dropSchema();`
`45`	`44`	`}`
`46`	`45`	`}`
`47`	`46`