From d9f6aee7db2e471a2607870ed1ba2903c103290b Mon Sep 17 00:00:00 2001 From: "dev-mend-for-github.amrom.workers.dev[bot]" <51963704+dev-mend-for-github.amrom.workers.dev[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 13:09:42 +0000 Subject: [PATCH 01/10] Add .whitesource configuration file --- .whitesource | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .whitesource diff --git a/.whitesource b/.whitesource new file mode 100644 index 0000000..8d369cd --- /dev/null +++ b/.whitesource @@ -0,0 +1,41 @@ +{ + "scanSettings": { + "configMode": "AUTO", + "configExternalURL": "", + "projectToken": "", + "baseBranches": [] + }, + "scanSettingsSAST": { + "enableScan": false, + "scanPullRequests": false, + "incrementalScan": true, + "baseBranches": [], + "snippetSize": 10 + }, + "checkRunSettings": { + "vulnerableCheckRunConclusionLevel": "failure", + "displayMode": "diff", + "useMendCheckNames": true + }, + "checkRunSettingsSAST": { + "checkRunConclusionLevel": "failure", + "severityThreshold": "high" + }, + "issueSettings": { + "minSeverityLevel": "LOW", + "issueType": "DEPENDENCY" + }, + "remediateSettings": { + "workflowRules": { + "enabled": true + } + }, + "imageSettings":{ + "imageTracing":{ + "enableImageTracingPR": false, + "addRepositoryCoordinate": false, + "addDockerfilePath": false, + "addMendIdentifier": false + } + } +} \ No newline at end of file From eeb6b77d7b70f59b2ae9a63436c68f355ab151ad Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 21:21:05 +0200 Subject: [PATCH 02/10] Add reachability true to .witesouce --- .whitesource | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.whitesource b/.whitesource index 8d369cd..916b1a1 100644 --- a/.whitesource +++ b/.whitesource @@ -3,7 +3,8 @@ "configMode": "AUTO", "configExternalURL": "", "projectToken": "", - "baseBranches": [] + "baseBranches": [], + "enableReachability": true }, "scanSettingsSAST": { "enableScan": false, @@ -38,4 +39,4 @@ "addMendIdentifier": false } } -} \ No newline at end of file +} From 28f4a764856d9f77563f11a7b9e7f36a9c2b8c56 Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 21:53:03 +0200 Subject: [PATCH 03/10] comment out SqlToRelConverter --- .../java/com/github/quxiucheng/tutorial/rule/RuleTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java b/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java index f19732a..d996a1a 100644 --- a/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java +++ b/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java @@ -21,7 +21,7 @@ import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.dialect.MysqlSqlDialect; import org.apache.calcite.sql.parser.SqlParser; -import org.apache.calcite.sql2rel.SqlToRelConverter; +//import org.apache.calcite.sql2rel.SqlToRelConverter; import java.util.List; From d9e61d8204282b29edce6f3e739c3eb230978a81 Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 22:05:01 +0200 Subject: [PATCH 04/10] Comment out SqlDialectFactoryImpl --- .../java/com/github/quxiucheng/tutorial/rule/RuleTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java b/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java index d996a1a..c460298 100644 --- a/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java +++ b/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java @@ -17,7 +17,7 @@ import org.apache.calcite.rex.RexSqlStandardConvertletTable; import org.apache.calcite.rex.RexToSqlNodeConverter; import org.apache.calcite.rex.RexToSqlNodeConverterImpl; -import org.apache.calcite.sql.SqlDialectFactoryImpl; +//import org.apache.calcite.sql.SqlDialectFactoryImpl; import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.dialect.MysqlSqlDialect; import org.apache.calcite.sql.parser.SqlParser; From c7f480cdfcf17f0396294c4a20d290021e6d4fc4 Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 22:22:00 +0200 Subject: [PATCH 05/10] comment out SqlParser --- .../calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcite-tutorial-2-parser/parser-3-calcite-tutorial/src/main/java/com/github/quxiucheng/calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java b/calcite-tutorial-2-parser/parser-3-calcite-tutorial/src/main/java/com/github/quxiucheng/calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java index 0b8e449..06176d5 100755 --- a/calcite-tutorial-2-parser/parser-3-calcite-tutorial/src/main/java/com/github/quxiucheng/calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java +++ b/calcite-tutorial-2-parser/parser-3-calcite-tutorial/src/main/java/com/github/quxiucheng/calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java @@ -4,7 +4,7 @@ import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.dialect.MysqlSqlDialect; import org.apache.calcite.sql.parser.SqlParseException; -import org.apache.calcite.sql.parser.SqlParser; +//import org.apache.calcite.sql.parser.SqlParser; import org.apache.calcite.sql.pretty.SqlPrettyWriter; /** From 33c6dac591d768681ab1b2f560884a604c20c50a Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 22:26:52 +0200 Subject: [PATCH 06/10] comment out. SqlPrettyWriter --- .../calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcite-tutorial-2-parser/parser-3-calcite-tutorial/src/main/java/com/github/quxiucheng/calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java b/calcite-tutorial-2-parser/parser-3-calcite-tutorial/src/main/java/com/github/quxiucheng/calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java index 06176d5..2b63811 100755 --- a/calcite-tutorial-2-parser/parser-3-calcite-tutorial/src/main/java/com/github/quxiucheng/calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java +++ b/calcite-tutorial-2-parser/parser-3-calcite-tutorial/src/main/java/com/github/quxiucheng/calcite/parser/tutorial/SqlNodeSqlPrettyWriterSample.java @@ -5,7 +5,7 @@ import org.apache.calcite.sql.dialect.MysqlSqlDialect; import org.apache.calcite.sql.parser.SqlParseException; //import org.apache.calcite.sql.parser.SqlParser; -import org.apache.calcite.sql.pretty.SqlPrettyWriter; +//import org.apache.calcite.sql.pretty.SqlPrettyWriter; /** * @author quxiucheng From fbc0fdc0acb123d3ceb5b6e30832717b18c40741 Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 22:44:57 +0200 Subject: [PATCH 07/10] comment out CalciteConnectionConfigImpl --- .../tutorial/common/catalog/TutorialCalciteCatalogReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calcite-tutorial-common/src/main/java/com/github/quxiucheng/tutorial/common/catalog/TutorialCalciteCatalogReader.java b/calcite-tutorial-common/src/main/java/com/github/quxiucheng/tutorial/common/catalog/TutorialCalciteCatalogReader.java index 222e161..76bc982 100644 --- a/calcite-tutorial-common/src/main/java/com/github/quxiucheng/tutorial/common/catalog/TutorialCalciteCatalogReader.java +++ b/calcite-tutorial-common/src/main/java/com/github/quxiucheng/tutorial/common/catalog/TutorialCalciteCatalogReader.java @@ -1,8 +1,8 @@ package com.github.quxiucheng.tutorial.common.catalog; import com.github.quxiucheng.tutorial.common.data.MockData; -import org.apache.calcite.config.CalciteConnectionConfigImpl; -import org.apache.calcite.config.CalciteConnectionProperty; +//import org.apache.calcite.config.CalciteConnectionConfigImpl; +//import org.apache.calcite.config.CalciteConnectionProperty; import org.apache.calcite.jdbc.CalciteSchema; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.plan.ConventionTraitDef; From 38a046433e8e49c2249729f8647dc789670a2b94 Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 23:03:30 +0200 Subject: [PATCH 08/10] comment out RelToSqlConverter --- .../java/com/github/quxiucheng/tutorial/rule/RuleTester.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java b/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java index c460298..06de2a8 100644 --- a/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java +++ b/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java @@ -13,12 +13,12 @@ import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.RelRoot; import org.apache.calcite.rel.metadata.DefaultRelMetadataProvider; -import org.apache.calcite.rel.rel2sql.RelToSqlConverter; +//import org.apache.calcite.rel.rel2sql.RelToSqlConverter; import org.apache.calcite.rex.RexSqlStandardConvertletTable; import org.apache.calcite.rex.RexToSqlNodeConverter; import org.apache.calcite.rex.RexToSqlNodeConverterImpl; //import org.apache.calcite.sql.SqlDialectFactoryImpl; -import org.apache.calcite.sql.SqlNode; +//import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.dialect.MysqlSqlDialect; import org.apache.calcite.sql.parser.SqlParser; //import org.apache.calcite.sql2rel.SqlToRelConverter; From a0c90b6b8a4c53e4ec518ff52280666b067bb108 Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 23:16:18 +0200 Subject: [PATCH 09/10] Comment out DefaultRelMetadataProvider --- .../java/com/github/quxiucheng/tutorial/rule/RuleTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java b/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java index 06de2a8..d0e1871 100644 --- a/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java +++ b/calcite-tutorial-9-rule/src/main/java/com/github/quxiucheng/tutorial/rule/RuleTester.java @@ -12,7 +12,7 @@ import org.apache.calcite.plan.hep.HepProgramBuilder; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.RelRoot; -import org.apache.calcite.rel.metadata.DefaultRelMetadataProvider; +//import org.apache.calcite.rel.metadata.DefaultRelMetadataProvider; //import org.apache.calcite.rel.rel2sql.RelToSqlConverter; import org.apache.calcite.rex.RexSqlStandardConvertletTable; import org.apache.calcite.rex.RexToSqlNodeConverter; From 0c255221a3c56ebdc42282d6607eeb2be7316097 Mon Sep 17 00:00:00 2001 From: simagelfmanws Date: Mon, 4 Mar 2024 23:41:36 +0200 Subject: [PATCH 10/10] comment out schema.Table --- .../quxiucheng/tutorial/common/data/TutorialTableSchema.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcite-tutorial-common/src/main/java/com/github/quxiucheng/tutorial/common/data/TutorialTableSchema.java b/calcite-tutorial-common/src/main/java/com/github/quxiucheng/tutorial/common/data/TutorialTableSchema.java index 85f6ebf..222d6d6 100644 --- a/calcite-tutorial-common/src/main/java/com/github/quxiucheng/tutorial/common/data/TutorialTableSchema.java +++ b/calcite-tutorial-common/src/main/java/com/github/quxiucheng/tutorial/common/data/TutorialTableSchema.java @@ -10,7 +10,7 @@ import com.google.common.collect.Maps; import lombok.Getter; import lombok.NonNull; -import org.apache.calcite.schema.Table; +//import org.apache.calcite.schema.Table; import org.apache.calcite.schema.impl.AbstractSchema; import java.io.Serializable;