[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-schemafuzz] branch master updated: Fixed path findin
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-schemafuzz] branch master updated: Fixed path finding implementation.Nu, ber of Mutation done surpasses maximum potential changes |
|
Date: |
Fri, 18 May 2018 13:34:54 +0200 |
This is an automated email from the git hooks/post-receive script.
erwan-ulrich pushed a commit to branch master
in repository schemafuzz.
The following commit(s) were added to refs/heads/master by this push:
new 874d951 Fixed path finding implementation.Nu,ber of Mutation done
surpasses maximum potential changes
874d951 is described below
commit 874d951d64f8fb0fe1cd9d58b8cd6bb33a8ffed8
Author: Feideus <address@hidden>
AuthorDate: Fri May 18 13:34:45 2018 +0200
Fixed path finding implementation.Nu,ber of Mutation done surpasses maximum
potential changes
---
.../java/org/schemaspy/model/GenericTreeNode.java | 37 +++-----
.../compile/default-compile/createdFiles.lst | 12 +--
.../default-testCompile/createdFiles.lst | 4 +-
.../testCompile/default-testCompile/inputFiles.lst | 102 ++++++++++-----------
4 files changed, 74 insertions(+), 81 deletions(-)
diff --git a/src/main/java/org/schemaspy/model/GenericTreeNode.java
b/src/main/java/org/schemaspy/model/GenericTreeNode.java
index 7e435ad..f3f7d7d 100644
--- a/src/main/java/org/schemaspy/model/GenericTreeNode.java
+++ b/src/main/java/org/schemaspy/model/GenericTreeNode.java
@@ -320,6 +320,10 @@ public class GenericTreeNode {
public boolean inject(SchemaAnalyzer analyzer, boolean undo) throws
Exception
{
+ if(undo)
+ System.out.println("INJECT");
+ else
+ System.out.println("UNDOING");
String theQuery = updateQueryBuilder(undo);
try
{
@@ -339,7 +343,6 @@ public class GenericTreeNode {
{
try
{
- System.out.println("UNDOING !");
return this.inject(analyzer, true);
}
catch(Exception e)
@@ -462,22 +465,8 @@ public class GenericTreeNode {
public boolean undoToMutation(GenericTreeNode target, SchemaAnalyzer
analyzer) throws Exception
{
- ArrayList<GenericTreeNode> pathToMutation = findPathToMutation(target);
- ArrayList<GenericTreeNode> goingUp;
- ArrayList<GenericTreeNode> goingDown;
-
- for(int j = 0; j < pathToMutation.size();j++)
- {
- if(j < pathToMutation.size()-1)
- {
- if(!
pathToMutation.get(j).getParent().compare(pathToMutation.get(j+1)))
- {
- goingUp = (ArrayList) pathToMutation.subList(0, j);
- goingDown = (ArrayList) pathToMutation.subList(j+1,
pathToMutation.size()-1);
- }
-
- }
- }
+ ArrayList<GenericTreeNode> goingUp = findPathToMutation(target).get(0);
+ ArrayList<GenericTreeNode> goingDown =
findPathToMutation(target).get(1);;
for(int i = 0; i < goingUp.size();i++)
{
@@ -546,9 +535,9 @@ public class GenericTreeNode {
return "[ MUT ID "+this.getId()+" Depth = "+this.getDepth()+" SG
"+this.chosenChange+"]";
}
- public ArrayList<GenericTreeNode> findPathToMutation(GenericTreeNode
target)
+ public ArrayList<ArrayList<GenericTreeNode>>
findPathToMutation(GenericTreeNode target)
{
- ArrayList<GenericTreeNode> finalPath = new ArrayList<GenericTreeNode>();
+ ArrayList<ArrayList<GenericTreeNode>> finalPath = new
ArrayList<ArrayList<GenericTreeNode>>();
ArrayList<GenericTreeNode> thisPath = new ArrayList<GenericTreeNode>();
ArrayList<GenericTreeNode> targetPath = new ArrayList<GenericTreeNode>();
@@ -584,8 +573,8 @@ public class GenericTreeNode {
}
Collections.reverse(targetPath);
- finalPath.addAll(thisPath);
- finalPath.addAll(targetPath);
+ finalPath.add(thisPath);
+ finalPath.add(targetPath);
System.out.println("this = "+this);
System.out.println("target = "+target);
@@ -602,7 +591,11 @@ public class GenericTreeNode {
public boolean isSingleChangeOnCurrentPath()
{
- for(GenericTreeNode mutOnPath : this.findPathToMutation(rootMutation))
+ ArrayList<GenericTreeNode> finalPath = new ArrayList<GenericTreeNode>();
+ finalPath.addAll(this.findPathToMutation(rootMutation).get(0));
+ finalPath.addAll(this.findPathToMutation(rootMutation).get(1));
+
+ for(GenericTreeNode mutOnPath : finalPath)
{
if(mutOnPath.getChosenChange().compare(this.getChosenChange()))
return false;
diff --git
a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index df6fc70..0550ac3 100644
---
a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++
b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -9,8 +9,8 @@ org/schemaspy/TableOrderer.class
org/schemaspy/util/DbSpecificConfig.class
org/schemaspy/model/InvalidConfigurationException.class
org/schemaspy/service/DatabaseService$ThreadedTableCreator.class
-org/schemaspy/model/xml/TableMeta.class
org/schemaspy/model/ConnectionFailure.class
+org/schemaspy/model/xml/TableMeta.class
org/schemaspy/service/SqlService.class
org/schemaspy/service/ViewService.class
org/schemaspy/cli/ConfigFileArgumentParser.class
@@ -21,8 +21,8 @@ org/schemaspy/service/TableService$1.class
org/schemaspy/model/ConsoleProgressListener.class
org/schemaspy/DbDriverLoader.class
org/schemaspy/db/config/ResolutionInfo.class
-org/schemaspy/model/Catalog.class
org/schemaspy/db/exceptions/RuntimeIOException.class
+org/schemaspy/model/Catalog.class
org/schemaspy/model/xml/ForeignKeyMeta.class
org/schemaspy/util/CaseInsensitiveMap.class
org/schemaspy/util/LineWriter.class
@@ -48,8 +48,8 @@ org/schemaspy/model/ProcessExecutionException.class
org/schemaspy/util/DbSpecificOption.class
org/schemaspy/util/ConnectionURLBuilder.class
org/schemaspy/model/Routine.class
-org/schemaspy/cli/ConfigFileArgument.class
org/schemaspy/model/ProgressListener.class
+org/schemaspy/cli/ConfigFileArgument.class
org/schemaspy/Main.class
org/schemaspy/model/View.class
org/schemaspy/Config.class
@@ -61,12 +61,12 @@ org/schemaspy/util/ResourceNotFoundException.class
org/schemaspy/service/DatabaseService$TableCreator.class
org/schemaspy/model/QueryResponse.class
org/schemaspy/TableOrderer$1TrimComparator.class
-org/schemaspy/model/GenericTreeTraversalOrderEnum.class
org/schemaspy/model/DatabaseObject.class
+org/schemaspy/model/GenericTreeTraversalOrderEnum.class
org/schemaspy/util/ResultSetDumper.class
org/schemaspy/DbAnalyzer.class
-org/schemaspy/model/ImpliedForeignKeyConstraint.class
org/schemaspy/model/Table$ByColumnIdComparator.class
+org/schemaspy/model/ImpliedForeignKeyConstraint.class
org/schemaspy/model/xml/SchemaMeta.class
org/schemaspy/model/TableColumn.class
org/schemaspy/service/DatabaseService.class
@@ -87,6 +87,6 @@ org/schemaspy/db/config/PropertiesFinder.class
org/schemaspy/model/ForeignKey.class
org/schemaspy/service/DatabaseService$1.class
org/schemaspy/SchemaAnalyzer.class
-org/schemaspy/model/ForeignKeyConstraint.class
org/schemaspy/model/Database.class
+org/schemaspy/model/ForeignKeyConstraint.class
org/schemaspy/util/ConsolePasswordReader.class
diff --git
a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
index eaa22a6..802a5ed 100644
---
a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++
b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -1,8 +1,8 @@
org/schemaspy/model/TableFullNameTest.class
org/schemaspy/TableOrdererTest.class
org/schemaspy/DbDriverLoaderTest.class
-org/schemaspy/cli/PropertyFileDefaultProviderTest.class
org/schemaspy/model/TableIndexTest.class
+org/schemaspy/cli/PropertyFileDefaultProviderTest.class
org/schemaspy/testing/IgnoreUsingXPath.class
org/testcontainers/containers/InformixContainer.class
org/schemaspy/cli/ConfigFileArgumentParserTest.class
@@ -19,8 +19,8 @@ org/schemaspy/validator/NameValidatorTest.class
org/schemaspy/integrationtesting/StackTraceLoggingIT.class
org/dummy/DummyDriver.class
org/schemaspy/testcontainer/OracleIT.class
-org/schemaspy/testcontainer/MysqlKeyWordTableIT.class
org/schemaspy/testcontainer/InformixIndexIT.class
+org/schemaspy/testcontainer/MysqlKeyWordTableIT.class
org/schemaspy/testcontainer/MysqlHTMLIT.class
org/schemaspy/model/InvalidConfigurationExceptionTest.class
org/schemaspy/validator/NameValidatorIT.class
diff --git
a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
index 48a9114..6a97d75 100644
---
a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++
b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -1,51 +1,51 @@
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/service/DatabaseServiceIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testing/AssumeClassIsPresentRule.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/cli/CommandLineArgumentParserTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/cli/PropertyFileDefaultProviderTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/db/config/PropertiesResolverTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/util/ConnectionURLBuilderTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testing/Logger.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/db/config/PropertiesFinderTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlSpacesIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/dummy/DummyDriverUnsatisfiedCtor.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/util/CaseInsensitiveMapTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2KeywordIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/model/RoutineTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/model/TableColumnMetaTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/MSSQLServerIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testing/IgnoreUsingXPath.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/ConfigTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/model/TableFullNameTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/service/TableServiceTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/InformixIndexXMLIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/util/DbSpecificOptionTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testing/H2MemoryRule.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/model/SchemaTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/model/TableIndexTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlSpacesNoDotsIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlXMLIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/cli/ConfigFileArgumentParserTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/TableOrdererTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/integrationtesting/SchemaMetaIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/util/RailsNamingTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlKeyWordTableIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/DbDriverLoaderTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/validator/NameValidatorIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/model/CatalogTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/testcontainers/containers/InformixContainer.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2ViewIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/dummy/DummyDriverUnsatisfiedConnect.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/model/InvalidConfigurationExceptionTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/DbAnalyzerTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlRoutinesIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testing/LoggingRule.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/integrationtesting/StackTraceLoggingIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2SpacesIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/dummy/DummyDriver.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/OracleIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/integrationtesting/OracleSpacesIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/util/InflectionTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/util/ResourceFinderTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/validator/NameValidatorTest.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlHTMLIT.java
-/home/feideus/Work/schemafuzz/src/test/java/org/schemaspy/testcontainer/InformixIndexIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/InformixIndexIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/util/RailsNamingTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/MSSQLServerIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/testcontainers/containers/InformixContainer.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlKeyWordTableIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/validator/NameValidatorTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlRoutinesIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/util/InflectionTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/cli/ConfigFileArgumentParserTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2ViewIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/integrationtesting/StackTraceLoggingIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/service/TableServiceTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/util/ResourceFinderTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/model/TableColumnMetaTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/model/SchemaTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testing/LoggingRule.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/util/CaseInsensitiveMapTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlSpacesIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testing/IgnoreUsingXPath.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/validator/NameValidatorIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/util/DbSpecificOptionTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/model/TableIndexTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/model/TableFullNameTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/cli/CommandLineArgumentParserTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/OracleIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlXMLIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/model/InvalidConfigurationExceptionTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/integrationtesting/SchemaMetaIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testing/AssumeClassIsPresentRule.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/dummy/DummyDriverUnsatisfiedCtor.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/util/ConnectionURLBuilderTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlHTMLIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/model/CatalogTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/dummy/DummyDriver.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/InformixIndexXMLIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/service/DatabaseServiceIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/DbAnalyzerTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlSpacesNoDotsIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testing/Logger.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2KeywordIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/model/RoutineTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/db/config/PropertiesFinderTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/DbDriverLoaderTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/ConfigTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/testing/H2MemoryRule.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/TableOrdererTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/integrationtesting/OracleSpacesIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/db/config/PropertiesResolverTest.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2SpacesIT.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/dummy/DummyDriverUnsatisfiedConnect.java
+/home/feideus/Work/GnuNet/schemafuzz/src/test/java/org/schemaspy/cli/PropertyFileDefaultProviderTest.java
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-schemafuzz] branch master updated: Fixed path finding implementation.Nu, ber of Mutation done surpasses maximum potential changes,
gnunet <=