-
Notifications
You must be signed in to change notification settings - Fork 169
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
feat: Add random row generator in data generator #451
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f9ddaab
feat: Add random row generator in data gen
advancedxy 1e9e9ee
fix
advancedxy 03fc030
remove array type match case, which should already been handled in Ra…
advancedxy 34acfd2
fix style issue
advancedxy 14ab3ce
address comments
advancedxy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
spark/src/test/scala/org/apache/comet/DataGeneratorSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you 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 org.apache.comet | ||
|
||
import org.apache.spark.sql.CometTestBase | ||
import org.apache.spark.sql.types.StructType | ||
|
||
class DataGeneratorSuite extends CometTestBase { | ||
|
||
test("test configurable stringGen in row generator") { | ||
val gen = DataGenerator.DEFAULT | ||
val chars = "abcde" | ||
val maxLen = 10 | ||
val stringGen = () => gen.generateString(chars, maxLen) | ||
val numRows = 100 | ||
val schema = new StructType().add("a", "string") | ||
var numNulls = 0 | ||
gen | ||
.generateRows(numRows, schema, Some(stringGen)) | ||
.foreach(row => { | ||
if (row.getString(0) != null) { | ||
assert(row.getString(0).forall(chars.toSeq.contains)) | ||
assert(row.getString(0).length <= maxLen) | ||
} else { | ||
numNulls += 1 | ||
} | ||
}) | ||
// 0.1 null probability | ||
assert(numNulls >= 5 && numNulls <= 15) | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
I think we should also check
f.nullable
and returnnull
sometimes here as wellThere 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.
The
RandomDataGenerator.forType(f.dataType, f.nullable, r)
handles the nullable type, so I don't think we need to handle it here.See: https://github.com/apache/spark/blob/master/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala#L380-L392
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.
Hmmm should we do the same (create nulls in
forType
) for the rest of types? Then we do not need duplicatedPROBABILITY_OF_NULL
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.
Let me think about that. Maybe we can remove the array type case. However I think the user specified
stringGen
still have to accessPROBABILITY_OF_NULL
to generate nullable strings. Otherwise, thestringGen
method itself should handle nullable by itself.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.
Updated, please let me know what you think.