Skip to content

Commit 2131226

Browse files
committed
replaced usage of DataSchema.equals with .compare()
1 parent 2558177 commit 2131226

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/ReplCodeGeneratorImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ internal class ReplCodeGeneratorImpl : ReplCodeGenerator {
6363
if (currentMarker.isOpen) {
6464
val columnSchema = currentMarker.schema
6565
// for mutable properties we do strong typing only at the first processing, after that we allow its type to be more general than actual dataframe type
66-
if (wasProcessedBefore || columnSchema == targetSchema) {
66+
if (wasProcessedBefore || columnSchema.compare(targetSchema).isEqual()) {
6767
// property scheme is valid for current dataframe, but we should also check that all compatible open markers are implemented by it
6868
val requiredBaseMarkers = registeredMarkers.values.filterRequiredForSchema(columnSchema)
6969
if (requiredBaseMarkers.any() && requiredBaseMarkers.all { currentMarker.implements(it) }) {

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/codeGen/SchemaProcessorImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ internal class SchemaProcessorImpl(
159159
val markerName: String
160160
val required = schema.getRequiredMarkers()
161161
val existingMarker = registeredMarkers.firstOrNull {
162-
(!isOpen || it.isOpen) && it.schema == schema && it.implementsAll(required)
162+
(!isOpen || it.isOpen) && it.schema.compare(schema).isEqual() && it.implementsAll(required)
163163
}
164164
if (existingMarker != null) {
165165
return existingMarker

0 commit comments

Comments
 (0)