Add changes made thus far

gagik · gagik · commit 801e3564a235 · 2022-12-16T14:20:48.000+01:00
diff --git a/packages/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/MemAllocator.kt b/packages/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/MemAllocator.kt
@@ -65,7 +65,7 @@ interface MemAllocator {
     /**
      * Instantiates a [RealmValue] representing a `realm_value_t` of type `RLM_TYPE_DECIMAL128`.
      */
-    fun decimal128Transport(value: ULongArray?): RealmValue
+    fun decimal128Transport(value: Decimal128?): RealmValue
 
     /**
      * Instantiates a [RealmValue] representing a `realm_value_t` of type `RLM_TYPE_OBJECT_ID` from
diff --git a/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/RealmValueAllocator.kt b/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/RealmValueAllocator.kt
@@ -51,13 +51,12 @@ object JvmMemAllocator : MemAllocator {
     override fun doubleTransport(value: Double?): RealmValue =
         createTransport(value, realm_value_type_e.RLM_TYPE_DOUBLE) { dnum = value!! }
 
-    @ExperimentalUnsignedTypes
-    override fun decimal128Transport(value: ULongArray?): RealmValue =
+    override fun decimal128Transport(value: Decimal128?): RealmValue =
         createTransport(value, realm_value_type_e.RLM_TYPE_DECIMAL128) {
             decimal128 = realm_decimal128_t().apply {
-                w = value!!.toLongArray()
+                w = longArrayOf(value!!.low.toLong(), value.high.toLong())
             }
-    }
+        }
 
     override fun objectIdTransport(value: ByteArray?): RealmValue =
         createTransport(value, realm_value_type_e.RLM_TYPE_OBJECT_ID) {
diff --git a/packages/cinterop/src/nativeDarwin/kotlin/io/realm/kotlin/internal/interop/RealmValue.kt b/packages/cinterop/src/nativeDarwin/kotlin/io/realm/kotlin/internal/interop/RealmValue.kt
@@ -17,6 +17,7 @@
 package io.realm.kotlin.internal.interop
 
 import kotlinx.cinterop.addressOf
+import kotlinx.cinterop.get
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.usePinned
 import org.mongodb.kbson.Decimal128
diff --git a/packages/cinterop/src/nativeDarwin/kotlin/io/realm/kotlin/internal/interop/RealmValueAllocator.kt b/packages/cinterop/src/nativeDarwin/kotlin/io/realm/kotlin/internal/interop/RealmValueAllocator.kt
@@ -68,13 +68,14 @@ class NativeMemAllocator : MemTrackingAllocator {
         createTransport(value, realm_value_type.RLM_TYPE_DOUBLE) { dnum = value!! }
 
     @OptIn(ExperimentalUnsignedTypes::class)
-    override fun decimal128Transport(value: ULongArray?): RealmValue =
+    override fun decimal128Transport(value: Decimal128?): RealmValue =
         createTransport(value, realm_value_type.RLM_TYPE_DECIMAL128) {
             decimal128.apply {
-                value!!.usePinned {
-                    val dest = w.getPointer(scope)
-                    val source = it.addressOf(0)
-                    memcpy(dest, source, 2.toULong())
+                val valueArray = ULongArray(2) {
+                    if (it == 0) value!!.low else value!!.high
+                }
+                (0 until 2).map {
+                    w[it] = valueArray[it]
                 }
             }
         }
diff --git a/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/Converters.kt b/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/Converters.kt
@@ -164,7 +164,7 @@ internal object Decimal128Converter : PassThroughPublicConverter<Decimal128>() {
         if (realmValue.isNull()) null else realmValueToDecimal128(realmValue)
 
     override inline fun MemTrackingAllocator.toRealmValue(value: Decimal128?): RealmValue =
-        TODO("BsonDecimal128 doesn't expose 'high' and 'low' so we can't create transport objects towards the C-API yet.")
+        decimal128Transport(value)
 }
 
 // Converter for Core INT storage type (i.e. Byte, Short, Int and Char public types )
diff --git a/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/RealmObjectHelper.kt b/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/RealmObjectHelper.kt
@@ -196,9 +196,7 @@ internal object RealmObjectHelper {
                 is Timestamp -> setValueTransportByKey(obj, key, timestampTransport(value))
                 is Float -> setValueTransportByKey(obj, key, floatTransport(value))
                 is Double -> setValueTransportByKey(obj, key, doubleTransport(value))
-                is Decimal128 -> setValueTransportByKey(obj, key, decimal128Transport(ULongArray(2) {
-                   i -> if (i == 0) value.low else value.high
-                }))
+                is Decimal128 -> setValueTransportByKey(obj, key, decimal128Transport(value))
                 is BsonObjectId -> setValueTransportByKey(
                     obj,
                     key,
diff --git a/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/query/ObjectQuery.kt b/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/query/ObjectQuery.kt
@@ -176,6 +176,7 @@ internal class ObjectQuery<E : BaseRealmObject> constructor(
 
     private fun parseQuery(): RealmQueryPointer = tryCatchCoreException {
         inputScope {
+            // val args1 = convertToQueryArgs(args)
             RealmInterop.realm_query_parse(
                 realmReference.dbPointer,
                 classKey,
diff --git a/packages/test-base/src/androidAndroidTest/kotlin/io/realm/kotlin/test/shared/ImportTests.kt b/packages/test-base/src/androidAndroidTest/kotlin/io/realm/kotlin/test/shared/ImportTests.kt
@@ -30,6 +30,7 @@ import io.realm.kotlin.types.RealmInstant
 import io.realm.kotlin.types.RealmObject
 import io.realm.kotlin.types.RealmUUID
 import org.mongodb.kbson.BsonObjectId
+import org.mongodb.kbson.Decimal128
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -83,6 +84,7 @@ class ImportTests {
                 Boolean::class -> assertEquals(true, managed.booleanField)
                 Float::class -> assertEquals(3.14f, managed.floatField)
                 Double::class -> assertEquals(1.19840122, managed.doubleField)
+                Decimal128::class -> assertEquals(Decimal128("1.8446744073709551618E-6157"), managed.decimal128Field)
                 RealmInstant::class -> assertEquals(RealmInstant.from(100, 1000), managed.timestampField)
                 ObjectId::class -> assertEquals(ObjectId.from("507f1f77bcf86cd799439011"), managed.objectIdField)
                 BsonObjectId::class -> assertEquals(BsonObjectId("507f1f77bcf86cd799439011"), managed.bsonObjectIdField)
diff --git a/packages/test-base/src/androidAndroidTest/kotlin/io/realm/kotlin/test/shared/MutableRealmTests.kt b/packages/test-base/src/androidAndroidTest/kotlin/io/realm/kotlin/test/shared/MutableRealmTests.kt
@@ -36,6 +36,7 @@ import io.realm.kotlin.test.platform.PlatformUtils
 import io.realm.kotlin.types.RealmInstant
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
+import org.mongodb.kbson.Decimal128
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -177,6 +178,7 @@ class MutableRealmTests {
             booleanField = false
             floatField = 42.42f
             doubleField = 42.42
+            decimal128Field = Decimal128("1.8446744073709551618E-6157")
             timestampField = RealmInstant.from(42, 42)
 
             nullableStringField = "UPDATED"
@@ -188,6 +190,7 @@ class MutableRealmTests {
             nullableBooleanField = false
             nullableFloatField = 42.42f
             nullableDoubleField = 42.42
+            nullableDecimal128Field = Decimal128("1.8446744073709551618E-6157")
             nullableTimestampField = RealmInstant.from(42, 42)
             nullableObject = this
 
@@ -228,6 +231,7 @@ class MutableRealmTests {
             assertEquals(false, booleanField)
             assertEquals(42.42f, floatField)
             assertEquals(42.42, doubleField)
+            assertEquals(Decimal128("1.8446744073709551618E-6157"), decimal128Field)
             assertEquals(RealmInstant.from(42, 42), timestampField)
 
             assertEquals("UPDATED", nullableStringField)
@@ -239,6 +243,7 @@ class MutableRealmTests {
             assertEquals(false, nullableBooleanField)
             assertEquals(42.42f, nullableFloatField)
             assertEquals(42.42, nullableDoubleField)
+            assertEquals(Decimal128("1.8446744073709551618E-6157"), nullableDecimal128Field)
             assertEquals(RealmInstant.from(42, 42), nullableTimestampField)
             assertEquals(primaryKey, nullableObject!!.primaryKey)
 
diff --git a/packages/test-base/src/commonMain/kotlin/io/realm/kotlin/entities/Nullability.kt b/packages/test-base/src/commonMain/kotlin/io/realm/kotlin/entities/Nullability.kt
@@ -22,6 +22,7 @@ import io.realm.kotlin.types.RealmInstant
 import io.realm.kotlin.types.RealmObject
 import io.realm.kotlin.types.RealmUUID
 import org.mongodb.kbson.BsonObjectId
+import org.mongodb.kbson.Decimal128
 
 class Nullability : RealmObject {
     var stringNullable: String? = null
@@ -36,6 +37,7 @@ class Nullability : RealmObject {
 
     var floatNullable: Float? = null
     var doubleField: Double? = null
+    var decimal128Field: Decimal128? = null
     var timestampField: RealmInstant? = null
     var objectIdField: ObjectId? = null
     var bsonObjectIdField: BsonObjectId? = null
diff --git a/packages/test-base/src/commonMain/kotlin/io/realm/kotlin/entities/SampleWithPrimaryKey.kt b/packages/test-base/src/commonMain/kotlin/io/realm/kotlin/entities/SampleWithPrimaryKey.kt
@@ -26,6 +26,7 @@ import io.realm.kotlin.types.RealmObject
 import io.realm.kotlin.types.RealmSet
 import io.realm.kotlin.types.annotations.PrimaryKey
 import org.mongodb.kbson.BsonObjectId
+import org.mongodb.kbson.Decimal128
 
 @Suppress("MagicNumber")
 class SampleWithPrimaryKey : RealmObject {
@@ -41,6 +42,7 @@ class SampleWithPrimaryKey : RealmObject {
     var booleanField: Boolean = true
     var floatField: Float = 3.14f
     var doubleField: Double = 1.19840122
+    var decimal128Field: Decimal128 = Decimal128("1.8446744073709551618E-6157")
     var timestampField: RealmInstant = RealmInstant.from(100, 1000)
 
     var nullableStringField: String? = null
@@ -52,6 +54,7 @@ class SampleWithPrimaryKey : RealmObject {
     var nullableBooleanField: Boolean? = null
     var nullableFloatField: Float? = null
     var nullableDoubleField: Double? = null
+    var nullableDecimal128Field: Decimal128? = null
     var nullableTimestampField: RealmInstant? = null
     var nullableObject: SampleWithPrimaryKey? = null
 

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,14 @@ class NativeMemAllocator : MemTrackingAllocator {`
`68`	`68`	`createTransport(value, realm_value_type.RLM_TYPE_DOUBLE) { dnum = value!! }`
`69`	`69`
`70`	`70`	`@OptIn(ExperimentalUnsignedTypes::class)`
`71`		`- override fun decimal128Transport(value: ULongArray?): RealmValue =`
	`71`	`+ override fun decimal128Transport(value: Decimal128?): RealmValue =`
`72`	`72`	`createTransport(value, realm_value_type.RLM_TYPE_DECIMAL128) {`
`73`	`73`	`decimal128.apply {`
`74`		`- value!!.usePinned {`
`75`		`- val dest = w.getPointer(scope)`
`76`		`- val source = it.addressOf(0)`
`77`		`- memcpy(dest, source, 2.toULong())`
	`74`	`+ val valueArray = ULongArray(2) {`
	`75`	`+ if (it == 0) value!!.low else value!!.high`
	`76`	`+ }`
	`77`	`+ (0 until 2).map {`
	`78`	`+ w[it] = valueArray[it]`
`78`	`79`	`}`
`79`	`80`	`}`
`80`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ internal object Decimal128Converter : PassThroughPublicConverter<Decimal128>() {`
`164`	`164`	`if (realmValue.isNull()) null else realmValueToDecimal128(realmValue)`
`165`	`165`
`166`	`166`	`override inline fun MemTrackingAllocator.toRealmValue(value: Decimal128?): RealmValue =`
`167`		`- TODO("BsonDecimal128 doesn't expose 'high' and 'low' so we can't create transport objects towards the C-API yet.")`
	`167`	`+ decimal128Transport(value)`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`// Converter for Core INT storage type (i.e. Byte, Short, Int and Char public types )`