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

Adding Option for custom date format string (#901) #902

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adding Option for custom date format string (#901) #902

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c60585
Adding Option for custome date format string (#901)
jphillips-grier Dec 22, 2022
7b891c3
Properly format with scalafmt
jp-9 Dec 23, 2022
e018f13
Merge branch 'master' into feat/cassandra-optional-dateformat
jp-9 Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...in/scala/com/datamountaineer/streamreactor/connect/cassandra/config/CassandraConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,17 @@ object CassandraConfigSource {
ConfigDef.Width.MEDIUM,
CassandraConfigConstants.INITIAL_OFFSET,
)
.define(
CassandraConfigConstants.DATE_FORMAT_STRING,
Type.STRING,
CassandraConfigConstants.DATE_FORMAT_STRING_DEFAULT,
Importance.LOW,
CassandraConfigConstants.DATE_FORMAT_STRING_DOC,
"Import",
10,
ConfigDef.Width.MEDIUM,
CassandraConfigConstants.DATE_FORMAT_STRING,
)
.define(
CassandraConfigConstants.MAPPING_COLLECTION_TO_JSON,
Type.BOOLEAN,
Expand Down
5 changes: 5 additions & 0 deletions ...com/datamountaineer/streamreactor/connect/cassandra/config/CassandraConfigConstants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ object CassandraConfigConstants {
val INITIAL_OFFSET_DOC =
"The initial timestamp to start querying in Cassandra from (yyyy-MM-dd HH:mm:ss.SSS'Z'). Default 1900-01-01 00:00:00.0000000Z"

val DATE_FORMAT_STRING = s"$CONNECTOR_PREFIX.date.format.string"
val DATE_FORMAT_STRING_DEFAULT = "yyyy-MM-dd HH:mm:ss.SSS'Z'"
val DATE_FORMAT_STRING_DOC =
"The format string to use for formatting the initial offset and other "

val MAPPING_COLLECTION_TO_JSON = s"$CONNECTOR_PREFIX.mapping.collection.to.json"
val MAPPING_COLLECTION_TO_JSON_DOC = "Mapping columns with type Map, List and Set like json"
val MAPPING_COLLECTION_TO_JSON_DEFAULT = true
Expand Down
3 changes: 3 additions & 0 deletions .../scala/com/datamountaineer/streamreactor/connect/cassandra/config/CassandraSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ case class CassandraSourceSetting(
timeSliceDuration: Long = CassandraConfigConstants.TIMESLICE_DURATION_DEFAULT,
timeSliceDelay: Long = CassandraConfigConstants.TIMESLICE_DELAY_DEFAULT,
initialOffset: String = CassandraConfigConstants.INITIAL_OFFSET_DEFAULT,
dateFormatString: String = CassandraConfigConstants.DATE_FORMAT_STRING_DEFAULT,
timeSliceMillis: Long = CassandraConfigConstants.TIME_SLICE_MILLIS_DEFAULT,
mappingCollectionToJson: Boolean = CassandraConfigConstants.MAPPING_COLLECTION_TO_JSON_DEFAULT,
connectTimeout: Int = CassandraConfigConstants.DEFAULT_CONNECT_TIMEOUT,
Expand Down Expand Up @@ -116,6 +117,7 @@ object CassandraSettings extends StrictLogging {
val timeSliceDuration = config.getLong(CassandraConfigConstants.TIMESLICE_DURATION)
val timeSliceDelay = config.getLong(CassandraConfigConstants.TIMESLICE_DELAY)
val initialOffset = config.getString(CassandraConfigConstants.INITIAL_OFFSET)
val dateFormatString = config.getString(CassandraConfigConstants.DATE_FORMAT_STRING)
val timeSliceMillis = config.getLong(CassandraConfigConstants.TIME_SLICE_MILLIS)
val mappingCollectionToJson = config.getBoolean(CassandraConfigConstants.MAPPING_COLLECTION_TO_JSON)

Expand Down Expand Up @@ -159,6 +161,7 @@ object CassandraSettings extends StrictLogging {
fetchSize = fetchSize,
timeSliceDuration = timeSliceDuration,
timeSliceDelay = timeSliceDelay,
dateFormatString = dateFormatString,
initialOffset = initialOffset,
timeSliceMillis = timeSliceMillis,
mappingCollectionToJson = mappingCollectionToJson,
Expand Down
6 changes: 3 additions & 3 deletions ...ala/com/datamountaineer/streamreactor/connect/cassandra/source/CassandraTableReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,14 @@ class CassandraTableReader(
private val cqlGenerator = new CqlGenerator(setting)

class CassandraDateFormatter {
private val dateFormatPattern = "yyyy-MM-dd HH:mm:ss.SSS'Z'"

def parse(date: String): Date = {
val dateFormatter = new SimpleDateFormat(dateFormatPattern)
val dateFormatter = new SimpleDateFormat(dateFormatString)
dateFormatter.parse(date)
}

def format(date: Date): String = {
val dateFormatter = new SimpleDateFormat(dateFormatPattern)
val dateFormatter = new SimpleDateFormat(dateFormatString)
dateFormatter.format(date)
}

Expand All @@ -82,6 +81,7 @@ class CassandraTableReader(
}
}

private val dateFormatString = setting.dateFormatString
private val dateFormatter = new CassandraDateFormatter()
private val primaryKeyCol = setting.primaryKeyColumn.getOrElse("")
private val querying = new AtomicBoolean(false)
Expand Down