Browse Source

Pull request #6796: REPORT-78067 三方组件批量升级

Merge in CORE/base-third from ~YUAN.WANG/base-third:feature/x to feature/x

* commit '9dbcfbc6aa555e13cd8b8925c93c7aa127278223':
  REPORT-78067 三方组件批量升级
feature/x
Yuan.Wang-王垣 2 years ago
parent
commit
1f5a0e40ce
  1. 12
      fine-lz4/src/main/java/com/fr/third/net/jpountz/lz4/LZ4UnsafeUtils.java
  2. 2
      fine-lz4/src/main/java/com/fr/third/net/jpountz/util/UnsafeUtils.java

12
fine-lz4/src/main/java/com/fr/third/net/jpountz/lz4/LZ4UnsafeUtils.java

@ -16,11 +16,11 @@ package com.fr.third.net.jpountz.lz4;
* limitations under the License. * limitations under the License.
*/ */
import static net.jpountz.lz4.LZ4Constants.COPY_LENGTH; import static com.fr.third.net.jpountz.lz4.LZ4Constants.COPY_LENGTH;
import static net.jpountz.lz4.LZ4Constants.LAST_LITERALS; import static com.fr.third.net.jpountz.lz4.LZ4Constants.LAST_LITERALS;
import static net.jpountz.lz4.LZ4Constants.ML_BITS; import static com.fr.third.net.jpountz.lz4.LZ4Constants.ML_BITS;
import static net.jpountz.lz4.LZ4Constants.ML_MASK; import static com.fr.third.net.jpountz.lz4.LZ4Constants.ML_MASK;
import static net.jpountz.lz4.LZ4Constants.RUN_MASK; import static com.fr.third.net.jpountz.lz4.LZ4Constants.RUN_MASK;
import static com.fr.third.net.jpountz.util.UnsafeUtils.readByte; import static com.fr.third.net.jpountz.util.UnsafeUtils.readByte;
import static com.fr.third.net.jpountz.util.UnsafeUtils.readInt; import static com.fr.third.net.jpountz.util.UnsafeUtils.readInt;
import static com.fr.third.net.jpountz.util.UnsafeUtils.readLong; import static com.fr.third.net.jpountz.util.UnsafeUtils.readLong;
@ -29,7 +29,7 @@ import static com.fr.third.net.jpountz.util.UnsafeUtils.writeByte;
import static com.fr.third.net.jpountz.util.UnsafeUtils.writeInt; import static com.fr.third.net.jpountz.util.UnsafeUtils.writeInt;
import static com.fr.third.net.jpountz.util.UnsafeUtils.writeLong; import static com.fr.third.net.jpountz.util.UnsafeUtils.writeLong;
import static com.fr.third.net.jpountz.util.UnsafeUtils.writeShort; import static com.fr.third.net.jpountz.util.UnsafeUtils.writeShort;
import static net.jpountz.util.Utils.NATIVE_BYTE_ORDER; import static com.fr.third.net.jpountz.util.Utils.NATIVE_BYTE_ORDER;
import java.nio.ByteOrder; import java.nio.ByteOrder;

2
fine-lz4/src/main/java/com/fr/third/net/jpountz/util/UnsafeUtils.java

@ -16,7 +16,7 @@ package com.fr.third.net.jpountz.util;
* limitations under the License. * limitations under the License.
*/ */
import static net.jpountz.util.Utils.NATIVE_BYTE_ORDER; import static com.fr.third.net.jpountz.util.Utils.NATIVE_BYTE_ORDER;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.nio.ByteOrder; import java.nio.ByteOrder;

Loading…
Cancel
Save