fix conflicts and remove examples

apache · Aug 2, 2024 · 1b7eef8 · 1b7eef8
1 parent 948c467
commit 1b7eef8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 63 deletions.
diff --git a/.../src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHFormatWriterInjects.scala b/.../src/main/scala/org/apache/spark/sql/execution/datasources/v1/CHFormatWriterInjects.scala
@@ -17,11 +17,8 @@
 package org.apache.spark.sql.execution.datasources.v1
 
 import org.apache.gluten.execution.datasource.GlutenRowSplitter
-<<<<<<< HEAD
-import org.apache.gluten.memory.CHThreadGroup
-=======
 import org.apache.gluten.expression.ConverterUtils
->>>>>>> 87de1cd33 ([GLUTEN-6588][CH] Cast columns if necessary before finally writing to ORC/Parquet files during native inserting)
+import org.apache.gluten.memory.CHThreadGroup
 import org.apache.gluten.vectorized.CHColumnVector
 
 import org.apache.spark.sql.SparkSession

diff --git a/cpp-ch/local-engine/examples/CMakeLists.txt b/cpp-ch/local-engine/examples/CMakeLists.txt
@@ -16,6 +16,3 @@
 clickhouse_add_executable(signal_demo signal_demo.cpp)
 target_link_libraries(signal_demo PRIVATE gluten_clickhouse_backend_libs
                                           loggers)
-
-clickhouse_add_executable(orc_read orc_read.cpp)
-target_link_libraries(orc_read PRIVATE gluten_clickhouse_backend_libs)
diff --git a/cpp-ch/local-engine/examples/orc_read.cpp b/cpp-ch/local-engine/examples/orc_read.cpp