Skip to content

Commit e1dd6d8

Browse files
lriggslriggs
authored
GH-55: [Gandiva] Re-enable tests (#595)
Fixes GH-55. ### Rationale for this change I fixed the linking error here: apache/arrow#45114 ### What changes are included in this PR? Reenabling some disabled tests. ### Are these changes tested? Yes, they are tests. ### Are there any user-facing changes? No.
1 parent 52cf1f2 commit e1dd6d8

File tree

7 files changed

+19
-41
lines changed

7 files changed

+19
-41
lines changed

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ MAVEN=3.9.9
5454
# Keep in sync with apache/arrow
5555
ARROW_REPO_ROOT=./arrow
5656
PYTHON=3.9
57-
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
57+
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release

‎.github/workflows/rc.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ jobs:
107107
- name: Extract source archive
108108
run: |
109109
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
110-
- name: Download the latest Apache Arrow C++
111-
if: github.event_name != 'schedule'
112-
run: |
113-
ci/scripts/download_cpp.sh
110+
# - name: Download the latest Apache Arrow C++
111+
# if: github.event_name != 'schedule'
112+
# run: |
113+
# ci/scripts/download_cpp.sh
114114
- name: Checkout Apache Arrow C++
115-
if: github.event_name == 'schedule'
115+
# if: github.event_name == 'schedule'
116116
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
117117
with:
118118
repository: apache/arrow
@@ -174,12 +174,12 @@ jobs:
174174
- name: Extract source archive
175175
run: |
176176
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
177-
- name: Download the latest Apache Arrow C++
178-
if: github.event_name != 'schedule'
179-
run: |
180-
ci/scripts/download_cpp.sh
177+
# - name: Download the latest Apache Arrow C++
178+
# if: github.event_name != 'schedule'
179+
# run: |
180+
# ci/scripts/download_cpp.sh
181181
- name: Checkout Apache Arrow C++
182-
if: github.event_name == 'schedule'
182+
# if: github.event_name == 'schedule'
183183
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
184184
with:
185185
repository: apache/arrow
@@ -299,13 +299,13 @@ jobs:
299299
shell: bash
300300
run: |
301301
tar -xf apache-arrow-java-*.tar.gz --strip-components=1
302-
- name: Download the latest Apache Arrow C++
303-
if: github.event_name != 'schedule'
304-
shell: bash
305-
run: |
306-
ci/scripts/download_cpp.sh
302+
# - name: Download the latest Apache Arrow C++
303+
# if: github.event_name != 'schedule'
304+
# shell: bash
305+
# run: |
306+
# ci/scripts/download_cpp.sh
307307
- name: Checkout Apache Arrow C++
308-
if: github.event_name == 'schedule'
308+
# if: github.event_name == 'schedule'
309309
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
310310
with:
311311
repository: apache/arrow

‎compose.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ services:
9292
# Usage:
9393
# docker compose build vcpkg-jni
9494
# docker compose run vcpkg-jni
95-
image: ${REPO}:${ARCH}-vcpkg-jni
95+
image: ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
9696
build:
9797
context: .
9898
dockerfile: ci/docker/vcpkg-jni.dockerfile
9999
cache_from:
100-
- ${REPO}:${ARCH}-vcpkg-jni
100+
- ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
101101
args:
102102
base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
103103
volumes:

‎gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@
3434
import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
3535
import org.apache.arrow.vector.types.pojo.Field;
3636
import org.apache.arrow.vector.types.pojo.Schema;
37-
import org.junit.jupiter.api.Disabled;
3837
import org.junit.jupiter.api.Test;
3938

4039
public class FilterProjectTest extends BaseEvaluatorTest {
4140

4241
@Test
43-
@Disabled("GH-43576 - Fix and enable this test")
4442
public void testSimpleSV16() throws GandivaException, Exception {
4543
Field a = Field.nullable("a", int32);
4644
Field b = Field.nullable("b", int32);

‎gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.apache.arrow.vector.types.pojo.ArrowType;
3535
import org.apache.arrow.vector.types.pojo.Field;
3636
import org.apache.arrow.vector.types.pojo.Schema;
37-
import org.junit.jupiter.api.Disabled;
3837
import org.junit.jupiter.api.Test;
3938

4039
public class FilterTest extends BaseEvaluatorTest {
@@ -73,7 +72,6 @@ List<ArrowBuf> stringBufs(String[] strings) {
7372
}
7473

7574
@Test
76-
@Disabled("GH-43576 - Fix and enable this test")
7775
public void testSimpleInString() throws GandivaException, Exception {
7876
Field c1 = Field.nullable("c1", new ArrowType.Utf8());
7977
TreeNode l1 = TreeBuilder.makeLiteral(1L);
@@ -137,7 +135,6 @@ public void testSimpleInString() throws GandivaException, Exception {
137135
}
138136

139137
@Test
140-
@Disabled("GH-43576 - Fix and enable this test")
141138
public void testSimpleInInt() throws GandivaException, Exception {
142139
Field c1 = Field.nullable("c1", int32);
143140

@@ -181,7 +178,6 @@ public void testSimpleInInt() throws GandivaException, Exception {
181178
}
182179

183180
@Test
184-
@Disabled("GH-43576 - Fix and enable this test")
185181
public void testSimpleSV16() throws GandivaException, Exception {
186182
Field a = Field.nullable("a", int32);
187183
Field b = Field.nullable("b", int32);
@@ -203,7 +199,6 @@ public void testSimpleSV16() throws GandivaException, Exception {
203199
}
204200

205201
@Test
206-
@Disabled("GH-43576 - Fix and enable this test")
207202
public void testSimpleSV16_AllMatched() throws GandivaException, Exception {
208203
Field a = Field.nullable("a", int32);
209204
Field b = Field.nullable("b", int32);
@@ -233,7 +228,6 @@ public void testSimpleSV16_AllMatched() throws GandivaException, Exception {
233228
}
234229

235230
@Test
236-
@Disabled("GH-43576 - Fix and enable this test")
237231
public void testSimpleSV16_GreaterThan64Recs() throws GandivaException, Exception {
238232
Field a = Field.nullable("a", int32);
239233
Field b = Field.nullable("b", int32);
@@ -265,7 +259,6 @@ public void testSimpleSV16_GreaterThan64Recs() throws GandivaException, Exceptio
265259
}
266260

267261
@Test
268-
@Disabled("GH-43576 - Fix and enable this test")
269262
public void testSimpleSV32() throws GandivaException, Exception {
270263
Field a = Field.nullable("a", int32);
271264
Field b = Field.nullable("b", int32);
@@ -287,7 +280,6 @@ public void testSimpleSV32() throws GandivaException, Exception {
287280
}
288281

289282
@Test
290-
@Disabled("GH-43576 - Fix and enable this test")
291283
public void testSimpleFilterWithNoOptimisation() throws GandivaException, Exception {
292284
Field a = Field.nullable("a", int32);
293285
Field b = Field.nullable("b", int32);

‎gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorDecimalTest.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@
4242
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
4343
import org.apache.arrow.vector.types.pojo.Field;
4444
import org.apache.arrow.vector.types.pojo.Schema;
45-
import org.junit.jupiter.api.Disabled;
4645
import org.junit.jupiter.api.Test;
4746

4847
public class ProjectorDecimalTest extends org.apache.arrow.gandiva.evaluator.BaseEvaluatorTest {
4948

5049
@Test
51-
@Disabled("GH-43576 - Fix and enable this test")
5250
public void test_add() throws GandivaException {
5351
int precision = 38;
5452
int scale = 8;
@@ -116,7 +114,6 @@ public void test_add() throws GandivaException {
116114
}
117115

118116
@Test
119-
@Disabled("GH-43576 - Fix and enable this test")
120117
public void test_add_literal() throws GandivaException {
121118
int precision = 2;
122119
int scale = 0;
@@ -178,7 +175,6 @@ public void test_add_literal() throws GandivaException {
178175
}
179176

180177
@Test
181-
@Disabled("GH-43576 - Fix and enable this test")
182178
public void test_multiply() throws GandivaException {
183179
int precision = 38;
184180
int scale = 8;
@@ -248,7 +244,6 @@ public void test_multiply() throws GandivaException {
248244
}
249245

250246
@Test
251-
@Disabled("GH-43576 - Fix and enable this test")
252247
public void testCompare() throws GandivaException {
253248
Decimal aType = new Decimal(38, 3, 128);
254249
Decimal bType = new Decimal(38, 2, 128);
@@ -343,7 +338,6 @@ public void testCompare() throws GandivaException {
343338
}
344339

345340
@Test
346-
@Disabled("GH-43576 - Fix and enable this test")
347341
public void testRound() throws GandivaException {
348342
Decimal aType = new Decimal(38, 2, 128);
349343
Decimal aWithScaleZero = new Decimal(38, 0, 128);
@@ -486,7 +480,6 @@ public void testRound() throws GandivaException {
486480
}
487481

488482
@Test
489-
@Disabled("GH-43576 - Fix and enable this test")
490483
public void testCastToDecimal() throws GandivaException {
491484
Decimal decimalType = new Decimal(38, 2, 128);
492485
Decimal decimalWithScaleOne = new Decimal(38, 1, 128);
@@ -613,7 +606,6 @@ public void testCastToDecimal() throws GandivaException {
613606
}
614607

615608
@Test
616-
@Disabled("GH-43576 - Fix and enable this test")
617609
public void testCastToLong() throws GandivaException {
618610
Decimal decimalType = new Decimal(38, 2, 128);
619611
Field dec = Field.nullable("dec", decimalType);
@@ -666,7 +658,6 @@ public void testCastToLong() throws GandivaException {
666658
}
667659

668660
@Test
669-
@Disabled("GH-43576 - Fix and enable this test")
670661
public void testCastToDouble() throws GandivaException {
671662
Decimal decimalType = new Decimal(38, 2, 128);
672663
Field dec = Field.nullable("dec", decimalType);
@@ -721,7 +712,6 @@ public void testCastToDouble() throws GandivaException {
721712
}
722713

723714
@Test
724-
@Disabled("GH-43576 - Fix and enable this test")
725715
public void testCastToString() throws GandivaException {
726716
Decimal decimalType = new Decimal(38, 2, 128);
727717
Field dec = Field.nullable("dec", decimalType);
@@ -783,7 +773,6 @@ public void testCastToString() throws GandivaException {
783773
}
784774

785775
@Test
786-
@Disabled("GH-43576 - Fix and enable this test")
787776
public void testCastStringToDecimal() throws GandivaException {
788777
Decimal decimalType = new Decimal(4, 2, 128);
789778
Field dec = Field.nullable("dec", decimalType);

‎gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import org.junit.jupiter.api.Disabled;
6363
import org.junit.jupiter.api.Test;
6464

65-
@Disabled("Disabled until GH-43981 is solved")
6665
public class ProjectorTest extends BaseEvaluatorTest {
6766

6867
private Charset utf8Charset = Charset.forName("UTF-8");

0 commit comments

Comments
 (0)