Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-15825 Fix the null pointer in DynamicLogicExpressionSuite (Zhan Zhang)

This commit is contained in:
tedyu 2016-05-16 09:04:50 -07:00
parent e0aff10901
commit 084b036cb2
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DynamicLogicExpressionSuite.scala
View File

@ -32,7 +32,9 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
test("Basic And Test") { test("Basic And Test") {
val leftLogic = new LessThanLogicExpression("Col1", 0) val leftLogic = new LessThanLogicExpression("Col1", 0)
leftLogic.setEncoder(encoder)
val rightLogic = new GreaterThanLogicExpression("Col1", 1) val rightLogic = new GreaterThanLogicExpression("Col1", 1)
rightLogic.setEncoder(encoder)
val andLogic = new AndLogicExpression(leftLogic, rightLogic) val andLogic = new AndLogicExpression(leftLogic, rightLogic)
val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]() val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]()
@ -72,7 +74,9 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
test("Basic OR Test") { test("Basic OR Test") {
val leftLogic = new LessThanLogicExpression("Col1", 0) val leftLogic = new LessThanLogicExpression("Col1", 0)
leftLogic.setEncoder(encoder)
val rightLogic = new GreaterThanLogicExpression("Col1", 1) val rightLogic = new GreaterThanLogicExpression("Col1", 1)
rightLogic.setEncoder(encoder)
val OrLogic = new OrLogicExpression(leftLogic, rightLogic) val OrLogic = new OrLogicExpression(leftLogic, rightLogic)
val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]() val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]()
@ -119,9 +123,13 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
test("Basic Command Test") { test("Basic Command Test") {
val greaterLogic = new GreaterThanLogicExpression("Col1", 0) val greaterLogic = new GreaterThanLogicExpression("Col1", 0)
greaterLogic.setEncoder(encoder)
val greaterAndEqualLogic = new GreaterThanOrEqualLogicExpression("Col1", 0) val greaterAndEqualLogic = new GreaterThanOrEqualLogicExpression("Col1", 0)
greaterAndEqualLogic.setEncoder(encoder)
val lessLogic = new LessThanLogicExpression("Col1", 0) val lessLogic = new LessThanLogicExpression("Col1", 0)
lessLogic.setEncoder(encoder)
val lessAndEqualLogic = new LessThanOrEqualLogicExpression("Col1", 0) val lessAndEqualLogic = new LessThanOrEqualLogicExpression("Col1", 0)
lessAndEqualLogic.setEncoder(encoder)
val equalLogic = new EqualLogicExpression("Col1", 0, false) val equalLogic = new EqualLogicExpression("Col1", 0, false)
val notEqualLogic = new EqualLogicExpression("Col1", 0, true) val notEqualLogic = new EqualLogicExpression("Col1", 0, true)
val passThrough = new PassThroughLogicExpression val passThrough = new PassThroughLogicExpression
@ -192,7 +200,9 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
test("Double Type") { test("Double Type") {
val leftLogic = new LessThanLogicExpression("Col1", 0) val leftLogic = new LessThanLogicExpression("Col1", 0)
leftLogic.setEncoder(encoder)
val rightLogic = new GreaterThanLogicExpression("Col1", 1) val rightLogic = new GreaterThanLogicExpression("Col1", 1)
rightLogic.setEncoder(encoder)
val andLogic = new AndLogicExpression(leftLogic, rightLogic) val andLogic = new AndLogicExpression(leftLogic, rightLogic)
val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]() val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]()
@ -231,7 +241,9 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
test("Float Type") { test("Float Type") {
val leftLogic = new LessThanLogicExpression("Col1", 0) val leftLogic = new LessThanLogicExpression("Col1", 0)
leftLogic.setEncoder(encoder)
val rightLogic = new GreaterThanLogicExpression("Col1", 1) val rightLogic = new GreaterThanLogicExpression("Col1", 1)
rightLogic.setEncoder(encoder)
val andLogic = new AndLogicExpression(leftLogic, rightLogic) val andLogic = new AndLogicExpression(leftLogic, rightLogic)
val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]() val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]()
@ -270,7 +282,9 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
test("String Type") { test("String Type") {
val leftLogic = new LessThanLogicExpression("Col1", 0) val leftLogic = new LessThanLogicExpression("Col1", 0)
leftLogic.setEncoder(encoder)
val rightLogic = new GreaterThanLogicExpression("Col1", 1) val rightLogic = new GreaterThanLogicExpression("Col1", 1)
rightLogic.setEncoder(encoder)
val andLogic = new AndLogicExpression(leftLogic, rightLogic) val andLogic = new AndLogicExpression(leftLogic, rightLogic)
val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]() val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]()
@ -309,7 +323,9 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
test("Boolean Type") { test("Boolean Type") {
val leftLogic = new LessThanLogicExpression("Col1", 0) val leftLogic = new LessThanLogicExpression("Col1", 0)
leftLogic.setEncoder(encoder)
val rightLogic = new GreaterThanLogicExpression("Col1", 1) val rightLogic = new GreaterThanLogicExpression("Col1", 1)
rightLogic.setEncoder(encoder)
val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]() val columnToCurrentRowValueMap = new util.HashMap[String, ByteArrayComparable]()