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

Add experimental support for zstd compression. #3577

Merged
merged 32 commits into from
Apr 4, 2023
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fea4847
Add experimental support for zstd and lz4 (native) compression.
mulugetam Jun 14, 2022
8aac766
Fix license issues, add tests for zstd, zstd_no_dict, and lz4_native …
mulugetam Jun 14, 2022
33715b2
Fix DCO and and issues with CodecTests.java.
mulugetam Jun 14, 2022
df93e0a
Fix forbidden api violation error for lz4-java.
mulugetam Jun 15, 2022
b0cf47e
Fix license headers. Remove and fix unnecessary fields.
mulugetam Jun 15, 2022
975cfd7
Fix magic numbers. Use more restrictive access modifiers.
mulugetam Jun 21, 2022
bdb9287
Use protected access modifier for Zstd and LZ4 compression mode classes.
mulugetam Jun 21, 2022
1d6bbbb
Allow negative compression levels for zstd. Use more restrictive acce…
mulugetam Jun 21, 2022
c6b39fa
Use a more restrictive permission for loading zstd-jni and lz4-java l…
mulugetam Jun 23, 2022
1050738
Rename a file (follow a consistent version naming convention).
mulugetam Jun 24, 2022
cbfba87
Refactor and create a new custom-codecs sandbox module.
mulugetam Jul 6, 2022
3390e08
Remove blank lines.
mulugetam Jul 6, 2022
a168c72
Restore Lucene92CustomCodec to extend from FilterCodec.
mulugetam Jul 6, 2022
1491da7
Make use of the compressionLevel argument.
mulugetam Jul 7, 2022
f74f011
Make Lucene92CustomCodec abstract and use a package-private access mo…
mulugetam Jul 7, 2022
bdbe409
Fix missing JavaDoc issues. Remove unused field in PerFieldMappingPos…
mulugetam Jul 7, 2022
8120dae
Fix lint errors.
mulugetam Jul 7, 2022
28bd099
Fix the description for the custom-codecs plugin.
mulugetam Jul 7, 2022
51b825b
Fix wildcard import and improve documentation.
mulugetam Jul 8, 2022
6757536
Access control exception fixed. Removed lz4-java support for now.
mulugetam Feb 17, 2023
9423abe
Merge branch 'opensearch-project:main' into add-zstd-lz4-support
mulugetam Feb 22, 2023
45cd603
Upgrade plugin to use Lucene95Codec. Rename files accordingly.
mulugetam Feb 22, 2023
c22d11d
Merge branch 'opensearch-project:main' into add-zstd-lz4-support
mulugetam Mar 17, 2023
f39d093
Add test cases for compression/decompression. Other minor changes.
mulugetam Mar 17, 2023
acf186f
Merge branch 'main' into add-zstd-lz4-support
dblock Mar 21, 2023
ac1bd95
Remove ES grant in plugin-security.policy. Fix minor javadoc issue.
mulugetam Mar 22, 2023
b5ab68c
Merge branch 'add-zstd-lz4-support' of https://github.com/mulugetam/O…
mulugetam Mar 22, 2023
4d1e1a5
Merge branch 'main' into add-zstd-lz4-support
dblock Mar 27, 2023
634dfc0
Merge branch 'main' into add-zstd-lz4-support
dblock Mar 27, 2023
b48119d
Upgrade jettison version to 1.5.4.
mulugetam Mar 28, 2023
bc59912
Update SHA for jettison 1.5.4.
mulugetam Mar 28, 2023
06443ea
Merge branch 'main' of https://github.com/mulugetam/OpenSearch into a…
mulugetam Mar 31, 2023
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
34 changes: 34 additions & 0 deletions sandbox/modules/custom-codecs/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*
* Modifications Copyright OpenSearch Contributors. See
* GitHub history for details.
*/

apply plugin: 'opensearch.opensearchplugin'
apply plugin: 'opensearch.yaml-rest-test'

opensearchplugin {
name 'custom-codecs'
description 'A plugin that implements zstd (with and without dictionary) and lz4 (native) compression algorithms.'
Copy link
Member

Choose a reason for hiding this comment

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

Maybe "A plugin that implements custom codecs, including zstd ..."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Description fixed.

Regarding the runtime permission, jdk limits us from qualifying loadLibrary.* further. I see that ZSTD snapshotting compression #2996 has the same issue.

classname 'org.opensearch.index.codec.customcodec.CustomCodecPlugin'
licenseFile rootProject.file('licenses/APACHE-LICENSE-2.0.txt')
noticeFile rootProject.file('NOTICE.txt')
}

dependencies {
api "org.lz4:lz4-java:1.8.0"
api "com.github.luben:zstd-jni:1.5.2-3"
}

// lz4-java uses sun.misc.Unsafe in the UnsafeUtils class.
thirdPartyAudit.ignoreViolations(
'net.jpountz.util.UnsafeUtils'
)

yamlRestTest.enabled = false;
testingConventions.enabled = false;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4b986a99445e49ea5fbf5d149c4b63f6ed6c6780
202 changes: 202 additions & 0 deletions sandbox/modules/custom-codecs/licenses/lz4-java-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
1 change: 1 addition & 0 deletions sandbox/modules/custom-codecs/licenses/lz4-java-NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LZ4 compression for Java, based on Yann Collet's work available at http://code.google.com/p/lz4/.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f52de0603f31798455e48bd90e10a8f888dd6d93
29 changes: 29 additions & 0 deletions sandbox/modules/custom-codecs/licenses/zstd-jni-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
-----------------------------------------------------------------------------
** Beginning of "BSD License" text. **

Zstd-jni: JNI bindings to Zstd Library

Copyright (c) 2015-present, Luben Karavelov/ All rights reserved.

BSD License

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The code for the JNI bindings to Zstd library was originally authored by Luben Karavelov
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.index.codec.customcodec;

import org.opensearch.plugins.Plugin;
import org.opensearch.plugins.EnginePlugin;
import org.opensearch.index.codec.CodecServiceFactory;
import org.opensearch.index.IndexSettings;

import java.util.Optional;

/**
* A plugin that implements zstd (with and without dictionary) and lz4 (native) compression algorithms.
*/
public class CustomCodecPlugin extends Plugin implements EnginePlugin {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we make this class final? Maybe also mark w/ @opensearch.internal to signal we will not be extending the plugin?

I think we should also make the docs more descriptive. Suggestion:

 A plugin that implements custom codecs. Current custom codecs include:
<li> lz4
<li> zstd
<li> zstd_no_dict

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.


/** Creates a new instance */
public CustomCodecPlugin() {}

/**
* @param indexSettings is the default indexSettings
* @return the engine factory
*/
@Override
public Optional<CodecServiceFactory> getCustomCodecServiceFactory(final IndexSettings indexSettings) {
return Optional.of(new CustomCodecServiceFactory());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.index.codec.customcodec;

import org.apache.logging.log4j.Logger;
import org.apache.lucene.codecs.Codec;
import org.opensearch.common.collect.MapBuilder;
import org.opensearch.index.codec.CodecService;
import org.opensearch.index.mapper.MapperService;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;

/**
* CustomCodecService provides ZSTD, ZSTDNODICT, and LZ4 compressors to be used in use-case specific file formats.
*/
public class CustomCodecService extends CodecService {
private final Map<String, Codec> codecs;

/**
* Creates a new CustomCodecService.
*
* @param mapperService A mapper service.
* @param logger A logger.
*/
public CustomCodecService(MapperService mapperService, Logger logger) {
super(mapperService, logger);
final MapBuilder<String, Codec> codecs = MapBuilder.<String, Codec>newMapBuilder();
if (mapperService == null) {
codecs.put(Lucene92CustomCodec.Mode.ZSTD.name(), new ZstdCodec());
codecs.put(Lucene92CustomCodec.Mode.ZSTDNODICT.name(), new ZstdNoDictCodec());
codecs.put(Lucene92CustomCodec.Mode.LZ4.name(), new Lz4Codec());
} else {
codecs.put(
Lucene92CustomCodec.Mode.ZSTD.name(),
new PerFieldMappingPostingFormatCodec(Lucene92CustomCodec.Mode.ZSTD, mapperService)
);
codecs.put(
Lucene92CustomCodec.Mode.ZSTDNODICT.name(),
new PerFieldMappingPostingFormatCodec(Lucene92CustomCodec.Mode.ZSTDNODICT, mapperService)
);
codecs.put(
Lucene92CustomCodec.Mode.LZ4.name(),
new PerFieldMappingPostingFormatCodec(Lucene92CustomCodec.Mode.LZ4, mapperService)
);
}
this.codecs = codecs.immutableMap();
}

@Override
public Codec codec(String name) {
Codec codec = super.codec(name);
if (codec == null) {
Copy link
Member

Choose a reason for hiding this comment

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

I think this will never happen? https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/index/codec/CodecService.java#L80 throws IllegalArgumentException on null. It would probably be better to look up codec from this class's map and then, it is not there, fall back to base class.

Copy link
Contributor Author

@mulugetam mulugetam Feb 17, 2023

Choose a reason for hiding this comment

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

Fixed.

codec = codecs.get(name);
}
return codec;
}

@Override
public String[] availableCodecs() {
ArrayList<String> ac = new ArrayList<String>(Arrays.asList(super.availableCodecs()));
ac.addAll(codecs.keySet());
return ac.toArray(new String[0]);
}
}
Loading