diff --git a/README.md b/README.md index 7c13b9c51..cc17da0cb 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ You can link against this library in your program at the following coordinates: ``` groupId: za.co.absa.cobrix artifactId: spark-cobol_2.11 -version: 2.3.0 +version: 2.4.0 ``` ### Scala 2.12 @@ -70,7 +70,7 @@ version: 2.3.0 ``` groupId: za.co.absa.cobrix artifactId: spark-cobol_2.12 -version: 2.3.0 +version: 2.4.0 ``` ## Using with Spark shell @@ -79,12 +79,12 @@ This package can be added to Spark using the `--packages` command line option. F ### Spark compiled with Scala 2.11 ``` -$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.11:2.3.0 +$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.11:2.4.0 ``` ### Spark compiled with Scala 2.12 ``` -$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.3.0 +$SPARK_HOME/bin/spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.4.0 ``` ## Usage @@ -156,7 +156,7 @@ If the input file is a text file (CRLF / LF are used to split records), use Multisegment ASCII text files are supported using this option: `.option("record_format", "D)`. -Read more on record formats at https://www.ibm.com/docs/en/zos/2.3.0?topic=files-selecting-record-formats-non-vsam-data-sets +Read more on record formats at https://www.ibm.com/docs/en/zos/2.4.0?topic=files-selecting-record-formats-non-vsam-data-sets ### Streaming Cobol binary files from a directory @@ -209,17 +209,17 @@ to decode various binary formats. The jars that you need to get are: -* spark-cobol_2.12-2.3.0.jar -* cobol-parser_2.12-2.3.0.jar +* spark-cobol_2.12-2.4.0.jar +* cobol-parser_2.12-2.4.0.jar * scodec-core_2.12-1.10.3.jar * scodec-bits_2.12-1.1.4.jar * antlr4-runtime-4.7.2.jar After that you can specify these jars in `spark-shell` command line. Here is an example: ``` -$ spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.3.0 +$ spark-shell --packages za.co.absa.cobrix:spark-cobol_2.12:2.4.0 or -$ spark-shell --master yarn --deploy-mode client --driver-cores 4 --driver-memory 4G --jars spark-cobol_2.12-2.3.0.jar,cobol-parser_2.12-2.3.0.jar,scodec-core_2.12-1.10.3.jar,scodec-bits_2.12-1.1.4.jar,antlr4-runtime-4.7.2.jar +$ spark-shell --master yarn --deploy-mode client --driver-cores 4 --driver-memory 4G --jars spark-cobol_2.12-2.4.0.jar,cobol-parser_2.12-2.4.0.jar,scodec-core_2.12-1.10.3.jar,scodec-bits_2.12-1.1.4.jar,antlr4-runtime-4.7.2.jar Setting default log level to "WARN". To adjust logging level use sc.setLogLevel(newLevel). For SparkR, use setLogLevel(newLevel). @@ -275,7 +275,7 @@ You can collect the uber jar of `spark-cobol` either at Then, run `spark-shell` or `spark-submit` adding the fat jar as the option. ```sh -$ spark-shell --jars spark-cobol-assembly-2.4.0-SNAPSHOT.jar +$ spark-shell --jars spark-cobol-assembly-2.4.1-SNAPSHOT.jar ``` ## Other Features @@ -1287,7 +1287,7 @@ For multisegment variable lengths tests: ![](performance/images/exp3_multiseg_wide_records_throughput.svg) ![](performance/images/exp3_multiseg_wide_mb_throughput.svg) ## Changelog -- #### 2.4.0 to be released soon. +- #### 2.4.0 released 7 September 2021. - [#412](https://github.com/AbsaOSS/cobrix/issues/412) Add support for [variable block (VB aka VBVR)](https://www.ibm.com/docs/en/zos/2.3.0?topic=formats-format-v-records) record format. Options to adjust BDW settings are added: - `is_bdw_big_endian` - specifies if BDW is big-endian (false by default) diff --git a/cobol-converters/pom.xml b/cobol-converters/pom.xml index 1988d8250..0bc9a28d6 100644 --- a/cobol-converters/pom.xml +++ b/cobol-converters/pom.xml @@ -22,7 +22,7 @@ za.co.absa.cobrix cobrix_2.12 - 2.4.0-SNAPSHOT + 2.4.1-SNAPSHOT ../pom.xml diff --git a/cobol-parser/pom.xml b/cobol-parser/pom.xml index 7e4471115..f15c748fd 100644 --- a/cobol-parser/pom.xml +++ b/cobol-parser/pom.xml @@ -22,7 +22,7 @@ za.co.absa.cobrix cobrix_2.12 - 2.4.0-SNAPSHOT + 2.4.1-SNAPSHOT ../pom.xml diff --git a/cobol-parser/src/test/scala/za/co/absa/cobrix/cobol/reader/extractors/raw/RawRecordContextFactory.scala b/cobol-parser/src/test/scala/za/co/absa/cobrix/cobol/reader/extractors/raw/RawRecordContextFactory.scala index 5d99aa6f2..003614770 100644 --- a/cobol-parser/src/test/scala/za/co/absa/cobrix/cobol/reader/extractors/raw/RawRecordContextFactory.scala +++ b/cobol-parser/src/test/scala/za/co/absa/cobrix/cobol/reader/extractors/raw/RawRecordContextFactory.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2018 ABSA Group Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package za.co.absa.cobrix.cobol.reader.extractors.raw import za.co.absa.cobrix.cobol.parser.{Copybook, CopybookParser} diff --git a/examples/examples-collection/pom.xml b/examples/examples-collection/pom.xml index 74a175e3d..05be11891 100644 --- a/examples/examples-collection/pom.xml +++ b/examples/examples-collection/pom.xml @@ -31,7 +31,7 @@ 2.11 2.4.4 2.4.16 - 2.3.0 + 2.4.0 diff --git a/examples/spark-cobol-app/build.sbt b/examples/spark-cobol-app/build.sbt index 792c9cd39..c8b462b70 100644 --- a/examples/spark-cobol-app/build.sbt +++ b/examples/spark-cobol-app/build.sbt @@ -20,7 +20,7 @@ ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / scalaVersion := "2.12.12" val sparkVersion = "3.0.1" -val sparkCobolVersion = "2.3.0" +val sparkCobolVersion = "2.4.0" val scalatestVersion = "3.0.1" ThisBuild / libraryDependencies ++= Seq( diff --git a/examples/spark-cobol-app/pom.xml b/examples/spark-cobol-app/pom.xml index 0502607cb..c034706d4 100755 --- a/examples/spark-cobol-app/pom.xml +++ b/examples/spark-cobol-app/pom.xml @@ -31,7 +31,7 @@ 2.12 3.0.1 3.0.1 - 2.3.0 + 2.4.0 diff --git a/examples/spark-cobol-s3-standalone/pom.xml b/examples/spark-cobol-s3-standalone/pom.xml index 69a597fc8..1b7442d34 100755 --- a/examples/spark-cobol-s3-standalone/pom.xml +++ b/examples/spark-cobol-s3-standalone/pom.xml @@ -32,7 +32,7 @@ 2.11 3.2.3 2.4.8 - 2.3.0 + 2.4.0 3.2.0 diff --git a/examples/spark-cobol-s3/pom.xml b/examples/spark-cobol-s3/pom.xml index 1796b908f..0209d80e4 100755 --- a/examples/spark-cobol-s3/pom.xml +++ b/examples/spark-cobol-s3/pom.xml @@ -32,7 +32,7 @@ 2.11 3.0.0 2.4.8 - 2.3.0 + 2.4.0 diff --git a/pom.xml b/pom.xml index 2057d4835..ecf66fb48 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ za.co.absa.cobrix cobrix_2.12 - 2.4.0-SNAPSHOT + 2.4.1-SNAPSHOT pom diff --git a/spark-cobol/pom.xml b/spark-cobol/pom.xml index 29de93e4a..868e7088c 100644 --- a/spark-cobol/pom.xml +++ b/spark-cobol/pom.xml @@ -22,7 +22,7 @@ za.co.absa.cobrix cobrix_2.12 - 2.4.0-SNAPSHOT + 2.4.1-SNAPSHOT ../pom.xml diff --git a/version.sbt b/version.sbt index 341046bbb..5c5503760 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "2.4.0-SNAPSHOT" +version in ThisBuild := "2.4.1-SNAPSHOT"