Skip to content

Commit c35e438

Browse files
fixing build
Signed-off-by: bharath-techie <bharath78910@gmail.com>
1 parent 52196c9 commit c35e438

2 files changed

Lines changed: 12 additions & 38 deletions

File tree

sandbox/plugins/analytics-backend-datafusion/build.gradle

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,16 @@ compileJava.dependsOn copyNativeLibrary
7474
processResources.dependsOn copyNativeLibrary
7575
sourcesJar.dependsOn copyNativeLibrary
7676

77+
// copyNativeLibrary writes into src/main/resources/native — any task that scans
78+
// the source tree must run after it to satisfy Gradle's implicit-dependency check.
7779
tasks.named("forbiddenPatterns").configure {
7880
dependsOn copyNativeLibrary
7981
exclude '**/native/**'
82+
exclude '**/*.parquet'
83+
}
84+
85+
for (def taskName : ["filepermissions", "spotlessJava", "spotlessJavaCheck"]) {
86+
tasks.named(taskName).configure { dependsOn copyNativeLibrary }
8087
}
8188

8289
clean {
@@ -98,42 +105,8 @@ tasks.withType(JavaCompile).configureEach {
98105
testingConventions.enabled = false
99106

100107
tasks.named('thirdPartyAudit').configure {
101-
ignoreMissingClasses(
102-
// Arrow references Jackson annotations not on classpath
103-
'com.fasterxml.jackson.annotation.JsonCreator',
104-
'com.fasterxml.jackson.annotation.JsonGetter',
105-
'com.fasterxml.jackson.annotation.JsonIgnore',
106-
'com.fasterxml.jackson.annotation.JsonInclude',
107-
'com.fasterxml.jackson.annotation.JsonInclude$Include',
108-
'com.fasterxml.jackson.annotation.JsonProperty',
109-
'com.fasterxml.jackson.annotation.JsonTypeInfo',
110-
'com.fasterxml.jackson.annotation.JsonTypeInfo$As',
111-
'com.fasterxml.jackson.annotation.JsonTypeInfo$Id',
112-
'com.fasterxml.jackson.databind.DeserializationContext',
113-
'com.fasterxml.jackson.databind.JsonDeserializer',
114-
'com.fasterxml.jackson.databind.JsonNode',
115-
'com.fasterxml.jackson.databind.JsonSerializer',
116-
'com.fasterxml.jackson.databind.ObjectMapper',
117-
'com.fasterxml.jackson.databind.SerializerProvider',
118-
'com.fasterxml.jackson.databind.annotation.JsonDeserialize',
119-
'com.fasterxml.jackson.databind.annotation.JsonSerialize',
120-
'com.fasterxml.jackson.databind.deser.std.StdDeserializer',
121-
'com.fasterxml.jackson.databind.node.ObjectNode',
122-
'com.fasterxml.jackson.databind.ser.std.StdSerializer'
123-
)
124108
ignoreViolations(
125-
'org.apache.arrow.memory.ArrowBuf',
126-
'org.apache.arrow.memory.unsafe.UnsafeAllocationManager',
127-
'org.apache.arrow.memory.util.ByteFunctionHelpers',
128109
'org.apache.arrow.memory.util.MemoryUtil',
129-
'org.apache.arrow.memory.util.MemoryUtil$1',
130-
'org.apache.arrow.memory.util.hash.MurmurHasher',
131-
'org.apache.arrow.memory.util.hash.SimpleHasher',
132-
'org.apache.arrow.vector.BaseFixedWidthVector',
133-
'org.apache.arrow.vector.BitVectorHelper',
134-
'org.apache.arrow.vector.Decimal256Vector',
135-
'org.apache.arrow.vector.DecimalVector',
136-
'org.apache.arrow.vector.util.DecimalUtility',
137-
'org.apache.arrow.vector.util.VectorAppender'
110+
'org.apache.arrow.memory.util.MemoryUtil$1'
138111
)
139112
}

sandbox/plugins/analytics-backend-datafusion/src/test/java/org/opensearch/be/datafusion/DatafusionResultStreamTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.nio.file.Files;
1919
import java.nio.file.Path;
2020
import java.util.Iterator;
21+
import java.util.Locale;
2122
import java.util.NoSuchElementException;
2223
import java.util.concurrent.CompletableFuture;
2324

@@ -156,9 +157,9 @@ public void onFailure(Exception e) {
156157
assertNotNull("Native error should propagate", ex.getCause());
157158
assertTrue(
158159
"Error should mention substrait/decode failure, got: " + ex.getCause().getMessage(),
159-
ex.getCause().getMessage().toLowerCase().contains("substrait")
160-
|| ex.getCause().getMessage().toLowerCase().contains("decode")
161-
|| ex.getCause().getMessage().toLowerCase().contains("failed")
160+
ex.getCause().getMessage().toLowerCase(Locale.ROOT).contains("substrait")
161+
|| ex.getCause().getMessage().toLowerCase(Locale.ROOT).contains("decode")
162+
|| ex.getCause().getMessage().toLowerCase(Locale.ROOT).contains("failed")
162163
);
163164
}
164165

0 commit comments

Comments
 (0)