Skip to content

Remove commons-io dependency from Azure Cosmos Spark #47367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove commons-io dependency from Azure Cosmos Spark #47367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions sdk/cosmos/azure-cosmos-spark_3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@
<version>2.12.19</version> <!-- {x-version-update;cosmos_org.scala-lang:scala-library;external_dependency} -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version> <!-- {x-version-update;cosmos_commons-io:commons-io;external_dependency} -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
Expand Down Expand Up @@ -288,7 +282,6 @@
<include>org.apache.spark:spark-sql_2.12:[3.3.0]</include> <!-- {x-include-update;cosmos-spark_3-3_org.apache.spark:spark-sql_2.12;external_dependency} -->
<include>org.apache.spark:spark-sql_2.12:[3.4.0]</include> <!-- {x-include-update;cosmos-spark_3-4_org.apache.spark:spark-sql_2.12;external_dependency} -->
<include>org.apache.spark:spark-sql_2.12:[3.5.0]</include> <!-- {x-include-update;cosmos-spark_3-5_org.apache.spark:spark-sql_2.12;external_dependency} -->
<include>commons-io:commons-io:[2.4]</include> <!-- {x-include-update;cosmos_commons-io:commons-io;external_dependency} -->
<include>org.scala-lang:scala-library:[2.12.19]</include> <!-- {x-include-update;cosmos_org.scala-lang:scala-library;external_dependency} -->
<include>org.scala-lang.modules:scala-java8-compat_2.12:[0.8.0]</include> <!-- {x-include-update;cosmos_org.scala-lang.modules:scala-java8-compat_2.12;external_dependency} -->
<include>io.projectreactor:reactor-scala-extensions_2.12:[0.8.0]</include> <!-- {x-include-update;cosmos_io.projectreactor:reactor-scala-extensions_2.12;external_dependency} -->
Expand Down
24 changes: 22 additions & 2 deletions ...-cosmos-spark_3/src/main/scala/com/azure/cosmos/spark/ChangeFeedInitialOffsetWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT License.
package com.azure.cosmos.spark

import org.apache.commons.io.IOUtils
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.execution.streaming.{HDFSMetadataLog, MetadataVersionUtil}

Expand All @@ -25,7 +24,7 @@ private class ChangeFeedInitialOffsetWriter
}

override def deserialize(in: InputStream): String = {
val content = IOUtils.toString(new InputStreamReader(in, StandardCharsets.UTF_8))
val content = readerToString(new InputStreamReader(in, StandardCharsets.UTF_8))
// HDFSMetadataLog would never create a partial file.
require(content.nonEmpty)
val indexOfNewLine = content.indexOf("\n")
Expand All @@ -37,4 +36,25 @@ private class ChangeFeedInitialOffsetWriter
MetadataVersionUtil.validateVersion(content.substring(0, indexOfNewLine), VERSION)
content.substring(indexOfNewLine + 1)
}

private def readerToString(reader: java.io.Reader): String = {
val writer = new StringBuilderWriter
val buffer = new Array[Char](4096)
Stream.continually(reader.read(buffer)).takeWhile(_ != -1).foreach(writer.write(buffer, 0, _))
writer.toString
}

private class StringBuilderWriter extends java.io.Writer {
private val stringBuilder = new StringBuilder

override def write(cbuf: Array[Char], off: Int, len: Int): Unit = {
stringBuilder.appendAll(cbuf, off, len)
}

override def flush(): Unit = {}

override def close(): Unit = {}

override def toString: String = stringBuilder.toString()
}
}
Loading