[NSE-273] support spark311 #272

zhouyuan · 2021-04-22T06:26:31Z

What changes were proposed in this pull request?

related #273
supports Spark 3.1.1
notable changes:

decimal sum adds isEmpty check
Shuffle API changes
Columnar ShuffledHashJoins/BroadcastHashjoins extends from a new baseclass

How was this patch tested?

locally verified

github-actions · 2021-04-22T06:26:47Z

Thanks for opening a pull request!

Could you open an issue for this pull request on Github Issues?

https://github.com/oap-project/native-sql-engine/issues

Then could you also rename commit message and pull request title in the following format?

[NSE-${ISSUES_ID}] ${detailed message}

See also:

Other pull requests

github-actions · 2021-05-07T08:45:36Z

#273

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

zhouyuan · 2021-05-10T07:11:48Z

@rui-mo the scala unit tests are based on spark300, will disable these tests first and fixed them in following patches

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

zhouyuan · 2021-05-10T10:03:40Z

native-sql-engine/core/pom.xml

-      <groupId>com.intel.oap</groupId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>


we only need to package on arrow-data-source-common now

zhouyuan · 2021-05-10T10:04:03Z

arrow-data-source/pom.xml

+       <groupId>javax.servlet</groupId>
+       <artifactId>javax.servlet-api</artifactId>
+       <version>3.1.0</version>
+    </dependency>


note: this is a requirement for thrift-server

zhouyuan · 2021-05-10T10:04:26Z

arrow-data-source/pom.xml

+    <dependency>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-common</artifactId>
+    <version>2.7.3</version>


remove this and use hadoop.version

zhouyuan · 2021-05-10T10:05:10Z

...ve-sql-engine/core/src/main/scala/com/intel/oap/execution/ColumnarShuffledHashJoinExec.scala

@@ -168,12 +175,22 @@ case class ColumnarShuffledHashJoinExec(
      s"ColumnarShuffledHashJoinExec doesn't support doExecute")
  }
  override def supportsColumnar = true
+
+  // override def inputRDDs(): Seq[RDD[InternalRow]] = {


remove dead code

zhouyuan · 2021-05-10T10:05:18Z

...ve-sql-engine/core/src/main/scala/com/intel/oap/execution/ColumnarShuffledHashJoinExec.scala

+  // protected override def prepareRelation(ctx: CodegenContext): HashedRelationInfo = {
+  //   throw new UnsupportedOperationException(
+  //     "prepareRelation is used by codegen which we don't support")
+  // }


zhouyuan · 2021-05-10T10:06:21Z

native-sql-engine/core/src/main/scala/com/intel/oap/execution/ColumnarWindowExec.scala

@@ -52,8 +52,7 @@ import scala.util.Random
 case class ColumnarWindowExec(windowExpression: Seq[NamedExpression],
    partitionSpec: Seq[Expression],
    orderSpec: Seq[SortOrder],
-    child: SparkPlan) extends WindowExecBase(windowExpression,
-  partitionSpec, orderSpec, child) {
+    child: SparkPlan) extends WindowExecBase {


WindowExecBase is a trait in spark311

zhouyuan · 2021-05-10T10:07:21Z

...ve-sql-engine/core/src/main/scala/org/apache/spark/shuffle/sort/ColumnarShuffleManager.scala

@@ -121,45 +121,15 @@ class ColumnarShuffleManager(conf: SparkConf) extends ShuffleManager with Loggin
   * Called on executors by reduce tasks.
   */
  override def getReader[K, C](
-      handle: ShuffleHandle,


note: API changes in Shuffle

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

* [NSE-262] fix remainer loss in decimal divide (#263) * fix decimal divide int issue * correct cpp uts * use const reference Co-authored-by: Yuan <yuan.zhou@outlook.com> Co-authored-by: Yuan <yuan.zhou@outlook.com> * [NSE-261] ArrowDataSource: Add S3 Support (#270) Closes #261 * [NSE-196] clean up configs in unit tests (#271) * remove testing config * remove unused configs * [NSE-265] Reserve enough memory before UnsafeAppend in builder (#266) * change the UnsafeAppend to Append * fix buffer builder in shuffle shuffle builder use UnsafeAppend API for better performance. it tries to reserve enough space based on results of last recordbatch, this maybe not buggy if there's a dense recordbatch after a sparse one. this patch adds below fixes: - adds Reset() after Finish() in builder - reserve length for offset_builder in binary builder A further clean up on the reservation logic should be needed. Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> Co-authored-by: Yuan Zhou <yuan.zhou@intel.com> * [NSE-274] Comment to trigger tpc-h RAM test (#275) Closes #274 * bump cmake to 3.16 (#281) Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * [NSE-276] Add option to switch Hadoop version (#277) Closes #276 * [NSE-119] clean up on comments (#288) Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * [NSE-206]Update installation guide and configuration guide. (#289) * [NSE-206]Update installation guide and configuration guide. * Fix numaBinding setting issue. & Update description for protobuf * [NSE-206]Fix Prerequisite and Arrow Installation Steps. (#290) * [NSE-245]Adding columnar RDD cache support (#246) * Adding columnar RDD cache support Signed-off-by: Chendi Xue <chendi.xue@intel.com> * Directly save reference, only convert to Array[Byte] when calling by BlockManager Signed-off-by: Chendi Xue <chendi.xue@intel.com> * Add DeAllocator to construction to make sure this instance will be released once it be deleted by JVM Signed-off-by: Chendi Xue <chendi.xue@intel.com> * Delete cache by adding a release in InMemoryRelation Since unpersist only delete RDD object, seems our deAllocator wasn't being called along Now we added a release function in InMemoryRelation clearCache() func, may need to think a new way for 3.1.0 Signed-off-by: Chendi Xue <chendi.xue@intel.com> * [NSE-207] fix issues found from aggregate unit tests (#233) * fix incorrect input in Expand * fix empty input for aggregate * fix only result expressions * fix empty aggregate expressions * fix res attr not found issue * refine * fix count distinct with null * fix groupby of NaN, -0.0 and 0.0 * fix count on mutiple cols with null in WSCG * format code * support normalize NaN and 0.0 * revert and update * support normalize function in WSCG * [NSE-206]Update documents and License for 1.1.0 (#292) * [NSE-206]Update documents and remove duplicate parts * Modify documents by comments * [NSE-293] fix unsafemap with key = '0' (#294) Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * [NSE-257] fix multiple slf4j bindings (#291) * [NSE-297] Disable incremental compiler in GHA CI (#298) Closes #297 * [NSE-285] ColumnarWindow: Support Date input in MAX/MIN (#286) Closes #285 * [NSE-304] Upgrade to Arrow 4.0.0: Change basic GHA TPC-H test target OAP Arrow branch (#306) * [NSE-302] remove exception (#303) * [NSE-273] support spark311 (#272) * support spark 3.0.2 Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * update to use spark 302 in unit tests Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * support spark 311 Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix missing dep Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix broadcastexchange metrics Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix arrow data source Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix sum with decimal Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix c++ code Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * adding partial sum decimal sum Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix hashagg in wscg Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix partial sum with number type Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix AQE shuffle copy Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix shuffle redudant reat Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix rebase Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * fix format Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * avoid unecessary fallbacks Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * on-demand scala unit tests Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * clean up Signed-off-by: Yuan Zhou <yuan.zhou@intel.com> * [NSE-311] Build reports errors (#312) Closes #311 * [NSE-257] fix the dependency issue on v2 Co-authored-by: Rui Mo <rui.mo@intel.com> Co-authored-by: Hongze Zhang <hongze.zhang@intel.com> Co-authored-by: JiaKe <ke.a.jia@intel.com> Co-authored-by: Wei-Ting Chen <weiting.chen@intel.com> Co-authored-by: Chendi.Xue <chendi.xue@intel.com> Co-authored-by: Hong <hong2.wang@intel.com>

zhouyuan force-pushed the wip_spark311 branch 2 times, most recently from 4304a6a to 054de03 Compare April 26, 2021 02:21

zhouyuan changed the title ~~[DNM] support spark311~~ [NSE-273] support spark311 May 7, 2021

zhouyuan added 14 commits May 10, 2021 10:16

support spark 3.0.2

247f23c

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

update to use spark 302 in unit tests

80cf3a6

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

support spark 311

27e567b

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix

c0b1a04

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix missing dep

167363d

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix broadcastexchange metrics

bd44481

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix arrow data source

9cf56af

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix sum with decimal

594dc21

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix c++ code

c46d164

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

adding partial sum decimal sum

975384d

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix hashagg in wscg

e03a9dd

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix partial sum with number type

6318515

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix AQE shuffle copy

39cf3c2

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix shuffle redudant reat

045666f

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

zhouyuan force-pushed the wip_spark311 branch from d383bb6 to 045666f Compare May 10, 2021 02:20

zhouyuan added 3 commits May 10, 2021 10:43

fix rebase

775a8ac

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

fix format

88313f4

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

avoid unecessary fallbacks

7b60ba4

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

on-demand scala unit tests

f680f74

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

zhouyuan commented May 10, 2021

View reviewed changes

clean up

9a3e322

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>

zhouyuan merged commit 975fcaa into oap-project:master May 11, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NSE-273] support spark311 #272

[NSE-273] support spark311 #272

zhouyuan commented Apr 22, 2021 •

edited

Loading

github-actions bot commented Apr 22, 2021

github-actions bot commented May 7, 2021

zhouyuan commented May 10, 2021

zhouyuan May 10, 2021

zhouyuan May 10, 2021

zhouyuan May 10, 2021

zhouyuan May 10, 2021

zhouyuan May 10, 2021

zhouyuan May 10, 2021

zhouyuan May 10, 2021

[NSE-273] support spark311 #272

[NSE-273] support spark311 #272

Conversation

zhouyuan commented Apr 22, 2021 • edited Loading

What changes were proposed in this pull request?

How was this patch tested?

github-actions bot commented Apr 22, 2021

github-actions bot commented May 7, 2021

zhouyuan commented May 10, 2021

zhouyuan May 10, 2021

Choose a reason for hiding this comment

zhouyuan May 10, 2021

Choose a reason for hiding this comment

zhouyuan May 10, 2021

Choose a reason for hiding this comment

zhouyuan May 10, 2021

Choose a reason for hiding this comment

zhouyuan May 10, 2021

Choose a reason for hiding this comment

zhouyuan May 10, 2021

Choose a reason for hiding this comment

zhouyuan May 10, 2021

Choose a reason for hiding this comment

zhouyuan commented Apr 22, 2021 •

edited

Loading