solve conflict

apache · Sep 19, 2024 · a2a58c3 · a2a58c3
1 parent 8b53605
commit a2a58c3
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 32 deletions.
diff --git a/...ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/...ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -653,15 +653,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("cast from struct II")
     .exclude("cast from struct III")
   enableSuite[GlutenCollectionExpressionsSuite]
-<<<<<<< HEAD
-    .exclude("Array and Map Size")
-    .exclude("MapEntries")
-    .exclude("Map Concat")
-    .exclude("MapFromEntries")
-    .exclude("ArraysZip")
-=======
     .exclude("ArraysZip") // wait for https://github.com/ClickHouse/ClickHouse/pull/69576
->>>>>>> main
     .exclude("Sequence of numbers")
     .exclude("elementAt")
     .exclude("Shuffle")

diff --git a/...ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/...ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -681,15 +681,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("cast from struct II")
     .exclude("cast from struct III")
   enableSuite[GlutenCollectionExpressionsSuite]
-<<<<<<< HEAD
-    .exclude("Array and Map Size")
-    .exclude("MapEntries")
-    .exclude("Map Concat")
-    .exclude("MapFromEntries")
-    .exclude("ArraysZip")
-=======
     .exclude("ArraysZip") // wait for https://github.com/ClickHouse/ClickHouse/pull/69576
->>>>>>> main
     .exclude("Sequence of numbers")
     .exclude("elementAt")
     .exclude("Shuffle")

diff --git a/...ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/...ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -570,15 +570,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-36924: Cast YearMonthIntervalType to IntegralType")
     .exclude("SPARK-36924: Cast IntegralType to YearMonthIntervalType")
   enableSuite[GlutenCollectionExpressionsSuite]
-<<<<<<< HEAD
-    .exclude("Array and Map Size")
-    .exclude("MapEntries")
-    .exclude("Map Concat")
-    .exclude("MapFromEntries")
-    .exclude("ArraysZip")
-=======
     .exclude("ArraysZip") // wait for https://github.com/ClickHouse/ClickHouse/pull/69576
->>>>>>> main
     .exclude("Sequence of numbers")
     .exclude("elementAt")
     .exclude("Shuffle")

diff --git a/...ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/...ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -570,15 +570,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-36924: Cast YearMonthIntervalType to IntegralType")
     .exclude("SPARK-36924: Cast IntegralType to YearMonthIntervalType")
   enableSuite[GlutenCollectionExpressionsSuite]
-<<<<<<< HEAD
-    .exclude("Array and Map Size")
-    .exclude("MapEntries")
-    .exclude("Map Concat")
-    .exclude("MapFromEntries")
-    .exclude("ArraysZip")
-=======
     .exclude("ArraysZip") // wait for https://github.com/ClickHouse/ClickHouse/pull/69576
->>>>>>> main
     .exclude("Sequence of numbers")
     .exclude("elementAt")
     .exclude("Shuffle")