From e61c69c9f882b3f1da5203e68774a9e39220b59d Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:32:58 +0000 Subject: [PATCH 01/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/java/com/huawei/?= =?UTF-8?q?ock/spark/serialize/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/huawei/ock/spark/serialize/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/java/com/huawei/ock/spark/serialize/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/java/com/huawei/ock/spark/serialize/.keep b/omnioperator/omniop-spark-extension-ock/src/main/java/com/huawei/ock/spark/serialize/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From 9572f99f3db362cc64d025252b371bd6ab377420 Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:33:24 +0000 Subject: [PATCH 02/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/scala/com/huawei?= =?UTF-8?q?/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omniop-spark-extension-ock/src/main/scala/com/huawei/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/.keep b/omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From 7dd6443a618e053dda48fd23b76e524b12ab6922 Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:33:33 +0000 Subject: [PATCH 03/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/scala/com/huawei?= =?UTF-8?q?/ock/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/scala/com/huawei/ock/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/ock/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/ock/.keep b/omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/ock/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From e56688e1700575aa5a32614c725f20b4a8ec118e Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:33:43 +0000 Subject: [PATCH 04/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/scala/com/huawei?= =?UTF-8?q?/ock/spark/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/scala/com/huawei/ock/spark/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/ock/spark/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/ock/spark/.keep b/omnioperator/omniop-spark-extension-ock/src/main/scala/com/huawei/ock/spark/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From ab7e24109a84b1fdd587a2a19b9955cd8b98b66a Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:34:09 +0000 Subject: [PATCH 05/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/scala/org/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- omnioperator/omniop-spark-extension-ock/src/main/scala/org/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/scala/org/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/scala/org/.keep b/omnioperator/omniop-spark-extension-ock/src/main/scala/org/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From 94e1b6a3978ef38a9200c1a0ee3a3c9576b1e377 Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:34:18 +0000 Subject: [PATCH 06/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/scala/org/apache?= =?UTF-8?q?/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omniop-spark-extension-ock/src/main/scala/org/apache/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/.keep b/omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From db958d4b318e34f56c38b5e3c669e2aba82ff7a8 Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:34:26 +0000 Subject: [PATCH 07/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/scala/org/apache?= =?UTF-8?q?/spark/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/scala/org/apache/spark/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/.keep b/omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From 90f16422aee1d6f0a6c4ef98c85ac23f183f3289 Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:34:51 +0000 Subject: [PATCH 08/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/scala/org/apache?= =?UTF-8?q?/spark/shuffle/ock/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/scala/org/apache/spark/shuffle/ock/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/shuffle/ock/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/shuffle/ock/.keep b/omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/shuffle/ock/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From 4b7dd2952f5660f5d6a61ec66a2d831c506bd05b Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 31 Oct 2022 01:35:01 +0000 Subject: [PATCH 09/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20om?= =?UTF-8?q?nioperator/omniop-spark-extension-ock/src/main/scala/org/apache?= =?UTF-8?q?/spark/shuffle/.keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/scala/org/apache/spark/shuffle/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/shuffle/.keep diff --git a/omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/shuffle/.keep b/omnioperator/omniop-spark-extension-ock/src/main/scala/org/apache/spark/shuffle/.keep deleted file mode 100644 index e69de29bb..000000000 -- Gitee From 6aa57282fd39b642211aa60db937298ad266a70b Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Sat, 5 Nov 2022 10:10:50 +0000 Subject: [PATCH 10/11] update omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp. Signed-off-by: buddha23 <8994556+buddha23@user.noreply.gitee.com> --- .../cpp/src/shuffle/ock_merge_reader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp b/omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp index 80ff17379..a02bbd976 100644 --- a/omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp +++ b/omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp @@ -200,6 +200,7 @@ bool OckMergeReader::CopyDataToVector(Vector *dstVector, uint32_t colIndex) auto *nullsAddress = (uint8_t *)dstVector->GetValueNulls(); auto *valuesAddress = (uint8_t *)dstVector->GetValues(); uint32_t *offsetsAddress = (uint32_t *)dstVector->GetValueOffsets(); + dstVector->SetValueNulls(true); uint32_t totalSize = 0; uint32_t currentSize = 0; -- Gitee From 624d9d70d59acc9fa1edce6c67814eb3a112d3a8 Mon Sep 17 00:00:00 2001 From: buddha23 <8994556+buddha23@user.noreply.gitee.com> Date: Mon, 7 Nov 2022 03:32:01 +0000 Subject: [PATCH 11/11] update omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp. Signed-off-by: buddha23 <8994556+buddha23@user.noreply.gitee.com> --- .../cpp/src/shuffle/ock_merge_reader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp b/omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp index a02bbd976..0aeac2c2a 100644 --- a/omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp +++ b/omnioperator/omniop-spark-extension-ock/cpp/src/shuffle/ock_merge_reader.cpp @@ -200,7 +200,7 @@ bool OckMergeReader::CopyDataToVector(Vector *dstVector, uint32_t colIndex) auto *nullsAddress = (uint8_t *)dstVector->GetValueNulls(); auto *valuesAddress = (uint8_t *)dstVector->GetValues(); uint32_t *offsetsAddress = (uint32_t *)dstVector->GetValueOffsets(); - dstVector->SetValueNulls(true); + dstVector->SetNullFlag(true); uint32_t totalSize = 0; uint32_t currentSize = 0; -- Gitee