Skip to content

Commit

Permalink
GH-43502: [Java] Fix Java JNI / AMD64 manylinux2014 Java JNI test not…
Browse files Browse the repository at this point in the history 
… test dataset module (#43503)

### Rationale for this change

JNI tests had a typo in the script where we have included `gandiva` instead of `dataset`. 

### What changes are included in this PR?

This PR fixes that typo in the current version. 

### Are these changes tested?

Yes, by existing tests and CIs. 

### Are there any user-facing changes?

No
* GitHub Issue: #43502

Authored-by: Vibhatha Abeykoon <vibhatha@gmail.com>
Signed-off-by: Dane Pitkin <dpitkin@apache.org>
  • Loading branch information
@vibhatha
vibhatha authored Aug 9, 2024
1 parent 7e44aeb commit cdfdfb8
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 7 deletions.
10 changes: 3 additions & 7 deletions ci/scripts/java_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,10 @@ pushd ${source_dir}
${mvn} clean test

projects=()
if [ "${ARROW_DATASET}" = "ON" ]; then
projects+=(gandiva)
fi
if [ "${ARROW_GANDIVA}" = "ON" ]; then
projects+=(gandiva)
fi
if [ "${ARROW_ORC}" = "ON" ]; then
if [ "${ARROW_JAVA_JNI}" = "ON" ]; then
projects+=(adapter/orc)
projects+=(dataset)
projects+=(gandiva)
fi
if [ "${#projects[@]}" -gt 0 ]; then
${mvn} clean test \
Expand Down
2 changes: 2 additions & 0 deletions java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@
import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

public class FilterProjectTest extends BaseEvaluatorTest {

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testSimpleSV16() throws GandivaException, Exception {
Field a = Field.nullable("a", int32);
Field b = Field.nullable("b", int32);
Expand Down
8 changes: 8 additions & 0 deletions java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

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

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

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

Expand Down Expand Up @@ -178,6 +181,7 @@ public void testSimpleInInt() throws GandivaException, Exception {
}

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

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testSimpleSV16_AllMatched() throws GandivaException, Exception {
Field a = Field.nullable("a", int32);
Field b = Field.nullable("b", int32);
Expand Down Expand Up @@ -228,6 +233,7 @@ public void testSimpleSV16_AllMatched() throws GandivaException, Exception {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testSimpleSV16_GreaterThan64Recs() throws GandivaException, Exception {
Field a = Field.nullable("a", int32);
Field b = Field.nullable("b", int32);
Expand Down Expand Up @@ -259,6 +265,7 @@ public void testSimpleSV16_GreaterThan64Recs() throws GandivaException, Exceptio
}

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

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testSimpleFilterWithNoOptimisation() throws GandivaException, Exception {
Field a = Field.nullable("a", int32);
Field b = Field.nullable("b", int32);
Expand Down
11 changes: 11 additions & 0 deletions java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorDecimalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,13 @@
import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

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

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void test_add() throws GandivaException {
int precision = 38;
int scale = 8;
Expand Down Expand Up @@ -114,6 +116,7 @@ public void test_add() throws GandivaException {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void test_add_literal() throws GandivaException {
int precision = 2;
int scale = 0;
Expand Down Expand Up @@ -175,6 +178,7 @@ public void test_add_literal() throws GandivaException {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void test_multiply() throws GandivaException {
int precision = 38;
int scale = 8;
Expand Down Expand Up @@ -244,6 +248,7 @@ public void test_multiply() throws GandivaException {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testCompare() throws GandivaException {
Decimal aType = new Decimal(38, 3, 128);
Decimal bType = new Decimal(38, 2, 128);
Expand Down Expand Up @@ -338,6 +343,7 @@ public void testCompare() throws GandivaException {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testRound() throws GandivaException {
Decimal aType = new Decimal(38, 2, 128);
Decimal aWithScaleZero = new Decimal(38, 0, 128);
Expand Down Expand Up @@ -480,6 +486,7 @@ public void testRound() throws GandivaException {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testCastToDecimal() throws GandivaException {
Decimal decimalType = new Decimal(38, 2, 128);
Decimal decimalWithScaleOne = new Decimal(38, 1, 128);
Expand Down Expand Up @@ -606,6 +613,7 @@ public void testCastToDecimal() throws GandivaException {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testCastToLong() throws GandivaException {
Decimal decimalType = new Decimal(38, 2, 128);
Field dec = Field.nullable("dec", decimalType);
Expand Down Expand Up @@ -658,6 +666,7 @@ public void testCastToLong() throws GandivaException {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testCastToDouble() throws GandivaException {
Decimal decimalType = new Decimal(38, 2, 128);
Field dec = Field.nullable("dec", decimalType);
Expand Down Expand Up @@ -712,6 +721,7 @@ public void testCastToDouble() throws GandivaException {
}

@Test
@Disabled("GH-43576 - Fix and enable this test")
public void testCastToString() throws GandivaException {
Decimal decimalType = new Decimal(38, 2, 128);
Field dec = Field.nullable("dec", decimalType);
Expand Down Expand Up @@ -773,6 +783,7 @@ public void testCastToString() throws GandivaException {
}

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

0 comments on commit cdfdfb8

Please sign in to comment.