You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by gv...@apache.org on 2018/02/27 08:19:03 UTC
[06/16] carbondata git commit: [CARBONDATA-2201] NPE fixed while
triggering the LoadTablePreExecutionEvent before Streaming
[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/e363dd1a
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/e363dd1a
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/e363dd1a
Branch: refs/heads/branch-1.3
Commit: e363dd1a68e2138591a930055dd1701a1245825f
Parents: b0a2fab
Author: rahulforallp <ra...@knoldus.in>
Authored: Sun Feb 25 15:25:26 2018 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Tue Feb 27 12:51:52 2018 +0530
----------------------------------------------------------------------
.../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/e363dd1a/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/e363dd1a/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)