You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by qi...@apache.org on 2018/02/26 02:17:18 UTC
carbondata git commit: [CARBONDATA-2201] NPE fixed while triggering
the LoadTablePreExecutionEvent before Streaming
Repository: carbondata
Updated Branches:
refs/heads/master 7269c0627 -> e51810c0f
[CARBONDATA-2201] NPE fixed while triggering the LoadTablePreExecutionEvent before Streaming
While triggering the LoadTablePreExecutionEvent we require options provided by user and the finalOptions.
In case of streaming both are same. If we pass null . It may cause NPE.
This closes #1997
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/e51810c0
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/e51810c0
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/e51810c0
Branch: refs/heads/master
Commit: e51810c0f339484f21849bb6243b2be33460e9bc
Parents: 7269c06
Author: rahulforallp <ra...@knoldus.in>
Authored: Sun Feb 25 15:25:26 2018 +0530
Committer: QiangCai <qi...@qq.com>
Committed: Mon Feb 26 10:15:33 2018 +0800
----------------------------------------------------------------------
.../scala/org/apache/carbondata/streaming/StreamSinkFactory.scala | 3 ++-
.../sql/execution/streaming/CarbonAppendableStreamSink.scala | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/e51810c0/streaming/src/main/scala/org/apache/carbondata/streaming/StreamSinkFactory.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/carbondata/streaming/StreamSinkFactory.scala b/streaming/src/main/scala/org/apache/carbondata/streaming/StreamSinkFactory.scala
index 1c7be6a..3366f51 100644
--- a/streaming/src/main/scala/org/apache/carbondata/streaming/StreamSinkFactory.scala
+++ b/streaming/src/main/scala/org/apache/carbondata/streaming/StreamSinkFactory.scala
@@ -60,6 +60,7 @@ object StreamSinkFactory {
parameters,
"")
// fire pre event before streamin is started
+ // in case of streaming options and optionsFinal can be same
val operationContext = new OperationContext
val loadTablePreExecutionEvent = new LoadTablePreExecutionEvent(
carbonTable.getCarbonTableIdentifier,
@@ -67,7 +68,7 @@ object StreamSinkFactory {
carbonLoadModel.getFactFilePath,
false,
parameters.asJava,
- null,
+ parameters.asJava,
false
)
OperationListenerBus.getInstance().fireEvent(loadTablePreExecutionEvent, operationContext)
http://git-wip-us.apache.org/repos/asf/carbondata/blob/e51810c0/streaming/src/main/scala/org/apache/spark/sql/execution/streaming/CarbonAppendableStreamSink.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/spark/sql/execution/streaming/CarbonAppendableStreamSink.scala b/streaming/src/main/scala/org/apache/spark/sql/execution/streaming/CarbonAppendableStreamSink.scala
index 849bf99..67d8a4d 100644
--- a/streaming/src/main/scala/org/apache/spark/sql/execution/streaming/CarbonAppendableStreamSink.scala
+++ b/streaming/src/main/scala/org/apache/spark/sql/execution/streaming/CarbonAppendableStreamSink.scala
@@ -95,6 +95,7 @@ class CarbonAppendableStreamSink(
val statistic = new QueryStatistic()
// fire pre event on every batch add
+ // in case of streaming options and optionsFinal can be same
val operationContext = new OperationContext
val loadTablePreExecutionEvent = new LoadTablePreExecutionEvent(
carbonTable.getCarbonTableIdentifier,
@@ -102,7 +103,7 @@ class CarbonAppendableStreamSink(
carbonLoadModel.getFactFilePath,
false,
parameters.asJava,
- null,
+ parameters.asJava,
false
)
OperationListenerBus.getInstance().fireEvent(loadTablePreExecutionEvent, operationContext)