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

lightning: Compress Reader/Writer supports reading/writing Snappy/Zstd type compressed files #38603

Merged
merged 11 commits into from
Oct 31, 2022

Conversation

lyzx2001
Copy link
Contributor

@lyzx2001 lyzx2001 commented Oct 21, 2022

What problem does this PR solve?

Issue Number: ref #38514

Problem Summary:

What is changed and how it works?

Compress Reader supports reading Snappy/Zstd type compressed files
Compress Writer supports writing Snappy/Zstd type compressed files

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 21, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lance6716
  • lichunzhu

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 21, 2022
@lyzx2001
Copy link
Contributor Author

/cc @lichunzhu @lance6716

@hawkingrei
Copy link
Member

BTW, Have we a plan to support zstd ?

@lyzx2001
Copy link
Contributor Author

BTW, Have we a plan to support zstd ?

Thanks for the suggestion. I will try to implement supporting zstd in the later PR if possible.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 25, 2022
@lichunzhu
Copy link
Contributor

snappy part LGTM. Looking forward to lzo/zstd.

@lyzx2001
Copy link
Contributor Author

snappy part LGTM. Looking forward to lzo/zstd.

Okay, in progress

Comment on lines 139 to 178
testFnSnappy := func(test *testcase, t *testing.T) {
t.Log(test.name)
backend, err := ParseBackend("local://"+filepath.ToSlash(dir), nil)
require.NoError(t, err)
ctx := context.Background()
storage, err := Create(ctx, backend, true)
require.NoError(t, err)
storage = WithCompression(storage, Snappy)
fileName := strings.ReplaceAll(test.name, " ", "-") + ".txt.snappy"
writer, err := storage.Create(ctx, fileName)
require.NoError(t, err)
for _, str := range test.content {
p := []byte(str)
written, err2 := writer.Write(ctx, p)
require.Nil(t, err2)
require.Len(t, p, written)
}
err = writer.Close(ctx)
require.NoError(t, err)

// make sure compressed file is written correctly
file, err := os.Open(filepath.Join(dir, fileName))
require.NoError(t, err)
r, err := newCompressReader(test.compressType, file)
require.NoError(t, err)
var bf bytes.Buffer
_, err = bf.ReadFrom(r)
require.NoError(t, err)
require.Equal(t, strings.Join(test.content, ""), bf.String())

// test withCompression Open
r, err = storage.Open(ctx, fileName)
require.NoError(t, err)
content, err := io.ReadAll(r)
require.NoError(t, err)
require.Equal(t, strings.Join(test.content, ""), string(content))

require.Nil(t, file.Close())
}
compressTypeSnappyArr := []CompressType{Snappy}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we combine these two functions?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Modified

@lyzx2001
Copy link
Contributor Author

/run-all-tests

fileName := strings.ReplaceAll(test.name, " ", "-") + ".txt.gz"
storage = WithCompression(storage, test.compressType)
var suffix string
if test.compressType == Gzip {
Copy link
Contributor

Choose a reason for hiding this comment

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

How about implementing a String() function for these compressType?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Modified

@lyzx2001
Copy link
Contributor Author

zstd is supported now.

@lyzx2001 lyzx2001 changed the title lightning: Compress Reader/Writer supports reading/writing Snappy type compressed files lightning: Compress Reader/Writer supports reading/writing Snappy/Zstd type compressed files Oct 28, 2022
@lyzx2001
Copy link
Contributor Author

/run-all-tests

@lyzx2001 lyzx2001 requested a review from lichunzhu October 28, 2022 12:36
Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Oct 31, 2022
@lichunzhu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 215831a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 31, 2022
@ti-chi-bot ti-chi-bot merged commit 312155a into pingcap:master Oct 31, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Oct 31, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test 🔴 failed 1, success 5, total 6 25 min Existing failure
idc-jenkins-ci-tidb/common-test ✅ all 11 tests passed 10 min Fixed
idc-jenkins-ci/integration-cdc-test 🟢 all 38 tests passed 26 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 13 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 12 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 7 min 44 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 7 min 22 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 19 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 4 min 0 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants