ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidavidm merged 2 commits into from
Sep 7, 2022
Merged

ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3658292
ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…
igor-suhorukov Aug 25, 2022
25ac823
ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…
igor-suhorukov Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions java/dataset/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,38 @@
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.arrow.orc</groupId>
<artifactId>arrow-orc</artifactId>

@lidavidmlidavidmSep 7, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency actually used? I see the ORC library but not the Arrow ORC adapter

@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidavidm sure! If comment this dependency: java.lang.NoClassDefFoundError: org/apache/hadoop/hdfs/client/HdfsDataOutputStream$SyncFlag
image

@lidavidmlidavidmSep 7, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like that's just a transitive dependency that needs to get pulled in…but since this is a test-only dependency it's ok then.

<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
<version>1.7.6</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
<version>2.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<resources>
Expand Down
2 changes: 2 additions & 0 deletions java/dataset/src/main/cpp/jni_wrapper.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,8 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
return std::make_shared<arrow::dataset::ParquetFileFormat>();
case 1:
return std::make_shared<arrow::dataset::IpcFileFormat>();
case 2:
return std::make_shared<arrow::dataset::OrcFileFormat>();
default:
std::string error_message =
"illegal file format id: " + std::to_string(file_format_id);
Expand Down
1 change: 1 addition & 0 deletions java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
public enum FileFormat {
PARQUET(0),
ARROW_IPC(1),
ORC(2),
NONE(-1);

private final int id;
Expand Down
42 changes: 42 additions & 0 deletions java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.arrow.dataset;

import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.OrcFile;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;

public class OrcWriteSupport {
public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
VectorizedRowBatch batch = orcSchema.createRowBatch();
LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
for (int idx = 0; idx < values.length; idx++) {
longColumnVector.vector[idx] = values[idx];
}
batch.size = values.length;
writer.addRowBatch(batch);
writer.close();
}
}
31 changes: 31 additions & 0 deletions java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.apache.arrow.dataset.OrcWriteSupport;
import org.apache.arrow.dataset.ParquetWriteSupport;
import org.apache.arrow.dataset.jni.NativeDataset;
import org.apache.arrow.dataset.jni.NativeInstanceReleasedException;
Expand All@@ -59,6 +60,8 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.GenericRecordBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.orc.TypeDescription;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
Expand DownExpand Up@@ -357,6 +360,34 @@ public void testBaseArrowIpcRead() throws Exception {
AutoCloseables.close(factory);
}

@Test
public void testBaseOrcRead() throws Exception {
String dataName = "test-orc";
String basePath = TMP.getRoot().getAbsolutePath();

TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
Path path = new Path(basePath, dataName);
OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});

String orcDatasetUri = new File(basePath, dataName).toURI().toString();
FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),

@davisusanibardavisusanibarSep 7, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, only have this comment:

  1. There is a Jira ticket in case to use NativeMemoryPool.createListenable for big size data. Do you know if there are some limitation/restriction for big ORC files also?

@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know any things related to NativeMemoryPool.createListenable. It looks like common & separate Java Dataset API issue not introduced by this PR

@lidavidmlidavidmSep 7, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ticket is entirely unrelated, I agree. (I added some comments on Jira.)

@davisusanibardavisusanibarSep 7, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification

FileFormat.ORC, orcDatasetUri);
ScanOptions options = new ScanOptions(100);
Schema schema = inferResultSchemaFromFactory(factory, options);
List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);

assertSingleTaskProduced(factory, options);
assertEquals(1, datum.size());
assertEquals(1, schema.getFields().size());
assertEquals("ints", schema.getFields().get(0).getName());

String expectedJsonUnordered = "[[2147483647], [-2147483648]]";
checkParquetReadResult(schema, expectedJsonUnordered, datum);

AutoCloseables.close(datum);
AutoCloseables.close(factory);
}

private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
throws IOException {
final ObjectMapper json = new ObjectMapper();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Sep 7, 2022
 Merged


ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3658292

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Aug 25, 2022
25ac823

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Sep 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 32 additions & 0 deletions
java/dataset/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,38 @@
 <artifactId>jackson-databind</artifactId>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.arrow.orc</groupId>
 <artifactId>arrow-orc</artifactId>
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency actually used? I see the ORC library but not the Arrow ORC adapter
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidavidm sure! If comment this dependency: java.lang.NoClassDefFoundError: org/apache/hadoop/hdfs/client/HdfsDataOutputStream$SyncFlag
image
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like that's just a transitive dependency that needs to get pulled in…but since this is a test-only dependency it's ok then.
 <version>${project.version}</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.orc</groupId>
 <artifactId>orc-core</artifactId>
 <version>1.7.6</version>
 <scope>test</scope>
 <exclusions>
 <exclusion>
 <groupId>log4j</groupId>
 <artifactId>log4j</artifactId>
 </exclusion>
 <exclusion>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-log4j12</artifactId>
 </exclusion>
 <exclusion>
 <groupId>commons-logging</groupId>
 <artifactId>commons-logging</artifactId>
 </exclusion>
 </exclusions>
 </dependency>
 <dependency>
 <groupId>org.apache.hive</groupId>
 <artifactId>hive-storage-api</artifactId>
 <version>2.8.1</version>
 <scope>test</scope>
 </dependency>
 </dependencies>
 <build>
 <resources>
Expand Down

2 changes: 2 additions & 0 deletions
java/dataset/src/main/cpp/jni_wrapper.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,8 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
 return std::make_shared<arrow::dataset::ParquetFileFormat>();
 case 1:
 return std::make_shared<arrow::dataset::IpcFileFormat>();
 case 2:
 return std::make_shared<arrow::dataset::OrcFileFormat>();
 default:
 std::string error_message =
 "illegal file format id: " + std::to_string(file_format_id);
Expand Down

1 change: 1 addition & 0 deletions
java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
public enum FileFormat {
 PARQUET(0),
 ARROW_IPC(1),
 ORC(2),
 NONE(-1);

 private final int id;
Expand Down

42 changes: 42 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.arrow.dataset;

import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.OrcFile;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;

public class OrcWriteSupport {
 public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
 Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
 VectorizedRowBatch batch = orcSchema.createRowBatch();
 LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
 for (int idx = 0; idx < values.length; idx++) {
 longColumnVector.vector[idx] = values[idx];
 }
 batch.size = values.length;
 writer.addRowBatch(batch);
 writer.close();
 }
}

31 changes: 31 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.apache.arrow.dataset.OrcWriteSupport;
import org.apache.arrow.dataset.ParquetWriteSupport;
import org.apache.arrow.dataset.jni.NativeDataset;
import org.apache.arrow.dataset.jni.NativeInstanceReleasedException;
Expand All@@ -59,6 +60,8 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.GenericRecordBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.orc.TypeDescription;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
Expand DownExpand Up@@ -357,6 +360,34 @@ public void testBaseArrowIpcRead() throws Exception {
 AutoCloseables.close(factory);
 }

 @Test
 public void testBaseOrcRead() throws Exception {
 String dataName = "test-orc";
 String basePath = TMP.getRoot().getAbsolutePath();

 TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
 Path path = new Path(basePath, dataName);
 OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});

 String orcDatasetUri = new File(basePath, dataName).toURI().toString();
 FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, only have this comment:
  1. There is a Jira ticket in case to use NativeMemoryPool.createListenable for big size data. Do you know if there are some limitation/restriction for big ORC files also?
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know any things related to NativeMemoryPool.createListenable. It looks like common & separate Java Dataset API issue not introduced by this PR
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ticket is entirely unrelated, I agree. (I added some comments on Jira.)
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification
 FileFormat.ORC, orcDatasetUri);
 ScanOptions options = new ScanOptions(100);
 Schema schema = inferResultSchemaFromFactory(factory, options);
 List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);

 assertSingleTaskProduced(factory, options);
 assertEquals(1, datum.size());
 assertEquals(1, schema.getFields().size());
 assertEquals("ints", schema.getFields().get(0).getName());

 String expectedJsonUnordered = "[[2147483647], [-2147483648]]";
 checkParquetReadResult(schema, expectedJsonUnordered, datum);

 AutoCloseables.close(datum);
 AutoCloseables.close(factory);
 }

 private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
 throws IOException {
 final ObjectMapper json = new ObjectMapper();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Sep 7, 2022
 Merged


ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3658292

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Aug 25, 2022
25ac823

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Sep 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 32 additions & 0 deletions
java/dataset/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,38 @@
 <artifactId>jackson-databind</artifactId>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.arrow.orc</groupId>
 <artifactId>arrow-orc</artifactId>
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency actually used? I see the ORC library but not the Arrow ORC adapter
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidavidm sure! If comment this dependency: java.lang.NoClassDefFoundError: org/apache/hadoop/hdfs/client/HdfsDataOutputStream$SyncFlag
image
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like that's just a transitive dependency that needs to get pulled in…but since this is a test-only dependency it's ok then.
 <version>${project.version}</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.orc</groupId>
 <artifactId>orc-core</artifactId>
 <version>1.7.6</version>
 <scope>test</scope>
 <exclusions>
 <exclusion>
 <groupId>log4j</groupId>
 <artifactId>log4j</artifactId>
 </exclusion>
 <exclusion>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-log4j12</artifactId>
 </exclusion>
 <exclusion>
 <groupId>commons-logging</groupId>
 <artifactId>commons-logging</artifactId>
 </exclusion>
 </exclusions>
 </dependency>
 <dependency>
 <groupId>org.apache.hive</groupId>
 <artifactId>hive-storage-api</artifactId>
 <version>2.8.1</version>
 <scope>test</scope>
 </dependency>
 </dependencies>
 <build>
 <resources>
Expand Down

2 changes: 2 additions & 0 deletions
java/dataset/src/main/cpp/jni_wrapper.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,8 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
 return std::make_shared<arrow::dataset::ParquetFileFormat>();
 case 1:
 return std::make_shared<arrow::dataset::IpcFileFormat>();
 case 2:
 return std::make_shared<arrow::dataset::OrcFileFormat>();
 default:
 std::string error_message =
 "illegal file format id: " + std::to_string(file_format_id);
Expand Down

1 change: 1 addition & 0 deletions
java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
public enum FileFormat {
 PARQUET(0),
 ARROW_IPC(1),
 ORC(2),
 NONE(-1);

 private final int id;
Expand Down

42 changes: 42 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.arrow.dataset;

import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.OrcFile;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;

public class OrcWriteSupport {
 public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
 Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
 VectorizedRowBatch batch = orcSchema.createRowBatch();
 LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
 for (int idx = 0; idx < values.length; idx++) {
 longColumnVector.vector[idx] = values[idx];
 }
 batch.size = values.length;
 writer.addRowBatch(batch);
 writer.close();
 }
}

31 changes: 31 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.apache.arrow.dataset.OrcWriteSupport;
import org.apache.arrow.dataset.ParquetWriteSupport;
import org.apache.arrow.dataset.jni.NativeDataset;
import org.apache.arrow.dataset.jni.NativeInstanceReleasedException;
Expand All@@ -59,6 +60,8 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.GenericRecordBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.orc.TypeDescription;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
Expand DownExpand Up@@ -357,6 +360,34 @@ public void testBaseArrowIpcRead() throws Exception {
 AutoCloseables.close(factory);
 }

 @Test
 public void testBaseOrcRead() throws Exception {
 String dataName = "test-orc";
 String basePath = TMP.getRoot().getAbsolutePath();

 TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
 Path path = new Path(basePath, dataName);
 OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});

 String orcDatasetUri = new File(basePath, dataName).toURI().toString();
 FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, only have this comment:
  1. There is a Jira ticket in case to use NativeMemoryPool.createListenable for big size data. Do you know if there are some limitation/restriction for big ORC files also?
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know any things related to NativeMemoryPool.createListenable. It looks like common & separate Java Dataset API issue not introduced by this PR
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ticket is entirely unrelated, I agree. (I added some comments on Jira.)
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification
 FileFormat.ORC, orcDatasetUri);
 ScanOptions options = new ScanOptions(100);
 Schema schema = inferResultSchemaFromFactory(factory, options);
 List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);

 assertSingleTaskProduced(factory, options);
 assertEquals(1, datum.size());
 assertEquals(1, schema.getFields().size());
 assertEquals("ints", schema.getFields().get(0).getName());

 String expectedJsonUnordered = "[[2147483647], [-2147483648]]";
 checkParquetReadResult(schema, expectedJsonUnordered, datum);

 AutoCloseables.close(datum);
 AutoCloseables.close(factory);
 }

 private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
 throws IOException {
 final ObjectMapper json = new ObjectMapper();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Sep 7, 2022
 Merged


ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3658292

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Aug 25, 2022
25ac823

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Sep 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 32 additions & 0 deletions
java/dataset/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,38 @@
 <artifactId>jackson-databind</artifactId>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.arrow.orc</groupId>
 <artifactId>arrow-orc</artifactId>
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency actually used? I see the ORC library but not the Arrow ORC adapter
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidavidm sure! If comment this dependency: java.lang.NoClassDefFoundError: org/apache/hadoop/hdfs/client/HdfsDataOutputStream$SyncFlag
image
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like that's just a transitive dependency that needs to get pulled in…but since this is a test-only dependency it's ok then.
 <version>${project.version}</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.orc</groupId>
 <artifactId>orc-core</artifactId>
 <version>1.7.6</version>
 <scope>test</scope>
 <exclusions>
 <exclusion>
 <groupId>log4j</groupId>
 <artifactId>log4j</artifactId>
 </exclusion>
 <exclusion>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-log4j12</artifactId>
 </exclusion>
 <exclusion>
 <groupId>commons-logging</groupId>
 <artifactId>commons-logging</artifactId>
 </exclusion>
 </exclusions>
 </dependency>
 <dependency>
 <groupId>org.apache.hive</groupId>
 <artifactId>hive-storage-api</artifactId>
 <version>2.8.1</version>
 <scope>test</scope>
 </dependency>
 </dependencies>
 <build>
 <resources>
Expand Down

2 changes: 2 additions & 0 deletions
java/dataset/src/main/cpp/jni_wrapper.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,8 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
 return std::make_shared<arrow::dataset::ParquetFileFormat>();
 case 1:
 return std::make_shared<arrow::dataset::IpcFileFormat>();
 case 2:
 return std::make_shared<arrow::dataset::OrcFileFormat>();
 default:
 std::string error_message =
 "illegal file format id: " + std::to_string(file_format_id);
Expand Down

1 change: 1 addition & 0 deletions
java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
public enum FileFormat {
 PARQUET(0),
 ARROW_IPC(1),
 ORC(2),
 NONE(-1);

 private final int id;
Expand Down

42 changes: 42 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.arrow.dataset;

import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.OrcFile;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;

public class OrcWriteSupport {
 public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
 Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
 VectorizedRowBatch batch = orcSchema.createRowBatch();
 LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
 for (int idx = 0; idx < values.length; idx++) {
 longColumnVector.vector[idx] = values[idx];
 }
 batch.size = values.length;
 writer.addRowBatch(batch);
 writer.close();
 }
}

31 changes: 31 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.apache.arrow.dataset.OrcWriteSupport;
import org.apache.arrow.dataset.ParquetWriteSupport;
import org.apache.arrow.dataset.jni.NativeDataset;
import org.apache.arrow.dataset.jni.NativeInstanceReleasedException;
Expand All@@ -59,6 +60,8 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.GenericRecordBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.orc.TypeDescription;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
Expand DownExpand Up@@ -357,6 +360,34 @@ public void testBaseArrowIpcRead() throws Exception {
 AutoCloseables.close(factory);
 }

 @Test
 public void testBaseOrcRead() throws Exception {
 String dataName = "test-orc";
 String basePath = TMP.getRoot().getAbsolutePath();

 TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
 Path path = new Path(basePath, dataName);
 OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});

 String orcDatasetUri = new File(basePath, dataName).toURI().toString();
 FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, only have this comment:
  1. There is a Jira ticket in case to use NativeMemoryPool.createListenable for big size data. Do you know if there are some limitation/restriction for big ORC files also?
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know any things related to NativeMemoryPool.createListenable. It looks like common & separate Java Dataset API issue not introduced by this PR
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ticket is entirely unrelated, I agree. (I added some comments on Jira.)
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification
 FileFormat.ORC, orcDatasetUri);
 ScanOptions options = new ScanOptions(100);
 Schema schema = inferResultSchemaFromFactory(factory, options);
 List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);

 assertSingleTaskProduced(factory, options);
 assertEquals(1, datum.size());
 assertEquals(1, schema.getFields().size());
 assertEquals("ints", schema.getFields().get(0).getName());

 String expectedJsonUnordered = "[[2147483647], [-2147483648]]";
 checkParquetReadResult(schema, expectedJsonUnordered, datum);

 AutoCloseables.close(datum);
 AutoCloseables.close(factory);
 }

 private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
 throws IOException {
 final ObjectMapper json = new ObjectMapper();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Sep 7, 2022
 Merged


ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3658292

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Aug 25, 2022
25ac823

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Sep 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 32 additions & 0 deletions
java/dataset/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,38 @@
 <artifactId>jackson-databind</artifactId>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.arrow.orc</groupId>
 <artifactId>arrow-orc</artifactId>
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency actually used? I see the ORC library but not the Arrow ORC adapter
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidavidm sure! If comment this dependency: java.lang.NoClassDefFoundError: org/apache/hadoop/hdfs/client/HdfsDataOutputStream$SyncFlag
image
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like that's just a transitive dependency that needs to get pulled in…but since this is a test-only dependency it's ok then.
 <version>${project.version}</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.orc</groupId>
 <artifactId>orc-core</artifactId>
 <version>1.7.6</version>
 <scope>test</scope>
 <exclusions>
 <exclusion>
 <groupId>log4j</groupId>
 <artifactId>log4j</artifactId>
 </exclusion>
 <exclusion>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-log4j12</artifactId>
 </exclusion>
 <exclusion>
 <groupId>commons-logging</groupId>
 <artifactId>commons-logging</artifactId>
 </exclusion>
 </exclusions>
 </dependency>
 <dependency>
 <groupId>org.apache.hive</groupId>
 <artifactId>hive-storage-api</artifactId>
 <version>2.8.1</version>
 <scope>test</scope>
 </dependency>
 </dependencies>
 <build>
 <resources>
Expand Down

2 changes: 2 additions & 0 deletions
java/dataset/src/main/cpp/jni_wrapper.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,8 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
 return std::make_shared<arrow::dataset::ParquetFileFormat>();
 case 1:
 return std::make_shared<arrow::dataset::IpcFileFormat>();
 case 2:
 return std::make_shared<arrow::dataset::OrcFileFormat>();
 default:
 std::string error_message =
 "illegal file format id: " + std::to_string(file_format_id);
Expand Down

1 change: 1 addition & 0 deletions
java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
public enum FileFormat {
 PARQUET(0),
 ARROW_IPC(1),
 ORC(2),
 NONE(-1);

 private final int id;
Expand Down

42 changes: 42 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.arrow.dataset;

import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.OrcFile;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;

public class OrcWriteSupport {
 public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
 Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
 VectorizedRowBatch batch = orcSchema.createRowBatch();
 LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
 for (int idx = 0; idx < values.length; idx++) {
 longColumnVector.vector[idx] = values[idx];
 }
 batch.size = values.length;
 writer.addRowBatch(batch);
 writer.close();
 }
}

31 changes: 31 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.apache.arrow.dataset.OrcWriteSupport;
import org.apache.arrow.dataset.ParquetWriteSupport;
import org.apache.arrow.dataset.jni.NativeDataset;
import org.apache.arrow.dataset.jni.NativeInstanceReleasedException;
Expand All@@ -59,6 +60,8 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.GenericRecordBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.orc.TypeDescription;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
Expand DownExpand Up@@ -357,6 +360,34 @@ public void testBaseArrowIpcRead() throws Exception {
 AutoCloseables.close(factory);
 }

 @Test
 public void testBaseOrcRead() throws Exception {
 String dataName = "test-orc";
 String basePath = TMP.getRoot().getAbsolutePath();

 TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
 Path path = new Path(basePath, dataName);
 OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});

 String orcDatasetUri = new File(basePath, dataName).toURI().toString();
 FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, only have this comment:
  1. There is a Jira ticket in case to use NativeMemoryPool.createListenable for big size data. Do you know if there are some limitation/restriction for big ORC files also?
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know any things related to NativeMemoryPool.createListenable. It looks like common & separate Java Dataset API issue not introduced by this PR
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ticket is entirely unrelated, I agree. (I added some comments on Jira.)
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification
 FileFormat.ORC, orcDatasetUri);
 ScanOptions options = new ScanOptions(100);
 Schema schema = inferResultSchemaFromFactory(factory, options);
 List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);

 assertSingleTaskProduced(factory, options);
 assertEquals(1, datum.size());
 assertEquals(1, schema.getFields().size());
 assertEquals("ints", schema.getFields().get(0).getName());

 String expectedJsonUnordered = "[[2147483647], [-2147483648]]";
 checkParquetReadResult(schema, expectedJsonUnordered, datum);

 AutoCloseables.close(datum);
 AutoCloseables.close(factory);
 }

 private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
 throws IOException {
 final ObjectMapper json = new ObjectMapper();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Sep 7, 2022
 Merged


ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3658292

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Aug 25, 2022
25ac823

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Sep 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 32 additions & 0 deletions
java/dataset/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,38 @@
 <artifactId>jackson-databind</artifactId>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.arrow.orc</groupId>
 <artifactId>arrow-orc</artifactId>
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency actually used? I see the ORC library but not the Arrow ORC adapter
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidavidm sure! If comment this dependency: java.lang.NoClassDefFoundError: org/apache/hadoop/hdfs/client/HdfsDataOutputStream$SyncFlag
image
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like that's just a transitive dependency that needs to get pulled in…but since this is a test-only dependency it's ok then.
 <version>${project.version}</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.orc</groupId>
 <artifactId>orc-core</artifactId>
 <version>1.7.6</version>
 <scope>test</scope>
 <exclusions>
 <exclusion>
 <groupId>log4j</groupId>
 <artifactId>log4j</artifactId>
 </exclusion>
 <exclusion>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-log4j12</artifactId>
 </exclusion>
 <exclusion>
 <groupId>commons-logging</groupId>
 <artifactId>commons-logging</artifactId>
 </exclusion>
 </exclusions>
 </dependency>
 <dependency>
 <groupId>org.apache.hive</groupId>
 <artifactId>hive-storage-api</artifactId>
 <version>2.8.1</version>
 <scope>test</scope>
 </dependency>
 </dependencies>
 <build>
 <resources>
Expand Down

2 changes: 2 additions & 0 deletions
java/dataset/src/main/cpp/jni_wrapper.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,8 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
 return std::make_shared<arrow::dataset::ParquetFileFormat>();
 case 1:
 return std::make_shared<arrow::dataset::IpcFileFormat>();
 case 2:
 return std::make_shared<arrow::dataset::OrcFileFormat>();
 default:
 std::string error_message =
 "illegal file format id: " + std::to_string(file_format_id);
Expand Down

1 change: 1 addition & 0 deletions
java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
public enum FileFormat {
 PARQUET(0),
 ARROW_IPC(1),
 ORC(2),
 NONE(-1);

 private final int id;
Expand Down

42 changes: 42 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.arrow.dataset;

import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.OrcFile;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;

public class OrcWriteSupport {
 public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
 Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
 VectorizedRowBatch batch = orcSchema.createRowBatch();
 LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
 for (int idx = 0; idx < values.length; idx++) {
 longColumnVector.vector[idx] = values[idx];
 }
 batch.size = values.length;
 writer.addRowBatch(batch);
 writer.close();
 }
}

31 changes: 31 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.apache.arrow.dataset.OrcWriteSupport;
import org.apache.arrow.dataset.ParquetWriteSupport;
import org.apache.arrow.dataset.jni.NativeDataset;
import org.apache.arrow.dataset.jni.NativeInstanceReleasedException;
Expand All@@ -59,6 +60,8 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.GenericRecordBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.orc.TypeDescription;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
Expand DownExpand Up@@ -357,6 +360,34 @@ public void testBaseArrowIpcRead() throws Exception {
 AutoCloseables.close(factory);
 }

 @Test
 public void testBaseOrcRead() throws Exception {
 String dataName = "test-orc";
 String basePath = TMP.getRoot().getAbsolutePath();

 TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
 Path path = new Path(basePath, dataName);
 OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});

 String orcDatasetUri = new File(basePath, dataName).toURI().toString();
 FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, only have this comment:
  1. There is a Jira ticket in case to use NativeMemoryPool.createListenable for big size data. Do you know if there are some limitation/restriction for big ORC files also?
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know any things related to NativeMemoryPool.createListenable. It looks like common & separate Java Dataset API issue not introduced by this PR
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ticket is entirely unrelated, I agree. (I added some comments on Jira.)
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification
 FileFormat.ORC, orcDatasetUri);
 ScanOptions options = new ScanOptions(100);
 Schema schema = inferResultSchemaFromFactory(factory, options);
 List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);

 assertSingleTaskProduced(factory, options);
 assertEquals(1, datum.size());
 assertEquals(1, schema.getFields().size());
 assertEquals("ints", schema.getFields().get(0).getName());

 String expectedJsonUnordered = "[[2147483647], [-2147483648]]";
 checkParquetReadResult(schema, expectedJsonUnordered, datum);

 AutoCloseables.close(datum);
 AutoCloseables.close(factory);
 }

 private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
 throws IOException {
 final ObjectMapper json = new ObjectMapper();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Sep 7, 2022
 Merged


ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3658292

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Aug 25, 2022
25ac823

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Sep 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 32 additions & 0 deletions
java/dataset/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,38 @@
 <artifactId>jackson-databind</artifactId>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.arrow.orc</groupId>
 <artifactId>arrow-orc</artifactId>
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency actually used? I see the ORC library but not the Arrow ORC adapter
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidavidm sure! If comment this dependency: java.lang.NoClassDefFoundError: org/apache/hadoop/hdfs/client/HdfsDataOutputStream$SyncFlag
image
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like that's just a transitive dependency that needs to get pulled in…but since this is a test-only dependency it's ok then.
 <version>${project.version}</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.orc</groupId>
 <artifactId>orc-core</artifactId>
 <version>1.7.6</version>
 <scope>test</scope>
 <exclusions>
 <exclusion>
 <groupId>log4j</groupId>
 <artifactId>log4j</artifactId>
 </exclusion>
 <exclusion>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-log4j12</artifactId>
 </exclusion>
 <exclusion>
 <groupId>commons-logging</groupId>
 <artifactId>commons-logging</artifactId>
 </exclusion>
 </exclusions>
 </dependency>
 <dependency>
 <groupId>org.apache.hive</groupId>
 <artifactId>hive-storage-api</artifactId>
 <version>2.8.1</version>
 <scope>test</scope>
 </dependency>
 </dependencies>
 <build>
 <resources>
Expand Down

2 changes: 2 additions & 0 deletions
java/dataset/src/main/cpp/jni_wrapper.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,8 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
 return std::make_shared<arrow::dataset::ParquetFileFormat>();
 case 1:
 return std::make_shared<arrow::dataset::IpcFileFormat>();
 case 2:
 return std::make_shared<arrow::dataset::OrcFileFormat>();
 default:
 std::string error_message =
 "illegal file format id: " + std::to_string(file_format_id);
Expand Down

1 change: 1 addition & 0 deletions
java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
public enum FileFormat {
 PARQUET(0),
 ARROW_IPC(1),
 ORC(2),
 NONE(-1);

 private final int id;
Expand Down

42 changes: 42 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.arrow.dataset;

import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.OrcFile;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;

public class OrcWriteSupport {
 public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
 Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
 VectorizedRowBatch batch = orcSchema.createRowBatch();
 LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
 for (int idx = 0; idx < values.length; idx++) {
 longColumnVector.vector[idx] = values[idx];
 }
 batch.size = values.length;
 writer.addRowBatch(batch);
 writer.close();
 }
}

31 changes: 31 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.apache.arrow.dataset.OrcWriteSupport;
import org.apache.arrow.dataset.ParquetWriteSupport;
import org.apache.arrow.dataset.jni.NativeDataset;
import org.apache.arrow.dataset.jni.NativeInstanceReleasedException;
Expand All@@ -59,6 +60,8 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.GenericRecordBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.orc.TypeDescription;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
Expand DownExpand Up@@ -357,6 +360,34 @@ public void testBaseArrowIpcRead() throws Exception {
 AutoCloseables.close(factory);
 }

 @Test
 public void testBaseOrcRead() throws Exception {
 String dataName = "test-orc";
 String basePath = TMP.getRoot().getAbsolutePath();

 TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
 Path path = new Path(basePath, dataName);
 OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});

 String orcDatasetUri = new File(basePath, dataName).toURI().toString();
 FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, only have this comment:
  1. There is a Jira ticket in case to use NativeMemoryPool.createListenable for big size data. Do you know if there are some limitation/restriction for big ORC files also?
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know any things related to NativeMemoryPool.createListenable. It looks like common & separate Java Dataset API issue not introduced by this PR
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ticket is entirely unrelated, I agree. (I added some comments on Jira.)
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification
 FileFormat.ORC, orcDatasetUri);
 ScanOptions options = new ScanOptions(100);
 Schema schema = inferResultSchemaFromFactory(factory, options);
 List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);

 assertSingleTaskProduced(factory, options);
 assertEquals(1, datum.size());
 assertEquals(1, schema.getFields().size());
 assertEquals("ints", schema.getFields().get(0).getName());

 String expectedJsonUnordered = "[[2147483647], [-2147483648]]";
 checkParquetReadResult(schema, expectedJsonUnordered, datum);

 AutoCloseables.close(datum);
 AutoCloseables.close(factory);
 }

 private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
 throws IOException {
 final ObjectMapper json = new ObjectMapper();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 2 commits into

from

Sep 7, 2022
 Merged


ARROW-17525: [Java] Read ORC files using NativeDatasetFactory #13973
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3658292

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Aug 25, 2022
25ac823

ARROW-17525: [Java] Read ORC files using org.apache.arrow.dataset.jni…


igor-suhorukov Sep 7, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


32 changes: 32 additions & 0 deletions
java/dataset/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,6 +109,38 @@
 <artifactId>jackson-databind</artifactId>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.arrow.orc</groupId>
 <artifactId>arrow-orc</artifactId>
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this dependency actually used? I see the ORC library but not the Arrow ORC adapter
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lidavidm sure! If comment this dependency: java.lang.NoClassDefFoundError: org/apache/hadoop/hdfs/client/HdfsDataOutputStream$SyncFlag
image
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like that's just a transitive dependency that needs to get pulled in…but since this is a test-only dependency it's ok then.
 <version>${project.version}</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>org.apache.orc</groupId>
 <artifactId>orc-core</artifactId>
 <version>1.7.6</version>
 <scope>test</scope>
 <exclusions>
 <exclusion>
 <groupId>log4j</groupId>
 <artifactId>log4j</artifactId>
 </exclusion>
 <exclusion>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-log4j12</artifactId>
 </exclusion>
 <exclusion>
 <groupId>commons-logging</groupId>
 <artifactId>commons-logging</artifactId>
 </exclusion>
 </exclusions>
 </dependency>
 <dependency>
 <groupId>org.apache.hive</groupId>
 <artifactId>hive-storage-api</artifactId>
 <version>2.8.1</version>
 <scope>test</scope>
 </dependency>
 </dependencies>
 <build>
 <resources>
Expand Down

2 changes: 2 additions & 0 deletions
java/dataset/src/main/cpp/jni_wrapper.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,8 @@ arrow::Result<std::shared_ptr<arrow::dataset::FileFormat>> GetFileFormat(
 return std::make_shared<arrow::dataset::ParquetFileFormat>();
 case 1:
 return std::make_shared<arrow::dataset::IpcFileFormat>();
 case 2:
 return std::make_shared<arrow::dataset::OrcFileFormat>();
 default:
 std::string error_message =
 "illegal file format id: " + std::to_string(file_format_id);
Expand Down

1 change: 1 addition & 0 deletions
java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
public enum FileFormat {
 PARQUET(0),
 ARROW_IPC(1),
 ORC(2),
 NONE(-1);

 private final int id;
Expand Down

42 changes: 42 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.arrow.dataset;

import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.OrcFile;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;

public class OrcWriteSupport {
 public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
 Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
 VectorizedRowBatch batch = orcSchema.createRowBatch();
 LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
 for (int idx = 0; idx < values.length; idx++) {
 longColumnVector.vector[idx] = values[idx];
 }
 batch.size = values.length;
 writer.addRowBatch(batch);
 writer.close();
 }
}

31 changes: 31 additions & 0 deletions
java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.apache.arrow.dataset.OrcWriteSupport;
import org.apache.arrow.dataset.ParquetWriteSupport;
import org.apache.arrow.dataset.jni.NativeDataset;
import org.apache.arrow.dataset.jni.NativeInstanceReleasedException;
Expand All@@ -59,6 +60,8 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.generic.GenericRecordBuilder;
import org.apache.hadoop.fs.Path;
import org.apache.orc.TypeDescription;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Test;
Expand DownExpand Up@@ -357,6 +360,34 @@ public void testBaseArrowIpcRead() throws Exception {
 AutoCloseables.close(factory);
 }

 @Test
 public void testBaseOrcRead() throws Exception {
 String dataName = "test-orc";
 String basePath = TMP.getRoot().getAbsolutePath();

 TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
 Path path = new Path(basePath, dataName);
 OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});

 String orcDatasetUri = new File(basePath, dataName).toURI().toString();
 FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, only have this comment:
  1. There is a Jira ticket in case to use NativeMemoryPool.createListenable for big size data. Do you know if there are some limitation/restriction for big ORC files also?
@igor-suhorukovigor-suhorukovSep 7, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know any things related to NativeMemoryPool.createListenable. It looks like common & separate Java Dataset API issue not introduced by this PR
@lidavidmlidavidmSep 7, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ticket is entirely unrelated, I agree. (I added some comments on Jira.)
@davisusanibardavisusanibarSep 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification
 FileFormat.ORC, orcDatasetUri);
 ScanOptions options = new ScanOptions(100);
 Schema schema = inferResultSchemaFromFactory(factory, options);
 List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);

 assertSingleTaskProduced(factory, options);
 assertEquals(1, datum.size());
 assertEquals(1, schema.getFields().size());
 assertEquals("ints", schema.getFields().get(0).getName());

 String expectedJsonUnordered = "[[2147483647], [-2147483648]]";
 checkParquetReadResult(schema, expectedJsonUnordered, datum);

 AutoCloseables.close(datum);
 AutoCloseables.close(factory);
 }

 private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
 throws IOException {
 final ObjectMapper json = new ObjectMapper();
Expand Down