Skip to content

Add the used memory calculation for DescPriorityMergeReader which is missed before#14548

Merged
Beyyes merged 2 commits intomasterfrom
fix_merge_reader_reserve_memory
Dec 25, 2024
Merged

Add the used memory calculation for DescPriorityMergeReader which is missed before#14548
Beyyes merged 2 commits intomasterfrom
fix_merge_reader_reserve_memory

Conversation

@Beyyes
Copy link
Member

@Beyyes Beyyes commented Dec 25, 2024 •
edited
Loading

Description

As the title.

This PR has:

  • been self-reviewed.
    • concurrent read
    • concurrent write
    • concurrent read and write
  • added documentation for new or modified features or behaviors.
  • added Javadocs for most classes and all non-trivial methods.
  • added or updated version, license, or notice information
  • added comments explaining the "why" and the intent of the code wherever would not be obvious
    for an unfamiliar reader.
  • added unit tests or modified existing tests to cover new code paths, ensuring the threshold
    for code coverage.
  • added integration tests.
  • been tested in a test IoTDB cluster.
Key changed/added classes (or packages if there are too many classes) in this PR

@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 25, 2024

Quality Gate Passed Quality Gate passed

Issues
6 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@codecov
Copy link

codecov bot commented Dec 25, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 39.41%. Comparing base (54ab67c) to head (c9d42c7).
Report is 3 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff            @@
##             master   #14548   +/-   ##
=========================================
  Coverage     39.41%   39.41%           
  Complexity      185      185           
=========================================
  Files          4342     4341    -1     
  Lines        275400   275386   -14     
  Branches      33640    33639    -1     
=========================================
+ Hits         108541   108549    +8     
+ Misses       166859   166837   -22

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Beyyes Beyyes merged commit 3238ec2 into master Dec 25, 2024
37 of 38 checks passed
@Beyyes Beyyes deleted the fix_merge_reader_reserve_memory branch December 25, 2024 13:43
Beyyes added a commit that referenced this pull request Dec 25, 2024
@Beyyes
Add the used memory calculation for DescPriorityMergeReader which is …
359af3e 
…missed before (#14548)
@Beyyes Beyyes mentioned this pull request Dec 26, 2024
Merged
11 tasks
jt2594838 pushed a commit that referenced this pull request Dec 26, 2024
@Caideyipi @liyuheng55555
@shuwenwei @Beyyes @HxpSerein
Renamed ID->TAG, MEASUREMENT->FIELD in create/desc table sql (#14554)
698feca 
* Main

* Update IoTDBTableAggregationIT.java

* Update sessionRelationalIT.cpp

* Py fix

* Update test_tablemodel_insert.py

* Fix1

* Fix

* re-trigger CI

* Partial Fix

* Update IoTDBSessionRelationalIT.java

* Update IoTDBQueryWithComplexValueFilterTableIT.java

* Fix

* Update SubqueryDataSetUtils.java

* Update IoTDBCastFunctionTableSpecialIT.java

* Update IoTDBInsertAlignedValuesTableIT.java

* upload

* Update IoTDBRestServiceInsertAlignedValuesIT.java

* Add database name for table model CLI

* Fix

* Update TableModelUtils.java

* Update IoTDBMultiTAGsWithAttributesTableIT.java

* Compaction task can not stopped when abort compaction (#14538)

* Compaction task can not stopped when abort compaction

* add ut

* abort sub task

* fix review

* modify comment

* Add the used memory calculation for DescPriorityMergeReader which is missed before (#14548)

* [IoTConsensus] Refine IoTConsensus Configuration logs (#14542)

* refine logs

* Delete iotdb-connector/grafana-connector/pom.xml

* Update IoTConsensusServerImpl.java

* Fix

* Update TableHeaderSchemaValidator.java

* CI

* Revert "CI"

This reverts commit e3f7302.

---------

Co-authored-by: Li Yu Heng <liyuheng55555@126.com>
Co-authored-by: shuwenwei <55970239+shuwenwei@users.noreply.github.com>
Co-authored-by: Beyyes <cgf1993@foxmail.com>
Co-authored-by: Xiangpeng Hu <65238551+HxpSerein@users.noreply.github.com>
JackieTien97 added a commit that referenced this pull request Dec 26, 2024
@JackieTien97
Revert "Add the used memory calculation for DescPriorityMergeReader w…
614fb24 
…hich is missed before (#14548)"

This reverts commit 3238ec2.
jt2594838 added a commit that referenced this pull request Dec 27, 2024
@HTHou @jt2594838
@Caideyipi @liyuheng55555 @shuwenwei @Beyyes @HxpSerein
Rename table concept (#14537)
81a58c0 
* Rename table concept

* Rename table concept

* Fix IT

* Fix IT

* Fix IT

* Renamed ID->TAG, MEASUREMENT->FIELD in create/desc table sql (#14554)

* Main

* Update IoTDBTableAggregationIT.java

* Update sessionRelationalIT.cpp

* Py fix

* Update test_tablemodel_insert.py

* Fix1

* Fix

* re-trigger CI

* Partial Fix

* Update IoTDBSessionRelationalIT.java

* Update IoTDBQueryWithComplexValueFilterTableIT.java

* Fix

* Update SubqueryDataSetUtils.java

* Update IoTDBCastFunctionTableSpecialIT.java

* Update IoTDBInsertAlignedValuesTableIT.java

* upload

* Update IoTDBRestServiceInsertAlignedValuesIT.java

* Add database name for table model CLI

* Fix

* Update TableModelUtils.java

* Update IoTDBMultiTAGsWithAttributesTableIT.java

* Compaction task can not stopped when abort compaction (#14538)

* Compaction task can not stopped when abort compaction

* add ut

* abort sub task

* fix review

* modify comment

* Add the used memory calculation for DescPriorityMergeReader which is missed before (#14548)

* [IoTConsensus] Refine IoTConsensus Configuration logs (#14542)

* refine logs

* Delete iotdb-connector/grafana-connector/pom.xml

* Update IoTConsensusServerImpl.java

* Fix

* Update TableHeaderSchemaValidator.java

* CI

* Revert "CI"

This reverts commit e3f7302.

---------

Co-authored-by: Li Yu Heng <liyuheng55555@126.com>
Co-authored-by: shuwenwei <55970239+shuwenwei@users.noreply.github.com>
Co-authored-by: Beyyes <cgf1993@foxmail.com>
Co-authored-by: Xiangpeng Hu <65238551+HxpSerein@users.noreply.github.com>

* fix test

---------

Co-authored-by: Tian Jiang <jt2594838@163.com>
Co-authored-by: Caideyipi <87789683+Caideyipi@users.noreply.github.com>
Co-authored-by: Li Yu Heng <liyuheng55555@126.com>
Co-authored-by: shuwenwei <55970239+shuwenwei@users.noreply.github.com>
Co-authored-by: Beyyes <cgf1993@foxmail.com>
Co-authored-by: Xiangpeng Hu <65238551+HxpSerein@users.noreply.github.com>
CloudWise-Lukemiao pushed a commit to CloudWise-Lukemiao/iotdb that referenced this pull request Dec 27, 2024
@HTHou @jt2594838
@Caideyipi @liyuheng55555 @shuwenwei @Beyyes @HxpSerein @CloudWise-Lukemiao
Rename table concept (apache#14537)
fcfff37 
* Rename table concept

* Rename table concept

* Fix IT

* Fix IT

* Fix IT

* Renamed ID->TAG, MEASUREMENT->FIELD in create/desc table sql (apache#14554)

* Main

* Update IoTDBTableAggregationIT.java

* Update sessionRelationalIT.cpp

* Py fix

* Update test_tablemodel_insert.py

* Fix1

* Fix

* re-trigger CI

* Partial Fix

* Update IoTDBSessionRelationalIT.java

* Update IoTDBQueryWithComplexValueFilterTableIT.java

* Fix

* Update SubqueryDataSetUtils.java

* Update IoTDBCastFunctionTableSpecialIT.java

* Update IoTDBInsertAlignedValuesTableIT.java

* upload

* Update IoTDBRestServiceInsertAlignedValuesIT.java

* Add database name for table model CLI

* Fix

* Update TableModelUtils.java

* Update IoTDBMultiTAGsWithAttributesTableIT.java

* Compaction task can not stopped when abort compaction (apache#14538)

* Compaction task can not stopped when abort compaction

* add ut

* abort sub task

* fix review

* modify comment

* Add the used memory calculation for DescPriorityMergeReader which is missed before (apache#14548)

* [IoTConsensus] Refine IoTConsensus Configuration logs (apache#14542)

* refine logs

* Delete iotdb-connector/grafana-connector/pom.xml

* Update IoTConsensusServerImpl.java

* Fix

* Update TableHeaderSchemaValidator.java

* CI

* Revert "CI"

This reverts commit e3f7302.

---------

Co-authored-by: Li Yu Heng <liyuheng55555@126.com>
Co-authored-by: shuwenwei <55970239+shuwenwei@users.noreply.github.com>
Co-authored-by: Beyyes <cgf1993@foxmail.com>
Co-authored-by: Xiangpeng Hu <65238551+HxpSerein@users.noreply.github.com>

* fix test

---------

Co-authored-by: Tian Jiang <jt2594838@163.com>
Co-authored-by: Caideyipi <87789683+Caideyipi@users.noreply.github.com>
Co-authored-by: Li Yu Heng <liyuheng55555@126.com>
Co-authored-by: shuwenwei <55970239+shuwenwei@users.noreply.github.com>
Co-authored-by: Beyyes <cgf1993@foxmail.com>
Co-authored-by: Xiangpeng Hu <65238551+HxpSerein@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JackieTien97 JackieTien97 JackieTien97 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Beyyes @JackieTien97