Skip to content

HDDS-13318. Simplify the getRangeKVs methods in Table.#8683

Merged
adoroszlai merged 2 commits intoapache:masterfrom
szetszwo:HDDS-13318
Jun 24, 2025
Merged

HDDS-13318. Simplify the getRangeKVs methods in Table.#8683
adoroszlai merged 2 commits intoapache:masterfrom
szetszwo:HDDS-13318

Conversation

@szetszwo
Copy link
Copy Markdown
Contributor

@szetszwo szetszwo commented Jun 23, 2025

What changes were proposed in this pull request?

In Table,

  • Combine getRangeKVs and getSequentialRangeKVs into one method.
  • Change the parameter MetadataKeyFilter... filters to non-varargs since the size is always <= 1.
  • Remove the preKey and nextKey parameters from MetadataKeyFilter since they are always null as mentioned in the comment below.
// RDBTable.java
          // NOTE: the preKey and nextKey are never checked
          // in all existing underlying filters, so they could
          // be safely as null here.

What is the link to the Apache JIRA

HDDS-13318

How was this patch tested?

By existing tests.

adoroszlai
adoroszlai reviewed Jun 24, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@adoroszlai adoroszlai left a comment

Choose a reason for hiding this comment

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

Thanks @szetszwo for the patch. LGTM, one question, two minor nits (only update if changing the patch anyway).

hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/om/PrefixParser.java Outdated
final KeyPrefixFilter filter = getPrefixFilter(volumeId, bucketId, lastObjectId);
final List<KeyValue<String, T>> infoList = table.getRangeKVs(null, 1000, null, filter, false);

for (KeyValue<String, ? extends WithParentObjectId> info :infoList) {
Copy link
Copy Markdown
Contributor

@adoroszlai adoroszlai Jun 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

nit: this can also be replaced with T.

Suggested change
for (KeyValue<String, ? extends WithParentObjectId> info :infoList) {
for (KeyValue<String, T> info : infoList) {

hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBTable.java Outdated
Comment on lines +263 to +264
private List<KeyValue<byte[], byte[]>> getRangeKVsImpl(
byte[] startKey, int count, byte[] prefix, KeyPrefixFilter filter, boolean sequential)
Copy link
Copy Markdown
Contributor

@adoroszlai adoroszlai Jun 24, 2025

Choose a reason for hiding this comment

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

It looks like signature is the same for getRangeKVs and getRangeKVsImpl, so do we need to keep the latter?

hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBTable.java Outdated
Comment on lines +305 to +306
filter.getClass().getSimpleName(), filter.getKeysScannedNum(),
filter.getKeysHintedNum());
Copy link
Copy Markdown
Contributor

@adoroszlai adoroszlai Jun 24, 2025

Choose a reason for hiding this comment

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

nit: can use scanned and hinted in the message, too.

@szetszwo
Copy link
Copy Markdown
Contributor Author

szetszwo commented Jun 24, 2025

@adoroszlai , thanks for reviewing this! Just pushed a change to address your comments.

@adoroszlai adoroszlai merged commit 11ada9f into apache:master Jun 24, 2025
41 checks passed
errose28 added a commit to errose28/ozone that referenced this pull request Jun 26, 2025
@errose28
Merge branch 'master' into diff-report-javadoc
8b9c416 
* master: (90 commits)
  HDDS-12468. Check for space availability for all dns while container creation in pipeline (apache#8663)
  HDDS-12151. Fail write when volume is full considering min free space (apache#8642)
  HDDS-13251. Update Byteman usage README license (apache#8700)
  HDDS-13251. Support dynamic Byteman scripts via bmsubmit in ozonesecure-ha (apache#8654)
  HDDS-12070. Bump Ratis to 3.2.0 (apache#8689)
  HDDS-12984. Use InodeID to identify the SST files inside the tarball. (apache#8477)
  HDDS-13319. Simplify KeyPrefixFilter (apache#8692)
  HDDS-13295. Remove jackson1 exclusions for hadoop-common (apache#8687)
  HDDS-13314. Remove unused maven-pdf-plugin (apache#8686)
  HDDS-13324. Optimize memory footprint for Recon listKeys API (apache#8680)
  HDDS-13240. Add newly added metrics into grafana dashboard. (apache#8656)
  HDDS-13309. Add keyIterator/valueIterator methods to Table. (apache#8675)
  HDDS-13325. Introduce OZONE_SERVER_OPTS for common options for server processes (apache#8685)
  HDDS-13318. Simplify the getRangeKVs methods in Table (apache#8683)
  HDDS-13322. Remove module auto-detection from flaky-test-check (apache#8679)
  HDDS-13289. Remove usage of Jetty StringUtil (apache#8684)
  HDDS-13270. Reduce getBucket API invocations in S3 bucket owner verification (apache#8653)
  HDDS-13288. Container checksum file proto changes to account for deleted blocks. (apache#8649)
  HDDS-13306. Intermittent failure in testDirectoryDeletingServiceIntervalReconfiguration (apache#8682)
  HDDS-13317. Table should support empty array/String (apache#8676)
  ...
errose28 added a commit to errose28/ozone that referenced this pull request Jun 26, 2025
@errose28
Merge branch 'master' into HDDS-13083-handle-empty-mt
b248828 
* master: (170 commits)
  HDDS-12468. Check for space availability for all dns while container creation in pipeline (apache#8663)
  HDDS-12151. Fail write when volume is full considering min free space (apache#8642)
  HDDS-13251. Update Byteman usage README license (apache#8700)
  HDDS-13251. Support dynamic Byteman scripts via bmsubmit in ozonesecure-ha (apache#8654)
  HDDS-12070. Bump Ratis to 3.2.0 (apache#8689)
  HDDS-12984. Use InodeID to identify the SST files inside the tarball. (apache#8477)
  HDDS-13319. Simplify KeyPrefixFilter (apache#8692)
  HDDS-13295. Remove jackson1 exclusions for hadoop-common (apache#8687)
  HDDS-13314. Remove unused maven-pdf-plugin (apache#8686)
  HDDS-13324. Optimize memory footprint for Recon listKeys API (apache#8680)
  HDDS-13240. Add newly added metrics into grafana dashboard. (apache#8656)
  HDDS-13309. Add keyIterator/valueIterator methods to Table. (apache#8675)
  HDDS-13325. Introduce OZONE_SERVER_OPTS for common options for server processes (apache#8685)
  HDDS-13318. Simplify the getRangeKVs methods in Table (apache#8683)
  HDDS-13322. Remove module auto-detection from flaky-test-check (apache#8679)
  HDDS-13289. Remove usage of Jetty StringUtil (apache#8684)
  HDDS-13270. Reduce getBucket API invocations in S3 bucket owner verification (apache#8653)
  HDDS-13288. Container checksum file proto changes to account for deleted blocks. (apache#8649)
  HDDS-13306. Intermittent failure in testDirectoryDeletingServiceIntervalReconfiguration (apache#8682)
  HDDS-13317. Table should support empty array/String (apache#8676)
  ...

Conflicts:
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerChecksumTreeManager.java
hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/checksum/TestContainerChecksumTreeManager.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@adoroszlai adoroszlai adoroszlai 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

@szetszwo @adoroszlai