Skip to content

Commit 9f57161

Browse files
authored
Merge pull request #688 from AbsaOSS/release/2.7.2
Release Cobrix v2.7.2
2 parents 6d1c729 + 384eedb commit 9f57161

File tree

11 files changed

+31
-22
lines changed

11 files changed

+31
-22
lines changed

README.md

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ You can link against this library in your program at the following coordinates:
7474
</tr>
7575
<tr>
7676
<td>
77-
<pre>groupId: za.co.absa.cobrix<br>artifactId: spark-cobol_2.11<br>version: 2.7.1</pre>
77+
<pre>groupId: za.co.absa.cobrix<br>artifactId: spark-cobol_2.11<br>version: 2.7.2</pre>
7878
</td>
7979
<td>
80-
<pre>groupId: za.co.absa.cobrix<br>artifactId: spark-cobol_2.12<br>version: 2.7.1</pre>
80+
<pre>groupId: za.co.absa.cobrix<br>artifactId: spark-cobol_2.12<br>version: 2.7.2</pre>
8181
</td>
8282
<td>
83-
<pre>groupId: za.co.absa.cobrix<br>artifactId: spark-cobol_2.13<br>version: 2.7.1</pre>
83+
<pre>groupId: za.co.absa.cobrix<br>artifactId: spark-cobol_2.13<br>version: 2.7.2</pre>
8484
</td>
8585
</tr>
8686
</table>
@@ -91,17 +91,17 @@ This package can be added to Spark using the `--packages` command line option. F
9191

9292
### Spark compiled with Scala 2.11
9393
```
94-
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.11:2.7.1
94+
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.11:2.7.2
9595
```
9696

9797
### Spark compiled with Scala 2.12
9898
```
99-
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.7.1
99+
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.7.2
100100
```
101101

102102
### Spark compiled with Scala 2.13
103103
```
104-
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.13:2.7.1
104+
$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.13:2.7.2
105105
```
106106

107107
## Usage
@@ -238,18 +238,18 @@ to decode various binary formats.
238238

239239
The jars that you need to get are:
240240

241-
* spark-cobol_2.12-2.7.1.jar
242-
* cobol-parser_2.12-2.7.1.jar
241+
* spark-cobol_2.12-2.7.2.jar
242+
* cobol-parser_2.12-2.7.2.jar
243243
* scodec-core_2.12-1.10.3.jar
244244
* scodec-bits_2.12-1.1.4.jar
245245

246246
> Versions older than 2.7.1 also need `antlr4-runtime-4.8.jar`.
247247
248248
After that you can specify these jars in `spark-shell` command line. Here is an example:
249249
```
250-
$ spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.7.1
250+
$ spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.7.2
251251
or
252-
$ spark-shell --master yarn --deploy-mode client --driver-cores 4 --driver-memory 4G --jars spark-cobol_2.12-2.7.1.jar,cobol-parser_2.12-2.7.1.jar,scodec-core_2.12-1.10.3.jar,scodec-bits_2.12-1.1.4.jar
252+
$ spark-shell --master yarn --deploy-mode client --driver-cores 4 --driver-memory 4G --jars spark-cobol_2.12-2.7.2.jar,cobol-parser_2.12-2.7.2.jar,scodec-core_2.12-1.10.3.jar,scodec-bits_2.12-1.1.4.jar
253253
254254
Setting default log level to "WARN".
255255
To adjust logging level use sc.setLogLevel(newLevel). For SparkR, use setLogLevel(newLevel).
@@ -316,11 +316,11 @@ Creating an uber jar for Cobrix is very easy. Steps to build:
316316

317317
You can collect the uber jar of `spark-cobol` either at
318318
`spark-cobol/target/scala-2.11/` or in `spark-cobol/target/scala-2.12/` depending on the Scala version you used.
319-
The fat jar will have '-bundle' suffix. You can also download pre-built bundles from https://github.com/AbsaOSS/cobrix/releases/tag/v2.7.1
319+
The fat jar will have '-bundle' suffix. You can also download pre-built bundles from https://github.com/AbsaOSS/cobrix/releases/tag/v2.7.2
320320

321321
Then, run `spark-shell` or `spark-submit` adding the fat jar as the option.
322322
```sh
323-
$ spark-shell --jars spark-cobol_2.12_3.3-2.7.2-SNAPSHOT-bundle.jar
323+
$ spark-shell --jars spark-cobol_2.12_3.3-2.7.3-SNAPSHOT-bundle.jar
324324
```
325325

326326
> <b>A note for building and running tests on Windows</b>
@@ -1752,6 +1752,15 @@ at org.apache.hadoop.io.nativeio.NativeIO$POSIX.getStat(NativeIO.java:608)
17521752
A: Update hadoop dll to version 3.2.2 or newer.
17531753

17541754
## Changelog
1755+
- #### 2.7.2 released 7 June 2024.
1756+
- [#684](https://github.com/AbsaOSS/cobrix/issues/684) Fixed failing to read a data file in certain combination of options.
1757+
- [#685](https://github.com/AbsaOSS/cobrix/issues/685) Added methods to flatten schema of a dataframe more effective than `flattenSchema()`, but does not flatten arrays:
1758+
```scala
1759+
// df - a DataFrame with nested structs
1760+
val flatDf = SparkUtils.unstructDataFrame(df)
1761+
// flatDf the same dataframe with all nested fields promoted to the top level.
1762+
```
1763+
17551764
- #### 2.7.1 released 4 June 2024.
17561765
- [#680](https://github.com/AbsaOSS/cobrix/issues/680) Shaded ANTLR runtime in 'cobol-parser' to avoid conflicts with various versions of Spark that uses ANTLR as well.
17571766
- [#678](https://github.com/AbsaOSS/cobrix/issues/678) Added an experimental method `SparkUtils.covertIntegralToDecimal()` for applying extended metadata to a DataFrame.

cobol-converters/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>za.co.absa.cobrix</groupId>
2424
<artifactId>cobrix_2.12</artifactId>
25-
<version>2.7.2-SNAPSHOT</version>
25+
<version>2.7.3-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

cobol-parser/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>za.co.absa.cobrix</groupId>
2424
<artifactId>cobrix_2.12</artifactId>
25-
<version>2.7.2-SNAPSHOT</version>
25+
<version>2.7.3-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

examples/examples-collection/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<scala.compat.version>2.11</scala.compat.version>
3232
<spark.version>2.4.8</spark.version>
3333
<specs.version>2.4.16</specs.version>
34-
<spark.cobol.version>2.7.1</spark.cobol.version>
34+
<spark.cobol.version>2.7.2</spark.cobol.version>
3535
</properties>
3636

3737
<dependencies>

examples/spark-cobol-app/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ThisBuild / version := "0.1.0-SNAPSHOT"
2020
ThisBuild / scalaVersion := "2.12.17"
2121

2222
val sparkVersion = "3.3.2"
23-
val sparkCobolVersion = "2.7.1"
23+
val sparkCobolVersion = "2.7.2"
2424
val scalatestVersion = "3.2.14"
2525

2626
ThisBuild / libraryDependencies ++= Seq(

examples/spark-cobol-app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<scala.compat.version>2.12</scala.compat.version>
3232
<scalatest.version>3.2.14</scalatest.version>
3333
<spark.version>3.3.2</spark.version>
34-
<spark.cobol.version>2.7.1</spark.cobol.version>
34+
<spark.cobol.version>2.7.2</spark.cobol.version>
3535
</properties>
3636

3737
<dependencies>

examples/spark-cobol-s3-standalone/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<scala.compat.version>2.11</scala.compat.version>
3333
<scalatest.version>3.2.3</scalatest.version>
3434
<spark.version>2.4.8</spark.version>
35-
<spark.cobol.version>2.7.1</spark.cobol.version>
35+
<spark.cobol.version>2.7.2</spark.cobol.version>
3636
<hadoop.version>3.2.4</hadoop.version>
3737
</properties>
3838

examples/spark-cobol-s3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<scala.compat.version>2.11</scala.compat.version>
3333
<scalatest.version>3.2.14</scalatest.version>
3434
<spark.version>2.4.8</spark.version>
35-
<spark.cobol.version>2.7.1</spark.cobol.version>
35+
<spark.cobol.version>2.7.2</spark.cobol.version>
3636
</properties>
3737

3838
<dependencies>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<groupId>za.co.absa.cobrix</groupId>
2323
<artifactId>cobrix_2.12</artifactId>
2424

25-
<version>2.7.2-SNAPSHOT</version>
25+
<version>2.7.3-SNAPSHOT</version>
2626

2727
<packaging>pom</packaging>
2828

spark-cobol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>za.co.absa.cobrix</groupId>
2424
<artifactId>cobrix_2.12</artifactId>
25-
<version>2.7.2-SNAPSHOT</version>
25+
<version>2.7.3-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

0 commit comments

Comments
 (0)