-
Notifications
You must be signed in to change notification settings - Fork 917
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.
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
SPARKC-403: Add CLUSTERING ORDER in cql statement #981
base: master
Are you sure you want to change the base?
Changes from 1 commit
4ae3ff9
5bc7cc6
4dd085c
bae67de
697dd0e
0aa10be
dfa0382
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -151,11 +151,12 @@ case class TableDef( | |
regularColumns: Seq[ColumnDef], | ||
indexes: Seq[IndexDef] = Seq.empty, | ||
isView: Boolean = false, | ||
options: String = "") extends StructDef { | ||
options: Seq[String] = Seq.empty) extends StructDef { | ||
|
||
require(partitionKey.forall(_.isPartitionKeyColumn), "All partition key columns must have role PartitionKeyColumn") | ||
require(clusteringColumns.forall(_.isClusteringColumn), "All clustering columns must have role ClusteringColumn") | ||
require(regularColumns.forall(!_.isPrimaryKeyColumn), "Regular columns cannot have role PrimaryKeyColumn") | ||
require(options.forall( option => !(option.toLowerCase.contains("and") && !(option.toLowerCase.contains("with")))), "Table options must not contain WITH OR AND") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What if I want to set my comment on a table to Sand Castles with Judge's Rankings. Basically I think we should let the driver validate the tableOptions. If we want to test them here we should probably only test keys (once we change the tableOptions to a map). I think we are probably best off without the requires here. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I changed accordingly. What will be the better option to validate tableOptions keys? |
||
|
||
val allColumns = regularColumns ++ clusteringColumns ++ partitionKey | ||
|
||
|
@@ -202,21 +203,12 @@ case class TableDef( | |
| $columnList, | ||
| PRIMARY KEY ($primaryKeyClause) | ||
|)""".stripMargin | ||
val ordered = if (clusteringColumns.size > 0) | ||
s"$stmt${Properties.lineSeparator}WITH CLUSTERING ORDER BY (${clusteringColumnOrder(clusteringColumns)})" | ||
else stmt | ||
appendOptions(ordered, options) | ||
} | ||
private[this] def clusteringColumnOrder(clusteringColumns: Seq[ColumnDef]): String = | ||
clusteringColumns.map { col => s"${quote(col.columnName)} ${col.clusteringOrder}"}.mkString(", ") | ||
|
||
def clusterOrder: Seq[ClusteringOrder] = clusteringColumns.map(_.clusteringOrder) | ||
val ordered = clusteringColumns.map( col => s"${quote(col.columnName)} ${col.clusteringOrder}") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a bit of an overloaded variable name. Perhaps clusterOrderingClause ? |
||
.mkString("CLUSTERING ORDER BY (", ", ",")") | ||
|
||
private[this] def appendOptions(stmt: String, opts: String) = | ||
if (stmt.contains("WITH") && opts.startsWith("WITH")) s"$stmt${Properties.lineSeparator}AND ${opts.substring(4)}" | ||
else if (!stmt.contains("WITH") && opts.startsWith("AND")) s"WITH ${opts.substring(3)}" | ||
else if (opts == "") s"$stmt" | ||
else s"$stmt${Properties.lineSeparator}$opts" | ||
val orderWithOptions:Seq[String] = if (clusteringColumns.size > 0) options.+:(ordered) else options | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. lets just go straight to the treble quote here, I think it may be a bit clearer like
|
||
if (orderWithOptions.size > 0) s"""$stmt${Properties.lineSeparator}WITH ${orderWithOptions.mkString(s"${Properties.lineSeparator} AND ")}""" else stmt | ||
} | ||
|
||
type ValueRepr = CassandraRow | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps this should be tableOptions (matching the cql docs), and also now that I think about this perhaps it fits a Map better than a sequence? This would make it much clearer that we are looking for a set of key-value pairs.