Skip to content

Commit 485f330

Browse files
zhujt20zhujt20
committed
add Deprecated symbol
1 parent 9bd5167 commit 485f330

22 files changed

Lines changed: 111 additions & 108 deletions

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/performer/constant/CrossCompactionPerformer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public static CrossCompactionPerformer getCrossCompactionPerformer(String name)
4040
"Illegal compaction performer for cross compaction " + name);
4141
}
4242

43+
@Deprecated
4344
public ICrossCompactionPerformer createInstance() {
4445
switch (this) {
4546
case READ_POINT:

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/performer/constant/InnerSeqCompactionPerformer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public static InnerSeqCompactionPerformer getInnerSeqCompactionPerformer(String
4040
"Illegal compaction performer for seq inner compaction " + name);
4141
}
4242

43+
@Deprecated
4344
public ISeqCompactionPerformer createInstance() {
4445
switch (this) {
4546
case READ_CHUNK:

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/performer/constant/InnerUnseqCompactionPerformer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public static InnerUnseqCompactionPerformer getInnerUnseqCompactionPerformer(Str
4040
"Illegal compaction performer for unseq inner compaction " + name);
4141
}
4242

43+
@Deprecated
4344
public IUnseqCompactionPerformer createInstance() {
4445
switch (this) {
4546
case READ_POINT:

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/performer/impl/FastCompactionPerformer.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public class FastCompactionPerformer
100100

101101
private EncryptParameter encryptParameter;
102102

103+
@Deprecated
103104
public FastCompactionPerformer(
104105
List<TsFileResource> seqFiles,
105106
List<TsFileResource> unseqFiles,
@@ -136,6 +137,7 @@ public FastCompactionPerformer(
136137
this.encryptParameter = encryptParameter;
137138
}
138139

140+
@Deprecated
139141
public FastCompactionPerformer(boolean isCrossCompaction) {
140142
this.isCrossCompaction = isCrossCompaction;
141143
this.encryptParameter =

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/performer/impl/ReadChunkCompactionPerformer.java‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.estimator.ReadChunkInnerCompactionEstimator;
3636
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
3737
import org.apache.iotdb.db.storageengine.rescon.memory.SystemInfo;
38+
import org.apache.iotdb.db.utils.EncryptDBUtils;
3839

3940
import org.apache.tsfile.common.conf.TSFileDescriptor;
4041
import org.apache.tsfile.encrypt.EncryptParameter;
@@ -70,28 +71,48 @@ public class ReadChunkCompactionPerformer implements ISeqCompactionPerformer {
7071

7172
private EncryptParameter firstEncryptParameter;
7273

74+
@Deprecated
7375
public ReadChunkCompactionPerformer(List<TsFileResource> sourceFiles, TsFileResource targetFile) {
7476
this(sourceFiles, Collections.singletonList(targetFile));
7577
}
7678

79+
public ReadChunkCompactionPerformer(
80+
List<TsFileResource> sourceFiles,
81+
TsFileResource targetFile,
82+
EncryptParameter encryptParameter) {
83+
this(sourceFiles, Collections.singletonList(targetFile), encryptParameter);
84+
}
85+
86+
@Deprecated
7787
public ReadChunkCompactionPerformer(
7888
List<TsFileResource> sourceFiles, List<TsFileResource> targetFiles) {
7989
setSourceFiles(sourceFiles);
8090
setTargetFiles(targetFiles);
81-
this.firstEncryptParameter =
82-
new EncryptParameter(
83-
TSFileDescriptor.getInstance().getConfig().getEncryptType(),
84-
TSFileDescriptor.getInstance().getConfig().getEncryptKey());
91+
this.firstEncryptParameter = EncryptDBUtils.getDefaultFirstEncryptParam();
92+
}
93+
94+
public ReadChunkCompactionPerformer(
95+
List<TsFileResource> sourceFiles,
96+
List<TsFileResource> targetFiles,
97+
EncryptParameter encryptParameter) {
98+
setSourceFiles(sourceFiles);
99+
setTargetFiles(targetFiles);
100+
this.firstEncryptParameter = encryptParameter;
85101
}
86102

103+
@Deprecated
87104
public ReadChunkCompactionPerformer(List<TsFileResource> sourceFiles) {
88105
setSourceFiles(sourceFiles);
89-
this.firstEncryptParameter =
90-
new EncryptParameter(
91-
TSFileDescriptor.getInstance().getConfig().getEncryptType(),
92-
TSFileDescriptor.getInstance().getConfig().getEncryptKey());
106+
this.firstEncryptParameter = EncryptDBUtils.getDefaultFirstEncryptParam();
107+
}
108+
109+
public ReadChunkCompactionPerformer(
110+
List<TsFileResource> sourceFiles, EncryptParameter encryptParameter) {
111+
setSourceFiles(sourceFiles);
112+
this.firstEncryptParameter = encryptParameter;
93113
}
94114

115+
@Deprecated
95116
public ReadChunkCompactionPerformer() {
96117
this.firstEncryptParameter =
97118
new EncryptParameter(

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/performer/impl/ReadPointCompactionPerformer.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import org.apache.iotdb.db.storageengine.dataregion.read.QueryDataSource;
4444
import org.apache.iotdb.db.storageengine.dataregion.read.control.QueryResourceManager;
4545
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
46+
import org.apache.iotdb.db.utils.EncryptDBUtils;
4647

47-
import org.apache.tsfile.common.conf.TSFileDescriptor;
4848
import org.apache.tsfile.common.constant.TsFileConstant;
4949
import org.apache.tsfile.encrypt.EncryptParameter;
5050
import org.apache.tsfile.encrypt.EncryptUtils;
@@ -88,17 +88,15 @@ public class ReadPointCompactionPerformer
8888

8989
private EncryptParameter encryptParameter;
9090

91+
@Deprecated
9192
public ReadPointCompactionPerformer(
9293
List<TsFileResource> seqFiles,
9394
List<TsFileResource> unseqFiles,
9495
List<TsFileResource> targetFiles) {
9596
this.seqFiles = seqFiles;
9697
this.unseqFiles = unseqFiles;
9798
this.targetFiles = targetFiles;
98-
this.encryptParameter =
99-
new EncryptParameter(
100-
TSFileDescriptor.getInstance().getConfig().getEncryptType(),
101-
TSFileDescriptor.getInstance().getConfig().getEncryptKey());
99+
this.encryptParameter = EncryptDBUtils.getDefaultFirstEncryptParam();
102100
}
103101

104102
public ReadPointCompactionPerformer(
@@ -112,14 +110,12 @@ public ReadPointCompactionPerformer(
112110
this.encryptParameter = encryptParameter;
113111
}
114112

113+
@Deprecated
115114
public ReadPointCompactionPerformer(
116115
List<TsFileResource> seqFiles, List<TsFileResource> unseqFiles) {
117116
this.seqFiles = seqFiles;
118117
this.unseqFiles = unseqFiles;
119-
this.encryptParameter =
120-
new EncryptParameter(
121-
TSFileDescriptor.getInstance().getConfig().getEncryptType(),
122-
TSFileDescriptor.getInstance().getConfig().getEncryptKey());
118+
this.encryptParameter = EncryptDBUtils.getDefaultFirstEncryptParam();
123119
}
124120

125121
public ReadPointCompactionPerformer(
@@ -131,11 +127,9 @@ public ReadPointCompactionPerformer(
131127
this.encryptParameter = encryptParameter;
132128
}
133129

130+
@Deprecated
134131
public ReadPointCompactionPerformer() {
135-
this.encryptParameter =
136-
new EncryptParameter(
137-
TSFileDescriptor.getInstance().getConfig().getEncryptType(),
138-
TSFileDescriptor.getInstance().getConfig().getEncryptKey());
132+
this.encryptParameter = EncryptDBUtils.getDefaultFirstEncryptParam();
139133
}
140134

141135
public ReadPointCompactionPerformer(EncryptParameter encryptParameter) {

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/performer/impl/RepairUnsortedFileCompactionPerformer.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.ArrayDeviceTimeIndex;
2929
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.ITimeIndex;
3030
import org.apache.iotdb.db.storageengine.rescon.memory.TsFileResourceManager;
31+
import org.apache.iotdb.db.utils.EncryptDBUtils;
3132

32-
import org.apache.tsfile.common.conf.TSFileDescriptor;
3333
import org.apache.tsfile.encrypt.EncryptParameter;
3434

3535
import java.io.IOException;
@@ -40,11 +40,9 @@
4040
/** Used for fixing files which contains internal unsorted data */
4141
public class RepairUnsortedFileCompactionPerformer extends ReadPointCompactionPerformer {
4242

43+
@Deprecated
4344
public RepairUnsortedFileCompactionPerformer() {
44-
super(
45-
new EncryptParameter(
46-
TSFileDescriptor.getInstance().getConfig().getEncryptType(),
47-
TSFileDescriptor.getInstance().getConfig().getEncryptKey()));
45+
super(EncryptDBUtils.getDefaultFirstEncryptParam());
4846
}
4947

5048
public RepairUnsortedFileCompactionPerformer(EncryptParameter encryptParameter) {

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/RepairUnsortedFileCompactionTask.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResourceStatus;
3333
import org.apache.iotdb.db.storageengine.dataregion.tsfile.generator.TsFileNameGenerator;
3434
import org.apache.iotdb.db.storageengine.rescon.memory.SystemInfo;
35+
import org.apache.iotdb.db.utils.EncryptDBUtils;
3536

3637
import java.io.File;
3738
import java.io.IOException;
@@ -72,7 +73,8 @@ public RepairUnsortedFileCompactionTask(
7273
tsFileManager,
7374
Collections.singletonList(sourceFile),
7475
sequence,
75-
new RepairUnsortedFileCompactionPerformer(),
76+
new RepairUnsortedFileCompactionPerformer(
77+
EncryptDBUtils.getFirstEncryptParamFromDatabase(tsFileManager.getStorageGroupName())),
7678
serialId);
7779
this.sourceFile = sourceFile;
7880
if (this.sourceFile.getTsFileRepairStatus() != TsFileRepairStatus.NEED_TO_REPAIR_BY_MOVE) {
@@ -93,7 +95,8 @@ public RepairUnsortedFileCompactionTask(
9395
tsFileManager,
9496
Collections.singletonList(sourceFile),
9597
sequence,
96-
new RepairUnsortedFileCompactionPerformer(),
98+
new RepairUnsortedFileCompactionPerformer(
99+
EncryptDBUtils.getFirstEncryptParamFromDatabase(tsFileManager.getStorageGroupName())),
97100
serialId);
98101
this.sourceFile = sourceFile;
99102
if (this.sourceFile.getTsFileRepairStatus() != TsFileRepairStatus.NEED_TO_REPAIR_BY_MOVE) {

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/batch/utils/FirstBatchCompactionAlignedChunkWriter.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public class FirstBatchCompactionAlignedChunkWriter extends AlignedChunkWriterIm
4747

4848
private ChunkWriterFlushCallback beforeChunkWriterFlushCallback;
4949

50+
@Deprecated
5051
public FirstBatchCompactionAlignedChunkWriter(VectorMeasurementSchema schema) {
5152
this.encryptParam = EncryptUtils.getEncryptParameter();
5253
timeChunkWriter =
@@ -78,6 +79,7 @@ public FirstBatchCompactionAlignedChunkWriter(VectorMeasurementSchema schema) {
7879
this.remainingPointsNumber = timeChunkWriter.getRemainingPointNumberForCurrentPage();
7980
}
8081

82+
@Deprecated
8183
public FirstBatchCompactionAlignedChunkWriter(
8284
IMeasurementSchema timeSchema, List<IMeasurementSchema> valueSchemaList) {
8385
this(timeSchema, valueSchemaList, EncryptUtils.getEncryptParameter());
@@ -112,6 +114,7 @@ public FirstBatchCompactionAlignedChunkWriter(
112114
this.remainingPointsNumber = timeChunkWriter.getRemainingPointNumberForCurrentPage();
113115
}
114116

117+
@Deprecated
115118
public FirstBatchCompactionAlignedChunkWriter(List<IMeasurementSchema> schemaList) {
116119
this.encryptParam = EncryptUtils.getEncryptParameter();
117120
TSEncoding timeEncoding =

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/batch/utils/FollowingBatchCompactionAlignedChunkWriter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class FollowingBatchCompactionAlignedChunkWriter extends AlignedChunkWrit
4545
private CompactChunkPlan compactChunkPlan;
4646
private ChunkWriterFlushCallback afterChunkWriterFlushCallback;
4747

48+
@Deprecated
4849
public FollowingBatchCompactionAlignedChunkWriter(
4950
IMeasurementSchema timeSchema,
5051
List<IMeasurementSchema> valueSchemaList,

0 commit comments

Comments
 (0)