Skip to content
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

Jump to bottom

change to 9 parameters constructor #823

Merged
merged 5 commits into from
Sep 3, 2024
Merged

change to 9 parameters constructor #823

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca37c4d
change to 9 parameters constructor
XavierZYXue Aug 1, 2024
1984144
add 7|8|9 parameters separately to be compatible with different version
XavierZYXue Aug 5, 2024
b5278de
update
XavierZYXue Aug 5, 2024
36c4f7b
change to 9 parameters constructor
XavierZYXue Aug 5, 2024
4925c68
change to match parameter type length
XavierZYXue Aug 13, 2024
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
29 changes: 21 additions & 8 deletions core/src/main/scala/za/co/absa/spline/harvester/plugin/embedded/BigQueryPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ class BigQueryPlugin(spark: SparkSession)

def bigQueryConfig = {
SparkBigQueryConfig.from(
ImmutableMap.copyOf(cmd.options.asJava),
cmd.options.asJava,
ImmutableMap.copyOf(spark.conf.getAll.asJava),
spark.sparkContext.hadoopConfiguration,
ImmutableMap.of,
0,
spark.sessionState.conf,
spark.version,
Optional.empty()
Optional.empty(),
true
)
}

Expand Down Expand Up @@ -145,9 +147,10 @@ object BigQueryPlugin {
.find(
m => m.getName == "from"
&& isStatic(m.getModifiers)
&& m.getParameterTypes.length == 7
&& (m.getParameterTypes.length == 7 || m.getParameterTypes.length == 8 || m.getParameterTypes.length == 9)
&& m.getReturnType.getSimpleName == "SparkBigQueryConfig"
).getOrElse(sys.error(s"Cannot find method `public static SparkBigQueryConfig from(... {7 args} ...)` in the class `$clazz`"))
)
.getOrElse(sys.error(s"Cannot find method `public static SparkBigQueryConfig from(... {7|8|9 args} ...)` in the class `$clazz`"))

object ImmutableMap {
type ImmutableMap = AnyRef
Expand All @@ -157,12 +160,22 @@ object BigQueryPlugin {
.getMethod("copyOf", classOf[java.util.Map[_, _]])
.invoke(imClass, _)
.asInstanceOf[ImmutableMap]
val of: ImmutableMap =
imClass
.getMethod("of")
.invoke(imClass)
.asInstanceOf[ImmutableMap]
}

val from: (ImmutableMap.ImmutableMap, ImmutableMap.ImmutableMap, Configuration, Integer, SQLConf, String, Optional[StructType]) => SparkBigQueryConfig =
methodFrom
.invoke(clazz, _, _, _, _, _, _, _)
.asInstanceOf[SparkBigQueryConfig]
val from: (java.util.Map[_, _], ImmutableMap.ImmutableMap, Configuration, ImmutableMap.ImmutableMap, Integer, SQLConf, String, Optional[StructType], java.lang.Boolean) => SparkBigQueryConfig = {
case (a, b, c, d, e, f, g, h, i) => {
methodFrom.getParameterTypes.length match {
case 7 => methodFrom.invoke(clazz, a, b, c, e, f, g, h).asInstanceOf[SparkBigQueryConfig]
case 8 => methodFrom.invoke(clazz, a, b, c, e, f, g, h, i).asInstanceOf[SparkBigQueryConfig]
case 9 => methodFrom.invoke(clazz, a, b, c, d, e, f, g, h, i).asInstanceOf[SparkBigQueryConfig]
}
}
}
}

private object `_: DirectBigQueryRelation` extends SafeTypeMatchingExtractor[AnyRef]("com.google.cloud.spark.bigquery.direct.DirectBigQueryRelation")
Expand Down
Loading