From 3db285b4cff124e62633fb2445cb3eb099cf331c Mon Sep 17 00:00:00 2001 From: XudongXie Date: Thu, 12 Sep 2024 20:25:05 +0800 Subject: [PATCH] refractor --- .../main/java/Generator/OpenGaussGenerator.java | 9 ++++----- .../DropEndNode.java} | 8 ++++---- .../DropTableNode.java => Drop/DropNode.java} | 8 ++++---- .../DropObjNameNode.java} | 8 ++++---- .../DropOptionNode.java} | 8 ++++---- .../src/main/java/Parser/OracleParser.java | 16 ++++++++-------- 6 files changed, 28 insertions(+), 29 deletions(-) rename sqlTranslate/src/main/java/Parser/AST/{DropTable/DropTableEndNode.java => Drop/DropEndNode.java} (67%) rename sqlTranslate/src/main/java/Parser/AST/{DropTable/DropTableNode.java => Drop/DropNode.java} (69%) rename sqlTranslate/src/main/java/Parser/AST/{DropTable/DropTableNameNode.java => Drop/DropObjNameNode.java} (68%) rename sqlTranslate/src/main/java/Parser/AST/{DropTable/DropTableOptionNode.java => Drop/DropOptionNode.java} (67%) diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java index 03ce3eed3..9718f9862 100644 --- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java +++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java @@ -5,12 +5,11 @@ import Parser.AST.ASTNode; import Parser.AST.CreateTable.ColumnNode; import Parser.AST.CreateTable.CreateTabNode; import Exception.GenerateFailedException; -import Parser.AST.DropTable.DropTableNode; -import Parser.AST.DropTable.DropTableOptionNode; +import Parser.AST.Drop.DropNode; +import Parser.AST.Drop.DropOptionNode; import Parser.AST.Insert.InsertNode; import Parser.AST.Join.JoinConditionNode; import Parser.AST.Join.JoinSourceTabNode; -import Parser.AST.Join.JoinTypeNode; import Parser.AST.Select.SelectNode; import java.util.ArrayList; @@ -33,7 +32,7 @@ public class OpenGaussGenerator { else if (node instanceof InsertNode) { return GenInsertSQL(node); } - else if (node instanceof DropTableNode) { + else if (node instanceof DropNode) { return GenDropTableSQL(node); } else if (node instanceof SelectNode) { @@ -90,7 +89,7 @@ public class OpenGaussGenerator { private void visitDrop(ASTNode node) { try { - if (node instanceof DropTableOptionNode) { + if (node instanceof DropOptionNode) { List tokens = new ArrayList<>(); tokens.add(new Token(Token.TokenType.KEYWORD, "CASCADE")); tokens.add(new Token(Token.TokenType.KEYWORD, "CONSTRAINTS")); diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java similarity index 67% rename from sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java rename to sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java index 818f2aed8..25e40b276 100644 --- a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java +++ b/sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java @@ -1,15 +1,15 @@ -package Parser.AST.DropTable; +package Parser.AST.Drop; import Lexer.Token; import Parser.AST.ASTNode; import java.util.List; -public class DropTableEndNode extends ASTNode { - public DropTableEndNode(ASTNode node) { +public class DropEndNode extends ASTNode { + public DropEndNode(ASTNode node) { super(node); } - public DropTableEndNode(List tokens) { + public DropEndNode(List tokens) { super(tokens); } diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java b/sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java similarity index 69% rename from sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java rename to sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java index 9c4ebf904..6ed93096d 100644 --- a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java +++ b/sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java @@ -1,15 +1,15 @@ -package Parser.AST.DropTable; +package Parser.AST.Drop; import Lexer.Token; import Parser.AST.ASTNode; import java.util.List; -public class DropTableNode extends ASTNode { - public DropTableNode(ASTNode node) { +public class DropNode extends ASTNode { + public DropNode(ASTNode node) { super(node); } - public DropTableNode(List tokens) { + public DropNode(List tokens) { super(tokens); } diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java b/sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java similarity index 68% rename from sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java rename to sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java index 649d24b94..3fb4e88a0 100644 --- a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java +++ b/sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java @@ -1,15 +1,15 @@ -package Parser.AST.DropTable; +package Parser.AST.Drop; import Lexer.Token; import Parser.AST.ASTNode; import java.util.List; -public class DropTableNameNode extends ASTNode { - public DropTableNameNode(ASTNode node) { +public class DropObjNameNode extends ASTNode { + public DropObjNameNode(ASTNode node) { super(node); } - public DropTableNameNode(List tokens) { + public DropObjNameNode(List tokens) { super(tokens); } diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java similarity index 67% rename from sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java rename to sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java index 4e21a67f9..30d0ed42c 100644 --- a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java +++ b/sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java @@ -1,16 +1,16 @@ -package Parser.AST.DropTable; +package Parser.AST.Drop; import Lexer.Token; import Parser.AST.ASTNode; import java.util.List; -public class DropTableOptionNode extends ASTNode { - public DropTableOptionNode(ASTNode node) { +public class DropOptionNode extends ASTNode { + public DropOptionNode(ASTNode node) { super(node); } - public DropTableOptionNode(List tokens) { + public DropOptionNode(List tokens) { super(tokens); } diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java index 4cdac2a86..82eb914c1 100644 --- a/sqlTranslate/src/main/java/Parser/OracleParser.java +++ b/sqlTranslate/src/main/java/Parser/OracleParser.java @@ -9,10 +9,10 @@ import Parser.AST.CaseWhen.CaseElseNode; import Parser.AST.CaseWhen.CaseEndNode; import Parser.AST.CaseWhen.CaseThenNode; import Parser.AST.CreateTable.*; -import Parser.AST.DropTable.DropTableEndNode; -import Parser.AST.DropTable.DropTableNameNode; -import Parser.AST.DropTable.DropTableNode; -import Parser.AST.DropTable.DropTableOptionNode; +import Parser.AST.Drop.DropEndNode; +import Parser.AST.Drop.DropObjNameNode; +import Parser.AST.Drop.DropNode; +import Parser.AST.Drop.DropOptionNode; import Parser.AST.Insert.InsertDataNode; import Parser.AST.Insert.InsertEndNode; import Parser.AST.Insert.InsertNode; @@ -322,14 +322,14 @@ public class OracleParser { catch (ParseFailedException e) { e.printStackTrace(); } - ASTNode root = new DropTableNode(tokens); + ASTNode root = new DropNode(tokens); ASTNode currentNode = root; for (int i = 2; i < parseTokens.size(); i++) { if (parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) { tokens = new ArrayList<>(); tokens.add(parseTokens.get(i)); - ASTNode childNode = new DropTableNameNode(tokens); + ASTNode childNode = new DropObjNameNode(tokens); currentNode.addChild(childNode); currentNode = childNode; } @@ -340,14 +340,14 @@ public class OracleParser { tokens.add(parseTokens.get(i + 1)); i++; } - ASTNode childNode = new DropTableOptionNode(tokens); + ASTNode childNode = new DropOptionNode(tokens); currentNode.addChild(childNode); currentNode = childNode; } else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) { tokens = new ArrayList<>(); tokens.add(parseTokens.get(i)); - ASTNode childNode = new DropTableEndNode(tokens); + ASTNode childNode = new DropEndNode(tokens); currentNode.addChild(childNode); currentNode = childNode; }