Skip to content

Commit 356d740

Browse files
Move version to 1.0.0 for first initial release
1 parent d247d8d commit 356d740

File tree

4 files changed

+9
-17
lines changed

4 files changed

+9
-17
lines changed

build.sbt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ scalaVersion := "2.11.12"
66

77
crossScalaVersions := Seq("2.11.12")
88

9-
version := "0.0.1"
10-
119
spName := "minio/spark-select"
1210

1311
spAppendScalaVersion := true
@@ -47,7 +45,8 @@ libraryDependencies ++= Seq(
4745

4846
/**
4947
* release settings
50-
*/
48+
*/
49+
5150
publishMavenStyle := true
5251

5352
releaseCrossBuild := true
@@ -70,13 +69,6 @@ publishTo := {
7069

7170
pomExtra := (
7271
<url>https://github.com/minio/spark-select</url>
73-
<licenses>
74-
<license>
75-
<name>Apache License, Verision 2.0</name>
76-
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
77-
<distribution>repo</distribution>
78-
</license>
79-
</licenses>
8072
<scm>
8173
<connection>scm:git:github.com/minio/spark-select</connection>
8274
<developerConnection>scm:git:git@github.com:minio/spark-select</developerConnection>

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
1212

1313
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
1414

15-
addSbtPlugin("org.spark-packages" % "sbt-spark-package" % "0.2.3")
15+
addSbtPlugin("org.spark-packages" % "sbt-spark-package" % "0.2.4")
1616

1717
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.6.0")
1818

src/main/scala/io/minio/spark/select/SelectCSVRelation.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,12 @@ case class SelectCSVRelation protected[spark] (
109109
}
110110

111111
private def queryFromSchema(schema: StructType, filters: Array[Filter]): String = {
112-
val columnList = schema.fields.map(x => s"${x.name}").mkString(",")
113-
if (filters == null) {
114-
s"select $columnList from S3Object"
115-
} else {
116-
val whereClause = FilterPushdown.buildWhereClause(schema, filters)
117-
s"select $columnList from S3Object $whereClause"
112+
var columnList = schema.fields.map(x => s"${x.name}").mkString(",")
113+
if (columnList.length == 0) {
114+
columnList = "*"
118115
}
116+
val whereClause = FilterPushdown.buildWhereClause(schema, filters)
117+
s"select $columnList from S3Object $whereClause"
119118
}
120119

121120
private def selectRequest(location: Option[String], params: Map[String, String],

version.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version in ThisBuild := "1.0.0"

0 commit comments

Comments
 (0)