-
-
Notifications
You must be signed in to change notification settings - Fork 361
perf: Gzip model serialization #2103
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
c738fbc
GZIP Serialization
bd8f0e0
GZIP Serialization
c79290c
Gzip serialization
d160fcd
Gzip serialization
dc657a7
Model serialization file formats.
097e421
Cleaning
7fabc4e
Cleaning
a777047
Licence
8175b59
Compressing serialized factory
29bb6e9
Compressing serialized factory
6b872d1
Junit tests
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
/** | ||
* Copyright (C) 2006-2018 INRIA and contributors | ||
* Spoon - http://spoon.gforge.inria.fr/ | ||
* | ||
* This software is governed by the CeCILL-C License under French law and | ||
* abiding by the rules of distribution of free software. You can use, modify | ||
* and/or redistribute the software under the terms of the CeCILL-C license as | ||
* circulated by CEA, CNRS and INRIA at http://www.cecill.info. | ||
* | ||
* This program is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the CeCILL-C License for more details. | ||
* | ||
* The fact that you are presently reading this means that you have had | ||
* knowledge of the CeCILL-C license and that you accept its terms. | ||
*/ | ||
package spoon.support; | ||
|
||
/** | ||
* Different types of compressions used, e.g. for serialization | ||
* @see SerializationModelStreamer | ||
*/ | ||
public enum CompressionType { | ||
|
||
NONE, | ||
GZIP; | ||
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
src/test/java/spoon/test/serializable/ModelStreamerTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
package spoon.test.serializable; | ||
|
||
import static org.junit.Assert.assertTrue; | ||
|
||
import java.io.File; | ||
import java.io.FileInputStream; | ||
import java.io.FileOutputStream; | ||
import java.io.IOException; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.stream.Collectors; | ||
|
||
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
import spoon.Launcher; | ||
import spoon.reflect.declaration.CtElement; | ||
import spoon.reflect.factory.Factory; | ||
import spoon.reflect.visitor.Filter; | ||
import spoon.support.CompressionType; | ||
import spoon.support.SerializationModelStreamer; | ||
|
||
public class ModelStreamerTest { | ||
|
||
private final String filename = "./src/test/resources/serialization/factory.ser"; | ||
|
||
private Factory factory; | ||
|
||
private File file; | ||
|
||
@Before | ||
public void setUp() { | ||
Launcher launcher = new Launcher(); | ||
launcher.addInputResource("./src/main/java/spoon/reflect/declaration"); | ||
launcher.buildModel(); | ||
this.factory = launcher.getFactory(); | ||
file = new File(filename); | ||
file.deleteOnExit(); | ||
} | ||
|
||
@Test | ||
public void testGZipCompression() throws IOException { | ||
|
||
new SerializationModelStreamer().save(factory, new FileOutputStream(file)); | ||
Factory factoryFromFile = new SerializationModelStreamer().load(new FileInputStream(file)); | ||
compareFactoryModels(factory, factoryFromFile); | ||
} | ||
|
||
@Test | ||
public void testNoCompression() throws IOException { | ||
factory.getEnvironment().setCompressionType(CompressionType.NONE); | ||
new SerializationModelStreamer().save(factory, new FileOutputStream(file)); | ||
Factory factoryFromFile = new SerializationModelStreamer().load(new FileInputStream(file)); | ||
compareFactoryModels(factory, factoryFromFile); | ||
} | ||
|
||
private void compareFactoryModels(Factory factory, Factory factoryFromFile) { | ||
Filter<CtElement> filter = new Filter<CtElement>() { | ||
public boolean matches(CtElement element) { | ||
return true; | ||
}; | ||
}; | ||
|
||
List<CtElement> elementsFactory = factory.getModel().getRootPackage().filterChildren(filter).list(); | ||
List<CtElement> elementsFactoryFromFile = factoryFromFile.getModel().getRootPackage().filterChildren(filter).list(); | ||
|
||
assertTrue("Model before & after serialization must have the same number of elements", | ||
elementsFactory.size() == elementsFactoryFromFile.size()); | ||
|
||
List<String> st1 = elementsFactory.stream().map(CtElement::toString).collect(Collectors.toList()); | ||
List<String> st2 = elementsFactoryFromFile.stream().map(CtElement::toString).collect(Collectors.toList()); | ||
Collections.sort(st1); | ||
Collections.sort(st2); | ||
|
||
for (int i = 0; i < st1.size(); i++) { | ||
assertTrue("All CtElement of the model should be striclty identical before & after serialization", | ||
st1.get(i).equals(st2.get(i))); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would suggest to specify explicitely that you're using GZIP compression type (e.g. to set it in the environment): the default value might evolve in the future.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right! I'll do that tonight after work.