Skip to content
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

Add or modify encryption related codes #13364

Merged
merged 21 commits into from
Nov 13, 2024
Merged

Conversation

zhujt20
Copy link
Contributor

@zhujt20 zhujt20 commented Aug 31, 2024

Add or modify encryption related codes for encryption module realization.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, this is your first pull request in IoTDB project. Thanks for your contribution! IoTDB will be better because of you.

zhujt20 and others added 7 commits September 5, 2024 16:49
# Conflicts:
#	iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/parser/scan/TsFileInsertionEventScanParser.java
#	iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/fast/reader/CompactionAlignedChunkReader.java
#	pom.xml
# Conflicts:
#	pom.xml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove/Ignore this file

Comment on lines +124 to +127
Path tempDir = Files.createTempDirectory("");
tempDir.toFile().deleteOnExit();
String tsfileName =
TsFileNameGenerator.generateNewTsFileName(System.currentTimeMillis(), 1, 0, 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally, all files generated in tests should be put under the "target" directory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just do this like other tests which also need to generate tsfile. So I need to change the TempDirectory to "target"?

Comment on lines +130 to +132
TSFileConfig config = TSFileDescriptor.getInstance().getConfig();
config.setEncryptFlag("true");
config.setEncryptType("org.apache.tsfile.encrypt.AES128");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The configs should be rolled back after writing the file. (Maybe in the finally clause)

ResultSet resultSet = statement.executeQuery("select s1 from root.testsg1.d1");
Assert.fail();
} catch (Exception e) {
System.out.println(e.getMessage());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

@SteveYurongSu SteveYurongSu self-assigned this Nov 6, 2024
@SteveYurongSu SteveYurongSu merged commit e1cc229 into apache:master Nov 13, 2024
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants