Skip to content

[IOTDB-1066] Code improvement #2300

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.

Sign up for GitHub

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
qiaojialin merged 13 commits into from
Dec 21, 2020
Merged

[IOTDB-1066] Code improvement #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eef6e30
[MOD] repair broken link to SQL REFERENCE
rhmangmang Nov 19, 2020
bea7c24
Merge remote-tracking branch 'origin/master'
rhmangmang Nov 19, 2020
dbcdb25
Merge remote-tracking branch 'origin/master'
rhmangmang Nov 21, 2020
be9ef82
Merge remote-tracking branch 'origin/master'
rhmangmang Nov 22, 2020
1db5f7f
Merge remote-tracking branch 'origin/master'
rhmangmang Nov 23, 2020
57c0213
Merge remote-tracking branch 'origin/master'
rhmangmang Dec 2, 2020
f381b44
Merge remote-tracking branch 'origin/master'
rhmangmang Dec 7, 2020
350d226
Merge remote-tracking branch 'origin/master'
Dec 7, 2020
31cee42
Merge remote-tracking branch 'origin/master'
Dec 8, 2020
fdbc821
Merge remote-tracking branch 'origin/master'
Dec 14, 2020
7e26ca7
Merge remote-tracking branch 'origin/master'
Dec 14, 2020
fa5da9b
Merge remote-tracking branch 'origin/master'
Dec 21, 2020
5382bbe
[IOTDB-1066] Code optimization to reduce duplicated visits.
Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ public void insert(InsertRowPlan insertRowPlan) {
updatePlanIndexes(insertRowPlan.getIndex());
for (int i = 0; i < insertRowPlan.getValues().length; i++) {

if (insertRowPlan.getValues()[i] == null) {
Object value = insertRowPlan.getValues()[i];
if (value == null) {
continue;
}

Object value = insertRowPlan.getValues()[i];
memSize += MemUtils
.getRecordSize(insertRowPlan.getMeasurementMNodes()[i].getSchema().getType(), value,
disableMemControl);
Expand Down
5 changes: 2 additions & 3 deletions server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,8 @@ private TsFileProcessor getOrCreateTsFileProcessorIntern(long timeRangeId,
// we have to ensure only one thread can change workSequenceTsFileProcessors
writeLock();
try {
if (!tsFileProcessorTreeMap.containsKey(timeRangeId)) {
res = tsFileProcessorTreeMap.get(timeRangeId);
if (res == null) {
// we have to remove oldest processor to control the num of the memtables
// TODO: use a method to control the number of memtables
if (tsFileProcessorTreeMap.size()
Expand All @@ -992,8 +993,6 @@ private TsFileProcessor getOrCreateTsFileProcessorIntern(long timeRangeId,
tsFileProcessorTreeMap.put(timeRangeId, newProcessor);
tsFileManagement.add(newProcessor.getTsFileResource(), sequence);
res = newProcessor;
} else {
res = tsFileProcessorTreeMap.get(timeRangeId);
}

} finally {
Expand Down