final fixes for #518

apache · Jun 21, 2024 · 04c9026 · 04c9026
1 parent ec1c5c4
commit 04c9026
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/cpp/src/filesystem.cc b/cpp/src/filesystem.cc
@@ -172,8 +172,8 @@ Result<T> FileSystem::ReadFileToValue(const std::string& path) const noexcept {
 }
 
 template <>
-Result<std::string> FileSystem::ReadFileToValue(
-    const std::string& path) const noexcept {
+Result<std::string> FileSystem::ReadFileToValue(const std::string& path) const
+    noexcept {
   GAR_RETURN_ON_ARROW_ERROR_AND_ASSIGN(auto access_file,
                                        arrow_fs_->OpenInputFile(path));
   GAR_RETURN_ON_ARROW_ERROR_AND_ASSIGN(auto bytes, access_file->GetSize());
@@ -311,6 +311,7 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(
 template Result<IdType> FileSystem::ReadFileToValue<IdType>(
     const std::string&) const noexcept;
 /// template specialization for std::string
-template Status FileSystem::WriteValueToFile<IdType>(
-    const IdType&, const std::string&) const noexcept;
+template Status FileSystem::WriteValueToFile<IdType>(const IdType&,
+                                                     const std::string&) const
+    noexcept;
 }  // namespace graphar
diff --git a/.../sql/graphar/json/JSONWriterBuilder.scala → ...k/sql/graphar/json/JSONWriteBuilder.scala b/.../sql/graphar/json/JSONWriterBuilder.scala → ...k/sql/graphar/json/JSONWriteBuilder.scala
@@ -47,7 +47,6 @@ class JSONWriteBuilder(
       dataSchema: StructType
   ): OutputWriterFactory = {
     val conf = job.getConfiguration
-    //val parsedOptions = null
     val parsedOptions = new JSONOptions(
       options,
       sqlConf.sessionLocalTimeZone,

diff --git a/...-projects/spark/datasources-33/src/main/scala/org/apache/spark/sql/graphar/GarTable.scala b/...-projects/spark/datasources-33/src/main/scala/org/apache/spark/sql/graphar/GarTable.scala
@@ -35,7 +35,6 @@ import org.apache.spark.sql.graphar.json.JSONWriteBuilder
 import org.apache.spark.sql.types._
 import org.apache.spark.sql.util.CaseInsensitiveStringMap
 import org.apache.spark.sql.execution.datasources.json.JsonDataSource
-//import org.apache.spark.sql.execution.datasources.v2.json.JsonWrite
 import org.apache.spark.sql.catalyst.json.JSONOptions
 
 import scala.collection.JavaConverters._

diff --git a/.../sql/graphar/json/JSONWriterBuilder.scala → ...k/sql/graphar/json/JSONWriteBuilder.scala b/.../sql/graphar/json/JSONWriterBuilder.scala → ...k/sql/graphar/json/JSONWriteBuilder.scala
@@ -47,7 +47,6 @@ class JSONWriteBuilder(
       dataSchema: StructType
   ): OutputWriterFactory = {
     val conf = job.getConfiguration
-    // val parsedOptions = null
     val parsedOptions = new JSONOptions(
       options,
       sqlConf.sessionLocalTimeZone,