diff --git a/LICENSE b/LICENSE index 5eb17e364b..f8c91199e6 100644 --- a/LICENSE +++ b/LICENSE @@ -221,7 +221,7 @@ The text of each license is the standard Apache 2.0 license. * spark (https://github.com/apache/spark) Files: java/fury-core/src/main/java/org/apache/fury/codegen/Code.java - java/fury-core/src/main/java/org/apache/fury/util/Platform.java + java/fury-core/src/main/java/org/apache/fury/memory/Platform.java java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java * commons-io (https://github.com/apache/commons-io) diff --git a/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java b/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java index 53d2ee090e..ceef88d0a8 100644 --- a/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java +++ b/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java @@ -29,7 +29,7 @@ import org.apache.fury.config.CompatibleMode; import org.apache.fury.config.FuryBuilder; import org.apache.fury.config.Language; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java index dc66db92be..63979c11b1 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java @@ -21,8 +21,8 @@ import java.nio.ByteBuffer; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.StringSerializer; -import org.apache.fury.util.Platform; import org.apache.fury.util.StringUtils; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java index 77656c7575..2d9b118383 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; // Drived from // https://github.com/RuedigerMoeller/fast-serialization/blob/e8da5591daa09452791dcd992ea4f83b20937be7/src/main/java/org/nustaq/serialization/util/FSTIdentity2IdMap.java. diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java index d89b418818..0f51f9a557 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java @@ -23,7 +23,7 @@ import java.util.Random; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.StringUtils; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java index 6d25399ea8..7c466159f1 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java @@ -21,8 +21,8 @@ import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.StringSerializer; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java index b92f8acb0e..36d4f12af2 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java @@ -19,8 +19,8 @@ package org.apache.fury.benchmark; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.StringSerializer; -import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; import org.openjdk.jmh.Main; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java index e9f3141130..94d24784d9 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java @@ -30,7 +30,7 @@ import org.apache.fury.benchmark.state.ObjectType; import org.apache.fury.benchmark.state.ProtoBuffersState; import org.apache.fury.benchmark.state.ProtostuffState; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java index 462403fed8..c563f099b5 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java @@ -33,7 +33,7 @@ import org.apache.fury.benchmark.state.ObjectType; import org.apache.fury.benchmark.state.ProtoBuffersState; import org.apache.fury.benchmark.state.ProtostuffState; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java index c212bfd0e7..9861519c8f 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java @@ -43,9 +43,9 @@ import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.BufferObject; import org.apache.fury.test.bean.ArraysData; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.nustaq.serialization.FSTConfiguration; import org.openjdk.jmh.Main; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FlatBuffersState.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FlatBuffersState.java index 58e658d48e..d99ad052d7 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FlatBuffersState.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FlatBuffersState.java @@ -39,7 +39,7 @@ import org.apache.fury.benchmark.state.generated.FBSMedia; import org.apache.fury.benchmark.state.generated.FBSMediaContent; import org.apache.fury.benchmark.state.generated.FBSSample; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.checkerframework.checker.nullness.qual.Nullable; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Param; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java index 5c4f7a4435..2c87cce154 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java @@ -29,7 +29,7 @@ import org.apache.fury.benchmark.data.Image; import org.apache.fury.benchmark.data.Media; import org.apache.fury.benchmark.data.MediaContent; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.Preconditions; import org.nustaq.serialization.FSTConfiguration; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java index eddcd34cea..bec24c63eb 100644 --- a/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java +++ b/java/benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java @@ -38,7 +38,7 @@ import org.apache.fury.benchmark.data.CustomJDKSerialization; import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.Preconditions; import org.openjdk.jmh.annotations.CompilerControl; import org.openjdk.jmh.annotations.Fork; diff --git a/java/fury-core/src/main/java/org/apache/fury/Fury.java b/java/fury-core/src/main/java/org/apache/fury/Fury.java index 6260da62b1..b03527de70 100644 --- a/java/fury-core/src/main/java/org/apache/fury/Fury.java +++ b/java/fury-core/src/main/java/org/apache/fury/Fury.java @@ -43,6 +43,7 @@ import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassInfoHolder; import org.apache.fury.resolver.ClassResolver; @@ -62,7 +63,6 @@ import org.apache.fury.type.Generics; import org.apache.fury.type.Type; import org.apache.fury.util.ExceptionUtils; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.StringUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java index dd0b69f2c6..583ca7ee7a 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java @@ -80,6 +80,7 @@ import org.apache.fury.codegen.ExpressionVisitor.ExprHolder; import org.apache.fury.collection.Tuple2; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassInfoHolder; import org.apache.fury.resolver.ClassResolver; @@ -95,7 +96,6 @@ import org.apache.fury.serializer.collection.CollectionFlags; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java index a9753fecf3..e2bb42bc6e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java @@ -55,12 +55,12 @@ import org.apache.fury.codegen.Expression.StaticInvoke; import org.apache.fury.collection.Tuple2; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassInfoHolder; import org.apache.fury.type.Descriptor; import org.apache.fury.type.FinalObjectTypeStub; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java index 48db2f8895..b521c32134 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java @@ -65,6 +65,7 @@ import org.apache.fury.codegen.ExpressionOptimizer; import org.apache.fury.codegen.ExpressionUtils; import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.resolver.FieldResolver; @@ -75,7 +76,6 @@ import org.apache.fury.serializer.CompatibleSerializer; import org.apache.fury.type.Descriptor; import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.function.SerializableSupplier; diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java b/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java index daac373420..b06775b66b 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java @@ -34,7 +34,7 @@ import org.apache.fury.annotation.Internal; import org.apache.fury.codegen.CodeGenerator; import org.apache.fury.config.Config; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.Preconditions; /** A context for managing jit serialization code generation in async multithreaded environment. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java index d9c4d5f3fd..6edc239f41 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java @@ -56,11 +56,11 @@ import org.apache.fury.codegen.Expression.ReplaceStub; import org.apache.fury.codegen.Expression.StaticInvoke; import org.apache.fury.codegen.ExpressionVisitor; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.ObjectSerializer; import org.apache.fury.serializer.PrimitiveSerializers.LongSerializer; import org.apache.fury.type.Descriptor; import org.apache.fury.type.DescriptorGrouper; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.function.SerializableSupplier; import org.apache.fury.util.record.RecordUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java b/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java index e63f72fdbc..29b56715e1 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java @@ -56,8 +56,8 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.fury.memory.Platform; import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java index 81cff6f410..5193cd977c 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java @@ -34,8 +34,8 @@ import java.util.function.Function; import org.apache.fury.codegen.Expression.ListExpression; import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.memory.Platform; import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java b/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java index 264c23c872..753f6613fa 100644 --- a/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java @@ -26,6 +26,7 @@ import org.apache.fury.ThreadSafeFury; import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; +import org.apache.fury.memory.Platform; import org.apache.fury.pool.ThreadPoolFury; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.serializer.JavaSerializer; @@ -34,7 +35,6 @@ import org.apache.fury.serializer.TimeSerializers; import org.apache.fury.serializer.collection.GuavaCollectionSerializers; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; /** Builder class to config and create {@link Fury}. */ // Method naming style for this builder: diff --git a/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java index 87cf82f5fd..7096bd2186 100644 --- a/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java +++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java @@ -24,7 +24,7 @@ import java.nio.ByteBuffer; import javax.annotation.concurrent.NotThreadSafe; import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; /** * A buffered stream by fury. Do not use original {@link InputStream} when this stream object diff --git a/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableChannel.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableChannel.java index 0aea9e7691..fd4d28c8e8 100644 --- a/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableChannel.java +++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableChannel.java @@ -25,7 +25,7 @@ import javax.annotation.concurrent.NotThreadSafe; import org.apache.fury.exception.DeserializationException; import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.Preconditions; @NotThreadSafe diff --git a/java/fury-core/src/main/java/org/apache/fury/memory/LittleEndian.java b/java/fury-core/src/main/java/org/apache/fury/memory/LittleEndian.java index de5f9c1bb3..d519fdf983 100644 --- a/java/fury-core/src/main/java/org/apache/fury/memory/LittleEndian.java +++ b/java/fury-core/src/main/java/org/apache/fury/memory/LittleEndian.java @@ -19,8 +19,6 @@ * under the License. */ -import org.apache.fury.util.Platform; - public class LittleEndian { public static int putVarUint36Small(byte[] arr, int index, long v) { if (v >>> 7 == 0) { diff --git a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java index d2b860c7b7..24e0a22409 100644 --- a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java +++ b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java @@ -26,7 +26,6 @@ import org.apache.fury.annotation.CodegenInvoke; import org.apache.fury.io.AbstractStreamReader; import org.apache.fury.io.FuryStreamReader; -import org.apache.fury.util.Platform; import sun.misc.Unsafe; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java index 982eb84693..720cecf2d5 100644 --- a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java @@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; /** Memory utils for fury. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/util/Platform.java b/java/fury-core/src/main/java/org/apache/fury/memory/Platform.java similarity index 99% rename from java/fury-core/src/main/java/org/apache/fury/util/Platform.java rename to java/fury-core/src/main/java/org/apache/fury/memory/Platform.java index 0485f0f8f6..d8d49e0b85 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/Platform.java +++ b/java/fury-core/src/main/java/org/apache/fury/memory/Platform.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package org.apache.fury.util; +package org.apache.fury.memory; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import org.apache.fury.util.Preconditions; import org.apache.fury.util.unsafe._JDKAccess; import sun.misc.Unsafe; diff --git a/java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java b/java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java index cb34a5bf62..9302149115 100644 --- a/java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java +++ b/java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java @@ -46,6 +46,7 @@ import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.serializer.CompatibleSerializer; import org.apache.fury.type.Descriptor; @@ -53,7 +54,6 @@ import org.apache.fury.type.FinalObjectTypeStub; import org.apache.fury.type.GenericType; import org.apache.fury.util.MurmurHash3; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java index 1e4c370326..9af9360bb4 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java @@ -96,6 +96,7 @@ import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.meta.ClassDef; import org.apache.fury.meta.MetaString; import org.apache.fury.serializer.ArraySerializers; @@ -145,7 +146,6 @@ import org.apache.fury.type.ScalaTypes; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java index 4f9ead5198..4852c7bd7f 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java @@ -23,6 +23,7 @@ import java.util.IdentityHashMap; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassInfoHolder; import org.apache.fury.resolver.ClassResolver; @@ -31,7 +32,6 @@ import org.apache.fury.serializer.collection.FuryArrayAsListSerializer; import org.apache.fury.type.Type; import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java index e4d0d6a68b..603f389f3e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java @@ -27,6 +27,7 @@ import java.util.stream.Collectors; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.resolver.FieldResolver; @@ -34,7 +35,6 @@ import org.apache.fury.serializer.collection.CollectionSerializer; import org.apache.fury.serializer.collection.MapSerializer; import org.apache.fury.util.FieldAccessor; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.record.RecordInfo; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java index 736e573b10..56840217fc 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java @@ -26,7 +26,7 @@ import org.apache.fury.io.MemoryBufferObjectInput; import org.apache.fury.io.MemoryBufferObjectOutput; import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.ReflectionUtils; /** Serializer for class implements {@link Externalizable}. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java index 51e5755a31..6e65e28ba5 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java @@ -29,9 +29,9 @@ import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.util.LoaderBinding; import org.apache.fury.util.LoaderBinding.StagingType; -import org.apache.fury.util.Platform; /** * A thread-safe serializer used to forward serialization to different serializer implementation. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java index acc654680c..199a5eba0c 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java @@ -36,8 +36,8 @@ import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.BigEndian; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassResolver; -import org.apache.fury.util.Platform; /** * Serializes objects using Java's built in serialization to be compatible with java serialization. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java index 5befb551ce..572ad298f8 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java @@ -24,8 +24,8 @@ import java.lang.reflect.Proxy; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.RefResolver; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java index bc2644f624..77e19231ab 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java @@ -36,6 +36,7 @@ import org.apache.fury.config.CompatibleMode; import org.apache.fury.config.FuryBuilder; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.meta.ClassDef; import org.apache.fury.resolver.ClassInfoHolder; import org.apache.fury.resolver.ClassResolver; @@ -44,7 +45,6 @@ import org.apache.fury.type.DescriptorGrouper; import org.apache.fury.type.Generics; import org.apache.fury.util.FieldAccessor; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.record.RecordInfo; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java index abfbb4c840..8108903e2b 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java @@ -34,6 +34,7 @@ import org.apache.fury.collection.Tuple3; import org.apache.fury.exception.FuryException; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassInfoHolder; import org.apache.fury.resolver.ClassResolver; @@ -44,7 +45,6 @@ import org.apache.fury.type.GenericType; import org.apache.fury.type.Generics; import org.apache.fury.util.FieldAccessor; -import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.record.RecordInfo; import org.apache.fury.util.record.RecordUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java index c70639bf1d..4d9434833d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java @@ -53,11 +53,11 @@ import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.resolver.FieldResolver; import org.apache.fury.resolver.FieldResolver.ClassField; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.Utils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java index a8c5a36d0d..e27cda8d70 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java @@ -26,8 +26,8 @@ import org.apache.fury.codegen.Expression.Invoke; import org.apache.fury.config.LongEncoding; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; /** Serializers for java primitive types. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java index 4fc5b6f108..085547157e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java @@ -31,10 +31,10 @@ import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassInfo; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.resolver.RefResolver; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.unsafe._JDKAccess; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java index fb4274b680..2e3062d378 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java @@ -45,10 +45,10 @@ import org.apache.fury.Fury; import org.apache.fury.collection.Tuple2; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.type.Type; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.Utils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java index 8fbc429a19..8e1e5bf95f 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java @@ -38,9 +38,9 @@ import org.apache.fury.codegen.Expression.StaticInvoke; import org.apache.fury.memory.LittleEndian; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.type.Type; import org.apache.fury.util.MathUtils; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.unsafe._JDKAccess; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java index f29d6442c9..dacec0c52f 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java @@ -34,13 +34,13 @@ import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.type.Descriptor; import org.apache.fury.type.GenericType; import org.apache.fury.type.Generics; import org.apache.fury.type.Type; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.FieldAccessor; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.Utils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java index b2487e7428..051f312c46 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java @@ -23,7 +23,7 @@ import java.net.URL; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; /** Serializer for {@link URL}. */ // TODO(chaokunyang) ensure security to avoid dnslog detection. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java index 40ad518c8e..0e84c95348 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java @@ -43,12 +43,12 @@ import org.apache.fury.config.Language; import org.apache.fury.exception.FuryException; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.serializer.ReplaceResolveSerializer; import org.apache.fury.serializer.Serializer; import org.apache.fury.serializer.Serializers; import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java index ddf49726ee..c7217ec629 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java @@ -37,8 +37,8 @@ import java.util.function.Function; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; import org.apache.fury.util.unsafe._JDKAccess; /** Serializers for common guava types. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java index 9b637e658b..3667b8cc55 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java @@ -31,7 +31,7 @@ import java.util.Set; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.unsafe._JDKAccess; /** Serializers for jdk9+ java.util.ImmutableCollections. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java index 3733d26480..2289f58c6c 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java @@ -34,13 +34,13 @@ import org.apache.fury.collection.LazyMap; import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.serializer.ReplaceResolveSerializer; import org.apache.fury.serializer.Serializer; import org.apache.fury.serializer.Serializers; import org.apache.fury.serializer.StringSerializer; import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java index 7778b4e327..ac90be8969 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java @@ -39,8 +39,8 @@ import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.Serializer; -import org.apache.fury.util.Platform; import org.apache.fury.util.Utils; /** Serializer for synchronized Collections and Maps created via Collections. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java index f6207001de..193ba1c7b0 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java @@ -38,8 +38,8 @@ import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.Serializer; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.Utils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java index 82d4a2dba8..7b10224324 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java @@ -23,9 +23,9 @@ import java.util.Collection; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.collection.AbstractCollectionSerializer; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java index e842b883ad..50be016f22 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.collection.AbstractMapSerializer; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java index 191a3e5404..19cf09f922 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java @@ -22,9 +22,9 @@ import java.lang.reflect.Field; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.Serializer; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java b/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java index 35c339e43d..e4af8d0a4e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java +++ b/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java @@ -46,7 +46,7 @@ import org.apache.fury.annotation.Ignore; import org.apache.fury.annotation.Internal; import org.apache.fury.collection.Tuple2; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.StringUtils; import org.apache.fury.util.record.RecordComponent; diff --git a/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java b/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java index d8a2349fee..23cb96f8ff 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java @@ -26,6 +26,7 @@ import java.util.function.ToDoubleFunction; import java.util.function.ToIntFunction; import java.util.function.ToLongFunction; +import org.apache.fury.memory.Platform; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.function.Functions; import org.apache.fury.util.function.ToByteFunction; diff --git a/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java index a7f04a966d..f5e7ee8db5 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java @@ -48,6 +48,7 @@ import org.apache.fury.annotation.CodegenInvoke; import org.apache.fury.annotation.Internal; import org.apache.fury.collection.Tuple3; +import org.apache.fury.memory.Platform; import org.apache.fury.util.function.Functions; import org.apache.fury.util.unsafe._JDKAccess; diff --git a/java/fury-core/src/main/java/org/apache/fury/util/UnsafeFieldAccessor.java b/java/fury-core/src/main/java/org/apache/fury/util/UnsafeFieldAccessor.java index e28fd351e0..d9e7a05b7d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/UnsafeFieldAccessor.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/UnsafeFieldAccessor.java @@ -20,6 +20,7 @@ package org.apache.fury.util; import java.lang.reflect.Field; +import org.apache.fury.memory.Platform; import sun.misc.Unsafe; /** An object field accessor based on {@link Unsafe}. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/DefineClass.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/DefineClass.java index e2fe03e2f6..439fe69f5f 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/DefineClass.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/DefineClass.java @@ -24,7 +24,7 @@ import java.lang.invoke.MethodType; import java.security.ProtectionDomain; import org.apache.fury.annotation.Internal; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.Preconditions; /** A class to define bytecode as a class. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java index de06f59141..0aa792be43 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java @@ -20,7 +20,7 @@ package org.apache.fury.util.unsafe; import java.util.ArrayList; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; /** Unsafe collection utils. */ // CHECKSTYLE.OFF:TypeName diff --git a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java index dd42919708..f6d1b80ff0 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java @@ -38,9 +38,9 @@ import java.util.function.ToIntFunction; import java.util.function.ToLongFunction; import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.Platform; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.Utils; import org.apache.fury.util.function.ToByteFunction; diff --git a/java/fury-core/src/main/resources/META-INF/LICENSE b/java/fury-core/src/main/resources/META-INF/LICENSE index c3a89b2933..4dcb88f8d8 100644 --- a/java/fury-core/src/main/resources/META-INF/LICENSE +++ b/java/fury-core/src/main/resources/META-INF/LICENSE @@ -221,7 +221,7 @@ The text of each license is the standard Apache 2.0 license. * spark (https://github.com/apache/spark) Files: java/fury-core/src/main/java/org/apache/fury/codegen/Code.java - java/fury-core/src/main/java/org/apache/fury/util/Platform.java + java/fury-core/src/main/java/org/apache/fury/memory/Platform.java * commons-io (https://github.com/apache/commons-io) Files: diff --git a/java/fury-core/src/main/resources/META-INF/native-image/org.apache.fury/fury-core/native-image.properties b/java/fury-core/src/main/resources/META-INF/native-image/org.apache.fury/fury-core/native-image.properties index 4a696c715d..4d8597f74b 100644 --- a/java/fury-core/src/main/resources/META-INF/native-image/org.apache.fury/fury-core/native-image.properties +++ b/java/fury-core/src/main/resources/META-INF/native-image/org.apache.fury/fury-core/native-image.properties @@ -28,7 +28,7 @@ Args=--initialize-at-build-time=org.apache.fury.memory.MemoryBuffer,\ org.apache.fury.serializer.StringSerializer,\ org.apache.fury.serializer.Serializers,\ org.apache.fury.serializer.shim.ShimDispatcher,\ - org.apache.fury.util.Platform,\ + org.apache.fury.memory.Platform,\ org.apache.fury.util.ReflectionUtils,\ org.apache.fury.util.unsafe._Lookup,\ org.apache.fury.util.unsafe._JDKAccess,\ diff --git a/java/fury-core/src/test/java/org/apache/fury/FuryTest.java b/java/fury-core/src/test/java/org/apache/fury/FuryTest.java index 0c497c1289..0b15c48e39 100644 --- a/java/fury-core/src/test/java/org/apache/fury/FuryTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/FuryTest.java @@ -60,6 +60,7 @@ import org.apache.fury.exception.InsecureException; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.ArraySerializersTest; import org.apache.fury.serializer.ObjectSerializer; import org.apache.fury.serializer.Serializer; @@ -68,7 +69,6 @@ import org.apache.fury.test.bean.Struct; import org.apache.fury.type.Descriptor; import org.apache.fury.util.DateTimeUtils; -import org.apache.fury.util.Platform; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java b/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java index 1ec1660c1a..7db156cb9d 100644 --- a/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java +++ b/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java @@ -36,9 +36,9 @@ import org.apache.fury.config.Language; import org.apache.fury.io.ClassLoaderObjectInputStream; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.resolver.MetaContext; import org.apache.fury.serializer.BufferObject; -import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; import org.testng.Assert; import org.testng.annotations.DataProvider; diff --git a/java/fury-core/src/test/java/org/apache/fury/StreamTest.java b/java/fury-core/src/test/java/org/apache/fury/StreamTest.java index 95d783ac4e..0d075e8dc0 100644 --- a/java/fury-core/src/test/java/org/apache/fury/StreamTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/StreamTest.java @@ -28,6 +28,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.ByteBuffer; import java.nio.file.Files; import java.nio.file.Path; import org.apache.fury.io.FuryInputStream; @@ -39,6 +40,33 @@ import org.testng.annotations.Test; public class StreamTest { + // Note that Fury instances should be reused between + // multiple serializations of different objects. + private static final ThreadSafeFury fury = + new ThreadLocalFury( + classLoader -> { + Fury f = + Fury.builder().withClassLoader(classLoader).requireClassRegistration(false).build(); + return f; + }); + + public static byte[] encoder(Object object) { + return fury.serialize(object); + } + + public static T decoder(byte[] bytes) { + return (T) fury.deserialize(bytes); + } + + public static void main(String[] args) { + byte len = 10; + ByteBuffer byteBuffer = ByteBuffer.allocate(len); + for (int i = 0; i < len; i++) { + byteBuffer.put((byte) i); + } + System.out.println(encoder(byteBuffer).length); + } + @Test public void testBufferStream() { MemoryBuffer buffer0 = MemoryBuffer.newHeapBuffer(10); diff --git a/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java index 71fc566aae..ad74ae5791 100644 --- a/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java @@ -25,9 +25,9 @@ import java.util.List; import java.util.Map; import java.util.function.Function; +import org.apache.fury.memory.Platform; import org.apache.fury.test.bean.Struct; import org.apache.fury.util.ClassLoaderUtils; -import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; import org.codehaus.commons.compiler.CompileException; import org.codehaus.commons.compiler.util.reflect.ByteArrayClassLoader; diff --git a/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java b/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java index 18d54abb08..bc65ce748c 100644 --- a/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java @@ -24,7 +24,6 @@ import java.nio.ByteBuffer; import java.util.Random; -import org.apache.fury.util.Platform; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/resolver/DisallowedListTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/DisallowedListTest.java index 3005a8b030..c2bd0c9aef 100644 --- a/java/fury-core/src/test/java/org/apache/fury/resolver/DisallowedListTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/resolver/DisallowedListTest.java @@ -24,7 +24,7 @@ import org.apache.fury.FuryTestBase; import org.apache.fury.config.Language; import org.apache.fury.exception.InsecureException; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java index 205da9a94b..e0f70d19c7 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java @@ -37,8 +37,8 @@ import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.util.MathUtils; -import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; import org.testng.Assert; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java index 774e8d6f46..efbe8f3bf6 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java @@ -40,9 +40,9 @@ import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.Serializer; import org.apache.fury.test.bean.CollectionFields; -import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java index 2e6197c754..1f3cc9095e 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java @@ -46,10 +46,10 @@ import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.Serializer; import org.apache.fury.test.bean.CollectionFields; import org.apache.fury.test.bean.MapFields; -import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/util/PlatformTest.java b/java/fury-core/src/test/java/org/apache/fury/util/PlatformTest.java index f00b640e95..7ced538bce 100644 --- a/java/fury-core/src/test/java/org/apache/fury/util/PlatformTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/util/PlatformTest.java @@ -27,6 +27,7 @@ import java.util.Arrays; import org.apache.fury.logging.Logger; import org.apache.fury.logging.LoggerFactory; +import org.apache.fury.memory.Platform; import org.testng.annotations.Test; public class PlatformTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/util/unsafe/DefineClassTest.java b/java/fury-core/src/test/java/org/apache/fury/util/unsafe/DefineClassTest.java index 70d5ccd6aa..da49bb1f14 100644 --- a/java/fury-core/src/test/java/org/apache/fury/util/unsafe/DefineClassTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/util/unsafe/DefineClassTest.java @@ -22,8 +22,8 @@ import java.util.Collections; import org.apache.fury.codegen.CompileUnit; import org.apache.fury.codegen.JaninoUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.util.ClassLoaderUtils; -import org.apache.fury.util.Platform; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java b/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java index 5dd30e69bb..251c271c83 100644 --- a/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java @@ -25,7 +25,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.testng.Assert; import org.testng.SkipException; import org.testng.annotations.Test; diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java index c69114fe18..3b1c5cb9c5 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java @@ -34,7 +34,7 @@ import org.apache.fury.memory.BitUtils; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.apache.fury.util.Preconditions; /** diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java index ea942baf62..d0e9886cd1 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java @@ -25,7 +25,7 @@ import org.apache.fury.format.type.DataTypes; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; /** * An BinaryMap implementation of Map which is backed by two BinaryArray./FuryObjectOutput diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java index 9bd72d8b1f..7cd4603210 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java @@ -34,7 +34,7 @@ import org.apache.fury.format.type.DataTypes; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; /** * Writer for binary array. See {@link BinaryArray} diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java index 3394b019c3..efc117a695 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java @@ -36,10 +36,10 @@ import org.apache.fury.io.MockWritableChannel; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.BufferObject; import org.apache.fury.serializer.Serializers.CrossLanguageCompatibleSerializer; import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; /** Serializers for apache arrow. */ public class ArrowSerializers { diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java index 1ccf361899..451e5e07cd 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java @@ -30,9 +30,9 @@ import org.apache.fury.Fury; import org.apache.fury.io.MemoryBufferReadableChannel; import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.Platform; import org.apache.fury.serializer.Serializers; import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; /** Serializers for {@link ArrowTable}. */ public class ArrowTableSerializer diff --git a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java index 03e4d75d34..8a4b922d0e 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java @@ -31,7 +31,7 @@ import org.apache.fury.logging.LoggerFactory; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.util.Platform; +import org.apache.fury.memory.Platform; import org.testng.annotations.Test; public class BinaryRowTest { diff --git a/licenserc.toml b/licenserc.toml index 77d85c65a1..66c0cadfff 100644 --- a/licenserc.toml +++ b/licenserc.toml @@ -45,7 +45,7 @@ excludes = [ "java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java", "java/fury-core/src/main/java/org/apache/fury/type/Generics.java", "java/fury-core/src/main/java/org/apache/fury/util/MurmurHash3.java", - "java/fury-core/src/main/java/org/apache/fury/util/Platform.java", + "java/fury-core/src/main/java/org/apache/fury/memory/Platform.java", "java/fury-core/src/main/java/org/apache/fury/util/Preconditions.java", "java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java", "java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java",