ARROW-1015 [Java] Schema-level metadata#676

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

Closed
elahrvivaz wants to merge 2 commits into from
Closed

ARROW-1015 [Java] Schema-level metadata #676

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
9ffdb5a
ARROW-1015 [Java] Schema-level metadata
elahrvivaz May 12, 2017
9e94e1a
Changing accessor to getCustomMetadata
elahrvivaz May 15, 2017
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
12 changes: 8 additions & 4 deletions java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,15 @@ public VectorSchemaRoot(FieldVector parent) {
}

public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int rowCount) {
if (fields.size() != fieldVectors.size()) {
this(new Schema(fields), fieldVectors, rowCount);
}

public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
if (schema.getFields().size() != fieldVectors.size()) {
throw new IllegalArgumentException("Fields must match field vectors. Found " +
fieldVectors.size() + " vectors and " + fields.size() + " fields");
fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
}
this.schema = new Schema(fields);
this.schema = schema;
this.rowCount = rowCount;
this.fieldVectors = fieldVectors;
for (int i = 0; i < schema.getFields().size(); ++i) {
Expand All@@ -65,7 +69,7 @@ public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator)
throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
fieldVectors.size() + " expected " + schema.getFields().size());
}
return new VectorSchemaRoot(schema.getFields(), fieldVectors, 0);
return new VectorSchemaRoot(schema, fieldVectors, 0);
}

public List<FieldVector> getFieldVectors() {
Expand Down
7 changes: 4 additions & 3 deletions java/vector/src/main/java/org/apache/arrow/vector/file/ArrowReader.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,18 +150,19 @@ protected void ensureInitialized() throws IOException {
* Reads the schema and initializes the vectors
*/
private void initialize() throws IOException {
Schema schema = readSchema(in);
Schema originalSchema = readSchema(in);
List<Field> fields = new ArrayList<>();
List<FieldVector> vectors = new ArrayList<>();
Map<Long, Dictionary> dictionaries = new HashMap<>();

for (Field field: schema.getFields()) {
for (Field field: originalSchema.getFields()) {
Field updated = toMemoryFormat(field, dictionaries);
fields.add(updated);
vectors.add(updated.createVector(allocator));
}
Schema schema = new Schema(fields, originalSchema.getCustomMetadata());

this.root = new VectorSchemaRoot(fields, vectors, 0);
this.root = new VectorSchemaRoot(schema, vectors, 0);
this.loader = new VectorLoader(root);
this.dictionaries = Collections.unmodifiableMap(dictionaries);
}
Expand Down
2 changes: 1 addition & 1 deletion java/vector/src/main/java/org/apache/arrow/vector/file/ArrowWriter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
fields.add(toMessageFormat(field, provider, dictionaryBatches));
}

this.schema = new Schema(fields);
this.schema = new Schema(fields, root.getSchema().getCustomMetadata());
this.dictionaries = Collections.unmodifiableList(new ArrayList<>(dictionaryBatches.values()));
}

Expand Down
52 changes: 47 additions & 5 deletions java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,19 +25,27 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.flatbuf.KeyValue;

/**
* An Arrow Schema
*/
Expand DownExpand Up@@ -76,24 +84,43 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
childrenBuilder.add(convertField(schema.fields(i)));
}
List<Field> fields = childrenBuilder.build();
return new Schema(fields);
ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
for (int i = 0; i < schema.customMetadataLength(); i++) {
KeyValue kv = schema.customMetadata(i);
String key = kv.key(), value = kv.value();
metadataBuilder.put(key == null ? "" : key, value == null ? "" : value);
}
Map<String, String> metadata = metadataBuilder.build();
return new Schema(fields, metadata);
}

private final List<Field> fields;
private final Map<String, String> metadata;

public Schema(Iterable<Field> fields) {
this(fields, null);
}

@JsonCreator
public Schema(@JsonProperty("fields") Iterable<Field> fields) {
public Schema(@JsonProperty("fields") Iterable<Field> fields,
@JsonProperty("metadata") Map<String, String> metadata) {
List<Field> fieldList = new ArrayList<>();
for (Field field : fields) {
fieldList.add(field);
}
this.fields = Collections.unmodifiableList(fieldList);
this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
}

public List<Field> getFields() {
return fields;
}

@JsonInclude(Include.NON_EMPTY)
public Map<String, String> getCustomMetadata() {
return metadata;
}

/**
* @param name the name of the field to return
* @return the corresponding field
Expand All@@ -117,27 +144,42 @@ public int getSchema(FlatBufferBuilder builder) {
fieldOffsets[i] = fields.get(i).getField(builder);
}
int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
int[] metadataOffsets = new int[metadata.size()];
Iterator<Entry<String, String>> metadataIterator = metadata.entrySet().iterator();
for (int i = 0; i < metadataOffsets.length; i ++) {
Entry<String, String> kv = metadataIterator.next();
int keyOffset = builder.createString(kv.getKey());
int valueOffset = builder.createString(kv.getValue());
KeyValue.startKeyValue(builder);
KeyValue.addKey(builder, keyOffset);
KeyValue.addValue(builder, valueOffset);
metadataOffsets[i] = KeyValue.endKeyValue(builder);
}
int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
org.apache.arrow.flatbuf.Schema.startSchema(builder);
org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
return org.apache.arrow.flatbuf.Schema.endSchema(builder);
}


@Override
public int hashCode() {
return Objects.hashCode(fields);
return Objects.hash(fields, metadata);
}

@Override
public boolean equals(Object obj) {
if (!(obj instanceof Schema)) {
return false;
}
return Objects.equals(this.fields, ((Schema) obj).fields);
return Objects.equals(this.fields, ((Schema) obj).fields) &&
Objects.equals(this.metadata, ((Schema) obj).metadata);
}

@Override
public String toString() {
return "Schema<" + Joiner.on(", ").join(fields) + ">";
String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
return "Schema<" + Joiner.on(", ").join(fields) + ">" + meta;
}
}
17 changes: 12 additions & 5 deletions java/vector/src/test/java/org/apache/arrow/vector/file/TestArrowFile.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand DownExpand Up@@ -386,7 +387,7 @@ private void validateTinyData(VectorSchemaRoot root) {
}

@Test
public void testWriteReadFieldMetadata() throws IOException {
public void testWriteReadMetadata() throws IOException {
File file = new File("target/mytest_metadata.arrow");
ByteArrayOutputStream stream = new ByteArrayOutputStream();

Expand All@@ -397,7 +398,11 @@ public void testWriteReadFieldMetadata() throws IOException {
childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
ImmutableList.of(new Field("l1", FieldType.nullable(new ArrowType.Int(16 ,true)), null))));
Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
List<Field> fields = ImmutableList.of(field);
Map<String, String> metadata = new HashMap<>();
metadata.put("s1", "v1");
metadata.put("s2", "v2");
Schema originalSchema = new Schema(ImmutableList.of(field), metadata);
Assert.assertEquals(metadata, originalSchema.getCustomMetadata());

// write
try (BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
Expand All@@ -406,7 +411,7 @@ public void testWriteReadFieldMetadata() throws IOException {
vector.getMutator().setValueCount(0);

List<FieldVector> vectors = ImmutableList.<FieldVector>of(vector);
VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 0);
VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);

try (FileOutputStream fileOutputStream = new FileOutputStream(file);
ArrowFileWriter fileWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());
Expand All@@ -428,7 +433,8 @@ public void testWriteReadFieldMetadata() throws IOException {
VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
Schema schema = root.getSchema();
LOGGER.debug("reading schema: " + schema);
Assert.assertEquals(fields, schema.getFields());
Assert.assertEquals(originalSchema, schema);
Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
Field top = schema.getFields().get(0);
Assert.assertEquals(metadata(0), top.getMetadata());
for (int i = 0; i < 4; i ++) {
Expand All@@ -443,7 +449,8 @@ public void testWriteReadFieldMetadata() throws IOException {
VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
Schema schema = root.getSchema();
LOGGER.debug("reading schema: " + schema);
Assert.assertEquals(fields, schema.getFields());
Assert.assertEquals(originalSchema, schema);
Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
Field top = schema.getFields().get(0);
Assert.assertEquals(metadata(0), top.getMetadata());
for (int i = 0; i < 4; i ++) {
Expand Down
21 changes: 18 additions & 3 deletions java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,12 @@
import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
import static org.junit.Assert.assertEquals;

import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.UnionMode;
Expand All@@ -36,9 +42,6 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

/**
* Test conversion between Flatbuf and Pojo field representations
*/
Expand DownExpand Up@@ -69,6 +72,18 @@ public void schema() {
run(initialSchema);
}

@Test
public void schemaMetadata() {
ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
childrenBuilder.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
childrenBuilder.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), ImmutableList.<Field>of()));
Map<String, String> metadata = new HashMap<>();
metadata.put("key1", "value1");
metadata.put("key2", "value2");
Schema initialSchema = new Schema(childrenBuilder.build(), metadata);
run(initialSchema);
}

@Test
public void nestedSchema() {
ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
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-1015 [Java] Schema-level metadata#676

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

 Closed

elahrvivaz
wants to merge
2
commits into

from

 Closed


ARROW-1015 [Java] Schema-level metadata
#676
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
9ffdb5a

ARROW-1015 [Java] Schema-level metadata


elahrvivaz May 12, 2017
9e94e1a

Changing accessor to getCustomMetadata


elahrvivaz May 15, 2017

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


12 changes: 8 additions & 4 deletions
java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,15 @@ public VectorSchemaRoot(FieldVector parent) {
 }

 public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int rowCount) {
 if (fields.size() != fieldVectors.size()) {
 this(new Schema(fields), fieldVectors, rowCount);
 }

 public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
 if (schema.getFields().size() != fieldVectors.size()) {
 throw new IllegalArgumentException("Fields must match field vectors. Found " +
 fieldVectors.size() + " vectors and " + fields.size() + " fields");
 fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
 }
 this.schema = new Schema(fields);
 this.schema = schema;
 this.rowCount = rowCount;
 this.fieldVectors = fieldVectors;
 for (int i = 0; i < schema.getFields().size(); ++i) {
Expand All@@ -65,7 +69,7 @@ public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator)
 throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
 fieldVectors.size() + " expected " + schema.getFields().size());
 }
 return new VectorSchemaRoot(schema.getFields(), fieldVectors, 0);
 return new VectorSchemaRoot(schema, fieldVectors, 0);
 }

 public List<FieldVector> getFieldVectors() {
Expand Down

7 changes: 4 additions & 3 deletions
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,18 +150,19 @@ protected void ensureInitialized() throws IOException {
 * Reads the schema and initializes the vectors
 */
 private void initialize() throws IOException {
 Schema schema = readSchema(in);
 Schema originalSchema = readSchema(in);
 List<Field> fields = new ArrayList<>();
 List<FieldVector> vectors = new ArrayList<>();
 Map<Long, Dictionary> dictionaries = new HashMap<>();

 for (Field field: schema.getFields()) {
 for (Field field: originalSchema.getFields()) {
 Field updated = toMemoryFormat(field, dictionaries);
 fields.add(updated);
 vectors.add(updated.createVector(allocator));
 }
 Schema schema = new Schema(fields, originalSchema.getCustomMetadata());

 this.root = new VectorSchemaRoot(fields, vectors, 0);
 this.root = new VectorSchemaRoot(schema, vectors, 0);
 this.loader = new VectorLoader(root);
 this.dictionaries = Collections.unmodifiableMap(dictionaries);
 }
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
 fields.add(toMessageFormat(field, provider, dictionaryBatches));
 }

 this.schema = new Schema(fields);
 this.schema = new Schema(fields, root.getSchema().getCustomMetadata());
 this.dictionaries = Collections.unmodifiableList(new ArrayList<>(dictionaryBatches.values()));
 }

Expand Down

52 changes: 47 additions & 5 deletions
java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,19 +25,27 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.flatbuf.KeyValue;

/**
 * An Arrow Schema
 */
Expand DownExpand Up@@ -76,24 +84,43 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
 childrenBuilder.add(convertField(schema.fields(i)));
 }
 List<Field> fields = childrenBuilder.build();
 return new Schema(fields);
 ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
 for (int i = 0; i < schema.customMetadataLength(); i++) {
 KeyValue kv = schema.customMetadata(i);
 String key = kv.key(), value = kv.value();
 metadataBuilder.put(key == null ? "" : key, value == null ? "" : value);
 }
 Map<String, String> metadata = metadataBuilder.build();
 return new Schema(fields, metadata);
 }

 private final List<Field> fields;
 private final Map<String, String> metadata;

 public Schema(Iterable<Field> fields) {
 this(fields, null);
 }

 @JsonCreator
 public Schema(@JsonProperty("fields") Iterable<Field> fields) {
 public Schema(@JsonProperty("fields") Iterable<Field> fields,
 @JsonProperty("metadata") Map<String, String> metadata) {
 List<Field> fieldList = new ArrayList<>();
 for (Field field : fields) {
 fieldList.add(field);
 }
 this.fields = Collections.unmodifiableList(fieldList);
 this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
 }

 public List<Field> getFields() {
 return fields;
 }

 @JsonInclude(Include.NON_EMPTY)
 public Map<String, String> getCustomMetadata() {
 return metadata;
 }

 /**
 * @param name the name of the field to return
 * @return the corresponding field
Expand All@@ -117,27 +144,42 @@ public int getSchema(FlatBufferBuilder builder) {
 fieldOffsets[i] = fields.get(i).getField(builder);
 }
 int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
 int[] metadataOffsets = new int[metadata.size()];
 Iterator<Entry<String, String>> metadataIterator = metadata.entrySet().iterator();
 for (int i = 0; i < metadataOffsets.length; i ++) {
 Entry<String, String> kv = metadataIterator.next();
 int keyOffset = builder.createString(kv.getKey());
 int valueOffset = builder.createString(kv.getValue());
 KeyValue.startKeyValue(builder);
 KeyValue.addKey(builder, keyOffset);
 KeyValue.addValue(builder, valueOffset);
 metadataOffsets[i] = KeyValue.endKeyValue(builder);
 }
 int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
 org.apache.arrow.flatbuf.Schema.startSchema(builder);
 org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
 org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
 return org.apache.arrow.flatbuf.Schema.endSchema(builder);
 }


 @Override
 public int hashCode() {
 return Objects.hashCode(fields);
 return Objects.hash(fields, metadata);
 }

 @Override
 public boolean equals(Object obj) {
 if (!(obj instanceof Schema)) {
 return false;
 }
 return Objects.equals(this.fields, ((Schema) obj).fields);
 return Objects.equals(this.fields, ((Schema) obj).fields) &&
 Objects.equals(this.metadata, ((Schema) obj).metadata);
 }

 @Override
 public String toString() {
 return "Schema<" + Joiner.on(", ").join(fields) + ">";
 String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
 return "Schema<" + Joiner.on(", ").join(fields) + ">" + meta;
 }
}

17 changes: 12 additions & 5 deletions
java/vector/src/test/java/org/apache/arrow/vector/file/TestArrowFile.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand DownExpand Up@@ -386,7 +387,7 @@ private void validateTinyData(VectorSchemaRoot root) {
 }

 @Test
 public void testWriteReadFieldMetadata() throws IOException {
 public void testWriteReadMetadata() throws IOException {
 File file = new File("target/mytest_metadata.arrow");
 ByteArrayOutputStream stream = new ByteArrayOutputStream();

Expand All@@ -397,7 +398,11 @@ public void testWriteReadFieldMetadata() throws IOException {
 childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
 ImmutableList.of(new Field("l1", FieldType.nullable(new ArrowType.Int(16 ,true)), null))));
 Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
 List<Field> fields = ImmutableList.of(field);
 Map<String, String> metadata = new HashMap<>();
 metadata.put("s1", "v1");
 metadata.put("s2", "v2");
 Schema originalSchema = new Schema(ImmutableList.of(field), metadata);
 Assert.assertEquals(metadata, originalSchema.getCustomMetadata());

 // write
 try (BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
Expand All@@ -406,7 +411,7 @@ public void testWriteReadFieldMetadata() throws IOException {
 vector.getMutator().setValueCount(0);

 List<FieldVector> vectors = ImmutableList.<FieldVector>of(vector);
 VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 0);
 VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);

 try (FileOutputStream fileOutputStream = new FileOutputStream(file);
 ArrowFileWriter fileWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());
Expand All@@ -428,7 +433,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand All@@ -443,7 +449,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand Down

21 changes: 18 additions & 3 deletions
java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,12 @@
import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
import static org.junit.Assert.assertEquals;

import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.UnionMode;
Expand All@@ -36,9 +42,6 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

/**
 * Test conversion between Flatbuf and Pojo field representations
 */
Expand DownExpand Up@@ -69,6 +72,18 @@ public void schema() {
 run(initialSchema);
 }

 @Test
 public void schemaMetadata() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
 childrenBuilder.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
 childrenBuilder.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), ImmutableList.<Field>of()));
 Map<String, String> metadata = new HashMap<>();
 metadata.put("key1", "value1");
 metadata.put("key2", "value2");
 Schema initialSchema = new Schema(childrenBuilder.build(), metadata);
 run(initialSchema);
 }

 @Test
 public void nestedSchema() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
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-1015 [Java] Schema-level metadata#676

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

 Closed

elahrvivaz
wants to merge
2
commits into

from

 Closed


ARROW-1015 [Java] Schema-level metadata
#676
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
9ffdb5a

ARROW-1015 [Java] Schema-level metadata


elahrvivaz May 12, 2017
9e94e1a

Changing accessor to getCustomMetadata


elahrvivaz May 15, 2017

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


12 changes: 8 additions & 4 deletions
java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,15 @@ public VectorSchemaRoot(FieldVector parent) {
 }

 public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int rowCount) {
 if (fields.size() != fieldVectors.size()) {
 this(new Schema(fields), fieldVectors, rowCount);
 }

 public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
 if (schema.getFields().size() != fieldVectors.size()) {
 throw new IllegalArgumentException("Fields must match field vectors. Found " +
 fieldVectors.size() + " vectors and " + fields.size() + " fields");
 fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
 }
 this.schema = new Schema(fields);
 this.schema = schema;
 this.rowCount = rowCount;
 this.fieldVectors = fieldVectors;
 for (int i = 0; i < schema.getFields().size(); ++i) {
Expand All@@ -65,7 +69,7 @@ public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator)
 throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
 fieldVectors.size() + " expected " + schema.getFields().size());
 }
 return new VectorSchemaRoot(schema.getFields(), fieldVectors, 0);
 return new VectorSchemaRoot(schema, fieldVectors, 0);
 }

 public List<FieldVector> getFieldVectors() {
Expand Down

7 changes: 4 additions & 3 deletions
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,18 +150,19 @@ protected void ensureInitialized() throws IOException {
 * Reads the schema and initializes the vectors
 */
 private void initialize() throws IOException {
 Schema schema = readSchema(in);
 Schema originalSchema = readSchema(in);
 List<Field> fields = new ArrayList<>();
 List<FieldVector> vectors = new ArrayList<>();
 Map<Long, Dictionary> dictionaries = new HashMap<>();

 for (Field field: schema.getFields()) {
 for (Field field: originalSchema.getFields()) {
 Field updated = toMemoryFormat(field, dictionaries);
 fields.add(updated);
 vectors.add(updated.createVector(allocator));
 }
 Schema schema = new Schema(fields, originalSchema.getCustomMetadata());

 this.root = new VectorSchemaRoot(fields, vectors, 0);
 this.root = new VectorSchemaRoot(schema, vectors, 0);
 this.loader = new VectorLoader(root);
 this.dictionaries = Collections.unmodifiableMap(dictionaries);
 }
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
 fields.add(toMessageFormat(field, provider, dictionaryBatches));
 }

 this.schema = new Schema(fields);
 this.schema = new Schema(fields, root.getSchema().getCustomMetadata());
 this.dictionaries = Collections.unmodifiableList(new ArrayList<>(dictionaryBatches.values()));
 }

Expand Down

52 changes: 47 additions & 5 deletions
java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,19 +25,27 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.flatbuf.KeyValue;

/**
 * An Arrow Schema
 */
Expand DownExpand Up@@ -76,24 +84,43 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
 childrenBuilder.add(convertField(schema.fields(i)));
 }
 List<Field> fields = childrenBuilder.build();
 return new Schema(fields);
 ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
 for (int i = 0; i < schema.customMetadataLength(); i++) {
 KeyValue kv = schema.customMetadata(i);
 String key = kv.key(), value = kv.value();
 metadataBuilder.put(key == null ? "" : key, value == null ? "" : value);
 }
 Map<String, String> metadata = metadataBuilder.build();
 return new Schema(fields, metadata);
 }

 private final List<Field> fields;
 private final Map<String, String> metadata;

 public Schema(Iterable<Field> fields) {
 this(fields, null);
 }

 @JsonCreator
 public Schema(@JsonProperty("fields") Iterable<Field> fields) {
 public Schema(@JsonProperty("fields") Iterable<Field> fields,
 @JsonProperty("metadata") Map<String, String> metadata) {
 List<Field> fieldList = new ArrayList<>();
 for (Field field : fields) {
 fieldList.add(field);
 }
 this.fields = Collections.unmodifiableList(fieldList);
 this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
 }

 public List<Field> getFields() {
 return fields;
 }

 @JsonInclude(Include.NON_EMPTY)
 public Map<String, String> getCustomMetadata() {
 return metadata;
 }

 /**
 * @param name the name of the field to return
 * @return the corresponding field
Expand All@@ -117,27 +144,42 @@ public int getSchema(FlatBufferBuilder builder) {
 fieldOffsets[i] = fields.get(i).getField(builder);
 }
 int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
 int[] metadataOffsets = new int[metadata.size()];
 Iterator<Entry<String, String>> metadataIterator = metadata.entrySet().iterator();
 for (int i = 0; i < metadataOffsets.length; i ++) {
 Entry<String, String> kv = metadataIterator.next();
 int keyOffset = builder.createString(kv.getKey());
 int valueOffset = builder.createString(kv.getValue());
 KeyValue.startKeyValue(builder);
 KeyValue.addKey(builder, keyOffset);
 KeyValue.addValue(builder, valueOffset);
 metadataOffsets[i] = KeyValue.endKeyValue(builder);
 }
 int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
 org.apache.arrow.flatbuf.Schema.startSchema(builder);
 org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
 org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
 return org.apache.arrow.flatbuf.Schema.endSchema(builder);
 }


 @Override
 public int hashCode() {
 return Objects.hashCode(fields);
 return Objects.hash(fields, metadata);
 }

 @Override
 public boolean equals(Object obj) {
 if (!(obj instanceof Schema)) {
 return false;
 }
 return Objects.equals(this.fields, ((Schema) obj).fields);
 return Objects.equals(this.fields, ((Schema) obj).fields) &&
 Objects.equals(this.metadata, ((Schema) obj).metadata);
 }

 @Override
 public String toString() {
 return "Schema<" + Joiner.on(", ").join(fields) + ">";
 String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
 return "Schema<" + Joiner.on(", ").join(fields) + ">" + meta;
 }
}

17 changes: 12 additions & 5 deletions
java/vector/src/test/java/org/apache/arrow/vector/file/TestArrowFile.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand DownExpand Up@@ -386,7 +387,7 @@ private void validateTinyData(VectorSchemaRoot root) {
 }

 @Test
 public void testWriteReadFieldMetadata() throws IOException {
 public void testWriteReadMetadata() throws IOException {
 File file = new File("target/mytest_metadata.arrow");
 ByteArrayOutputStream stream = new ByteArrayOutputStream();

Expand All@@ -397,7 +398,11 @@ public void testWriteReadFieldMetadata() throws IOException {
 childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
 ImmutableList.of(new Field("l1", FieldType.nullable(new ArrowType.Int(16 ,true)), null))));
 Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
 List<Field> fields = ImmutableList.of(field);
 Map<String, String> metadata = new HashMap<>();
 metadata.put("s1", "v1");
 metadata.put("s2", "v2");
 Schema originalSchema = new Schema(ImmutableList.of(field), metadata);
 Assert.assertEquals(metadata, originalSchema.getCustomMetadata());

 // write
 try (BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
Expand All@@ -406,7 +411,7 @@ public void testWriteReadFieldMetadata() throws IOException {
 vector.getMutator().setValueCount(0);

 List<FieldVector> vectors = ImmutableList.<FieldVector>of(vector);
 VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 0);
 VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);

 try (FileOutputStream fileOutputStream = new FileOutputStream(file);
 ArrowFileWriter fileWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());
Expand All@@ -428,7 +433,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand All@@ -443,7 +449,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand Down

21 changes: 18 additions & 3 deletions
java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,12 @@
import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
import static org.junit.Assert.assertEquals;

import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.UnionMode;
Expand All@@ -36,9 +42,6 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

/**
 * Test conversion between Flatbuf and Pojo field representations
 */
Expand DownExpand Up@@ -69,6 +72,18 @@ public void schema() {
 run(initialSchema);
 }

 @Test
 public void schemaMetadata() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
 childrenBuilder.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
 childrenBuilder.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), ImmutableList.<Field>of()));
 Map<String, String> metadata = new HashMap<>();
 metadata.put("key1", "value1");
 metadata.put("key2", "value2");
 Schema initialSchema = new Schema(childrenBuilder.build(), metadata);
 run(initialSchema);
 }

 @Test
 public void nestedSchema() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
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-1015 [Java] Schema-level metadata#676

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

 Closed

elahrvivaz
wants to merge
2
commits into

from

 Closed


ARROW-1015 [Java] Schema-level metadata
#676
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
9ffdb5a

ARROW-1015 [Java] Schema-level metadata


elahrvivaz May 12, 2017
9e94e1a

Changing accessor to getCustomMetadata


elahrvivaz May 15, 2017

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


12 changes: 8 additions & 4 deletions
java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,15 @@ public VectorSchemaRoot(FieldVector parent) {
 }

 public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int rowCount) {
 if (fields.size() != fieldVectors.size()) {
 this(new Schema(fields), fieldVectors, rowCount);
 }

 public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
 if (schema.getFields().size() != fieldVectors.size()) {
 throw new IllegalArgumentException("Fields must match field vectors. Found " +
 fieldVectors.size() + " vectors and " + fields.size() + " fields");
 fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
 }
 this.schema = new Schema(fields);
 this.schema = schema;
 this.rowCount = rowCount;
 this.fieldVectors = fieldVectors;
 for (int i = 0; i < schema.getFields().size(); ++i) {
Expand All@@ -65,7 +69,7 @@ public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator)
 throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
 fieldVectors.size() + " expected " + schema.getFields().size());
 }
 return new VectorSchemaRoot(schema.getFields(), fieldVectors, 0);
 return new VectorSchemaRoot(schema, fieldVectors, 0);
 }

 public List<FieldVector> getFieldVectors() {
Expand Down

7 changes: 4 additions & 3 deletions
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,18 +150,19 @@ protected void ensureInitialized() throws IOException {
 * Reads the schema and initializes the vectors
 */
 private void initialize() throws IOException {
 Schema schema = readSchema(in);
 Schema originalSchema = readSchema(in);
 List<Field> fields = new ArrayList<>();
 List<FieldVector> vectors = new ArrayList<>();
 Map<Long, Dictionary> dictionaries = new HashMap<>();

 for (Field field: schema.getFields()) {
 for (Field field: originalSchema.getFields()) {
 Field updated = toMemoryFormat(field, dictionaries);
 fields.add(updated);
 vectors.add(updated.createVector(allocator));
 }
 Schema schema = new Schema(fields, originalSchema.getCustomMetadata());

 this.root = new VectorSchemaRoot(fields, vectors, 0);
 this.root = new VectorSchemaRoot(schema, vectors, 0);
 this.loader = new VectorLoader(root);
 this.dictionaries = Collections.unmodifiableMap(dictionaries);
 }
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
 fields.add(toMessageFormat(field, provider, dictionaryBatches));
 }

 this.schema = new Schema(fields);
 this.schema = new Schema(fields, root.getSchema().getCustomMetadata());
 this.dictionaries = Collections.unmodifiableList(new ArrayList<>(dictionaryBatches.values()));
 }

Expand Down

52 changes: 47 additions & 5 deletions
java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,19 +25,27 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.flatbuf.KeyValue;

/**
 * An Arrow Schema
 */
Expand DownExpand Up@@ -76,24 +84,43 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
 childrenBuilder.add(convertField(schema.fields(i)));
 }
 List<Field> fields = childrenBuilder.build();
 return new Schema(fields);
 ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
 for (int i = 0; i < schema.customMetadataLength(); i++) {
 KeyValue kv = schema.customMetadata(i);
 String key = kv.key(), value = kv.value();
 metadataBuilder.put(key == null ? "" : key, value == null ? "" : value);
 }
 Map<String, String> metadata = metadataBuilder.build();
 return new Schema(fields, metadata);
 }

 private final List<Field> fields;
 private final Map<String, String> metadata;

 public Schema(Iterable<Field> fields) {
 this(fields, null);
 }

 @JsonCreator
 public Schema(@JsonProperty("fields") Iterable<Field> fields) {
 public Schema(@JsonProperty("fields") Iterable<Field> fields,
 @JsonProperty("metadata") Map<String, String> metadata) {
 List<Field> fieldList = new ArrayList<>();
 for (Field field : fields) {
 fieldList.add(field);
 }
 this.fields = Collections.unmodifiableList(fieldList);
 this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
 }

 public List<Field> getFields() {
 return fields;
 }

 @JsonInclude(Include.NON_EMPTY)
 public Map<String, String> getCustomMetadata() {
 return metadata;
 }

 /**
 * @param name the name of the field to return
 * @return the corresponding field
Expand All@@ -117,27 +144,42 @@ public int getSchema(FlatBufferBuilder builder) {
 fieldOffsets[i] = fields.get(i).getField(builder);
 }
 int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
 int[] metadataOffsets = new int[metadata.size()];
 Iterator<Entry<String, String>> metadataIterator = metadata.entrySet().iterator();
 for (int i = 0; i < metadataOffsets.length; i ++) {
 Entry<String, String> kv = metadataIterator.next();
 int keyOffset = builder.createString(kv.getKey());
 int valueOffset = builder.createString(kv.getValue());
 KeyValue.startKeyValue(builder);
 KeyValue.addKey(builder, keyOffset);
 KeyValue.addValue(builder, valueOffset);
 metadataOffsets[i] = KeyValue.endKeyValue(builder);
 }
 int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
 org.apache.arrow.flatbuf.Schema.startSchema(builder);
 org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
 org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
 return org.apache.arrow.flatbuf.Schema.endSchema(builder);
 }


 @Override
 public int hashCode() {
 return Objects.hashCode(fields);
 return Objects.hash(fields, metadata);
 }

 @Override
 public boolean equals(Object obj) {
 if (!(obj instanceof Schema)) {
 return false;
 }
 return Objects.equals(this.fields, ((Schema) obj).fields);
 return Objects.equals(this.fields, ((Schema) obj).fields) &&
 Objects.equals(this.metadata, ((Schema) obj).metadata);
 }

 @Override
 public String toString() {
 return "Schema<" + Joiner.on(", ").join(fields) + ">";
 String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
 return "Schema<" + Joiner.on(", ").join(fields) + ">" + meta;
 }
}

17 changes: 12 additions & 5 deletions
java/vector/src/test/java/org/apache/arrow/vector/file/TestArrowFile.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand DownExpand Up@@ -386,7 +387,7 @@ private void validateTinyData(VectorSchemaRoot root) {
 }

 @Test
 public void testWriteReadFieldMetadata() throws IOException {
 public void testWriteReadMetadata() throws IOException {
 File file = new File("target/mytest_metadata.arrow");
 ByteArrayOutputStream stream = new ByteArrayOutputStream();

Expand All@@ -397,7 +398,11 @@ public void testWriteReadFieldMetadata() throws IOException {
 childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
 ImmutableList.of(new Field("l1", FieldType.nullable(new ArrowType.Int(16 ,true)), null))));
 Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
 List<Field> fields = ImmutableList.of(field);
 Map<String, String> metadata = new HashMap<>();
 metadata.put("s1", "v1");
 metadata.put("s2", "v2");
 Schema originalSchema = new Schema(ImmutableList.of(field), metadata);
 Assert.assertEquals(metadata, originalSchema.getCustomMetadata());

 // write
 try (BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
Expand All@@ -406,7 +411,7 @@ public void testWriteReadFieldMetadata() throws IOException {
 vector.getMutator().setValueCount(0);

 List<FieldVector> vectors = ImmutableList.<FieldVector>of(vector);
 VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 0);
 VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);

 try (FileOutputStream fileOutputStream = new FileOutputStream(file);
 ArrowFileWriter fileWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());
Expand All@@ -428,7 +433,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand All@@ -443,7 +449,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand Down

21 changes: 18 additions & 3 deletions
java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,12 @@
import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
import static org.junit.Assert.assertEquals;

import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.UnionMode;
Expand All@@ -36,9 +42,6 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

/**
 * Test conversion between Flatbuf and Pojo field representations
 */
Expand DownExpand Up@@ -69,6 +72,18 @@ public void schema() {
 run(initialSchema);
 }

 @Test
 public void schemaMetadata() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
 childrenBuilder.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
 childrenBuilder.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), ImmutableList.<Field>of()));
 Map<String, String> metadata = new HashMap<>();
 metadata.put("key1", "value1");
 metadata.put("key2", "value2");
 Schema initialSchema = new Schema(childrenBuilder.build(), metadata);
 run(initialSchema);
 }

 @Test
 public void nestedSchema() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
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-1015 [Java] Schema-level metadata#676

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

 Closed

elahrvivaz
wants to merge
2
commits into

from

 Closed


ARROW-1015 [Java] Schema-level metadata
#676
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
9ffdb5a

ARROW-1015 [Java] Schema-level metadata


elahrvivaz May 12, 2017
9e94e1a

Changing accessor to getCustomMetadata


elahrvivaz May 15, 2017

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


12 changes: 8 additions & 4 deletions
java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,15 @@ public VectorSchemaRoot(FieldVector parent) {
 }

 public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int rowCount) {
 if (fields.size() != fieldVectors.size()) {
 this(new Schema(fields), fieldVectors, rowCount);
 }

 public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
 if (schema.getFields().size() != fieldVectors.size()) {
 throw new IllegalArgumentException("Fields must match field vectors. Found " +
 fieldVectors.size() + " vectors and " + fields.size() + " fields");
 fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
 }
 this.schema = new Schema(fields);
 this.schema = schema;
 this.rowCount = rowCount;
 this.fieldVectors = fieldVectors;
 for (int i = 0; i < schema.getFields().size(); ++i) {
Expand All@@ -65,7 +69,7 @@ public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator)
 throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
 fieldVectors.size() + " expected " + schema.getFields().size());
 }
 return new VectorSchemaRoot(schema.getFields(), fieldVectors, 0);
 return new VectorSchemaRoot(schema, fieldVectors, 0);
 }

 public List<FieldVector> getFieldVectors() {
Expand Down

7 changes: 4 additions & 3 deletions
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,18 +150,19 @@ protected void ensureInitialized() throws IOException {
 * Reads the schema and initializes the vectors
 */
 private void initialize() throws IOException {
 Schema schema = readSchema(in);
 Schema originalSchema = readSchema(in);
 List<Field> fields = new ArrayList<>();
 List<FieldVector> vectors = new ArrayList<>();
 Map<Long, Dictionary> dictionaries = new HashMap<>();

 for (Field field: schema.getFields()) {
 for (Field field: originalSchema.getFields()) {
 Field updated = toMemoryFormat(field, dictionaries);
 fields.add(updated);
 vectors.add(updated.createVector(allocator));
 }
 Schema schema = new Schema(fields, originalSchema.getCustomMetadata());

 this.root = new VectorSchemaRoot(fields, vectors, 0);
 this.root = new VectorSchemaRoot(schema, vectors, 0);
 this.loader = new VectorLoader(root);
 this.dictionaries = Collections.unmodifiableMap(dictionaries);
 }
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
 fields.add(toMessageFormat(field, provider, dictionaryBatches));
 }

 this.schema = new Schema(fields);
 this.schema = new Schema(fields, root.getSchema().getCustomMetadata());
 this.dictionaries = Collections.unmodifiableList(new ArrayList<>(dictionaryBatches.values()));
 }

Expand Down

52 changes: 47 additions & 5 deletions
java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,19 +25,27 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.flatbuf.KeyValue;

/**
 * An Arrow Schema
 */
Expand DownExpand Up@@ -76,24 +84,43 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
 childrenBuilder.add(convertField(schema.fields(i)));
 }
 List<Field> fields = childrenBuilder.build();
 return new Schema(fields);
 ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
 for (int i = 0; i < schema.customMetadataLength(); i++) {
 KeyValue kv = schema.customMetadata(i);
 String key = kv.key(), value = kv.value();
 metadataBuilder.put(key == null ? "" : key, value == null ? "" : value);
 }
 Map<String, String> metadata = metadataBuilder.build();
 return new Schema(fields, metadata);
 }

 private final List<Field> fields;
 private final Map<String, String> metadata;

 public Schema(Iterable<Field> fields) {
 this(fields, null);
 }

 @JsonCreator
 public Schema(@JsonProperty("fields") Iterable<Field> fields) {
 public Schema(@JsonProperty("fields") Iterable<Field> fields,
 @JsonProperty("metadata") Map<String, String> metadata) {
 List<Field> fieldList = new ArrayList<>();
 for (Field field : fields) {
 fieldList.add(field);
 }
 this.fields = Collections.unmodifiableList(fieldList);
 this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
 }

 public List<Field> getFields() {
 return fields;
 }

 @JsonInclude(Include.NON_EMPTY)
 public Map<String, String> getCustomMetadata() {
 return metadata;
 }

 /**
 * @param name the name of the field to return
 * @return the corresponding field
Expand All@@ -117,27 +144,42 @@ public int getSchema(FlatBufferBuilder builder) {
 fieldOffsets[i] = fields.get(i).getField(builder);
 }
 int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
 int[] metadataOffsets = new int[metadata.size()];
 Iterator<Entry<String, String>> metadataIterator = metadata.entrySet().iterator();
 for (int i = 0; i < metadataOffsets.length; i ++) {
 Entry<String, String> kv = metadataIterator.next();
 int keyOffset = builder.createString(kv.getKey());
 int valueOffset = builder.createString(kv.getValue());
 KeyValue.startKeyValue(builder);
 KeyValue.addKey(builder, keyOffset);
 KeyValue.addValue(builder, valueOffset);
 metadataOffsets[i] = KeyValue.endKeyValue(builder);
 }
 int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
 org.apache.arrow.flatbuf.Schema.startSchema(builder);
 org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
 org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
 return org.apache.arrow.flatbuf.Schema.endSchema(builder);
 }


 @Override
 public int hashCode() {
 return Objects.hashCode(fields);
 return Objects.hash(fields, metadata);
 }

 @Override
 public boolean equals(Object obj) {
 if (!(obj instanceof Schema)) {
 return false;
 }
 return Objects.equals(this.fields, ((Schema) obj).fields);
 return Objects.equals(this.fields, ((Schema) obj).fields) &&
 Objects.equals(this.metadata, ((Schema) obj).metadata);
 }

 @Override
 public String toString() {
 return "Schema<" + Joiner.on(", ").join(fields) + ">";
 String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
 return "Schema<" + Joiner.on(", ").join(fields) + ">" + meta;
 }
}

17 changes: 12 additions & 5 deletions
java/vector/src/test/java/org/apache/arrow/vector/file/TestArrowFile.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand DownExpand Up@@ -386,7 +387,7 @@ private void validateTinyData(VectorSchemaRoot root) {
 }

 @Test
 public void testWriteReadFieldMetadata() throws IOException {
 public void testWriteReadMetadata() throws IOException {
 File file = new File("target/mytest_metadata.arrow");
 ByteArrayOutputStream stream = new ByteArrayOutputStream();

Expand All@@ -397,7 +398,11 @@ public void testWriteReadFieldMetadata() throws IOException {
 childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
 ImmutableList.of(new Field("l1", FieldType.nullable(new ArrowType.Int(16 ,true)), null))));
 Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
 List<Field> fields = ImmutableList.of(field);
 Map<String, String> metadata = new HashMap<>();
 metadata.put("s1", "v1");
 metadata.put("s2", "v2");
 Schema originalSchema = new Schema(ImmutableList.of(field), metadata);
 Assert.assertEquals(metadata, originalSchema.getCustomMetadata());

 // write
 try (BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
Expand All@@ -406,7 +411,7 @@ public void testWriteReadFieldMetadata() throws IOException {
 vector.getMutator().setValueCount(0);

 List<FieldVector> vectors = ImmutableList.<FieldVector>of(vector);
 VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 0);
 VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);

 try (FileOutputStream fileOutputStream = new FileOutputStream(file);
 ArrowFileWriter fileWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());
Expand All@@ -428,7 +433,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand All@@ -443,7 +449,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand Down

21 changes: 18 additions & 3 deletions
java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,12 @@
import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
import static org.junit.Assert.assertEquals;

import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.UnionMode;
Expand All@@ -36,9 +42,6 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

/**
 * Test conversion between Flatbuf and Pojo field representations
 */
Expand DownExpand Up@@ -69,6 +72,18 @@ public void schema() {
 run(initialSchema);
 }

 @Test
 public void schemaMetadata() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
 childrenBuilder.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
 childrenBuilder.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), ImmutableList.<Field>of()));
 Map<String, String> metadata = new HashMap<>();
 metadata.put("key1", "value1");
 metadata.put("key2", "value2");
 Schema initialSchema = new Schema(childrenBuilder.build(), metadata);
 run(initialSchema);
 }

 @Test
 public void nestedSchema() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
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-1015 [Java] Schema-level metadata#676

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

 Closed

elahrvivaz
wants to merge
2
commits into

from

 Closed


ARROW-1015 [Java] Schema-level metadata
#676
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
9ffdb5a

ARROW-1015 [Java] Schema-level metadata


elahrvivaz May 12, 2017
9e94e1a

Changing accessor to getCustomMetadata


elahrvivaz May 15, 2017

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


12 changes: 8 additions & 4 deletions
java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,15 @@ public VectorSchemaRoot(FieldVector parent) {
 }

 public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int rowCount) {
 if (fields.size() != fieldVectors.size()) {
 this(new Schema(fields), fieldVectors, rowCount);
 }

 public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
 if (schema.getFields().size() != fieldVectors.size()) {
 throw new IllegalArgumentException("Fields must match field vectors. Found " +
 fieldVectors.size() + " vectors and " + fields.size() + " fields");
 fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
 }
 this.schema = new Schema(fields);
 this.schema = schema;
 this.rowCount = rowCount;
 this.fieldVectors = fieldVectors;
 for (int i = 0; i < schema.getFields().size(); ++i) {
Expand All@@ -65,7 +69,7 @@ public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator)
 throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
 fieldVectors.size() + " expected " + schema.getFields().size());
 }
 return new VectorSchemaRoot(schema.getFields(), fieldVectors, 0);
 return new VectorSchemaRoot(schema, fieldVectors, 0);
 }

 public List<FieldVector> getFieldVectors() {
Expand Down

7 changes: 4 additions & 3 deletions
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,18 +150,19 @@ protected void ensureInitialized() throws IOException {
 * Reads the schema and initializes the vectors
 */
 private void initialize() throws IOException {
 Schema schema = readSchema(in);
 Schema originalSchema = readSchema(in);
 List<Field> fields = new ArrayList<>();
 List<FieldVector> vectors = new ArrayList<>();
 Map<Long, Dictionary> dictionaries = new HashMap<>();

 for (Field field: schema.getFields()) {
 for (Field field: originalSchema.getFields()) {
 Field updated = toMemoryFormat(field, dictionaries);
 fields.add(updated);
 vectors.add(updated.createVector(allocator));
 }
 Schema schema = new Schema(fields, originalSchema.getCustomMetadata());

 this.root = new VectorSchemaRoot(fields, vectors, 0);
 this.root = new VectorSchemaRoot(schema, vectors, 0);
 this.loader = new VectorLoader(root);
 this.dictionaries = Collections.unmodifiableMap(dictionaries);
 }
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
 fields.add(toMessageFormat(field, provider, dictionaryBatches));
 }

 this.schema = new Schema(fields);
 this.schema = new Schema(fields, root.getSchema().getCustomMetadata());
 this.dictionaries = Collections.unmodifiableList(new ArrayList<>(dictionaryBatches.values()));
 }

Expand Down

52 changes: 47 additions & 5 deletions
java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,19 +25,27 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.flatbuf.KeyValue;

/**
 * An Arrow Schema
 */
Expand DownExpand Up@@ -76,24 +84,43 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
 childrenBuilder.add(convertField(schema.fields(i)));
 }
 List<Field> fields = childrenBuilder.build();
 return new Schema(fields);
 ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
 for (int i = 0; i < schema.customMetadataLength(); i++) {
 KeyValue kv = schema.customMetadata(i);
 String key = kv.key(), value = kv.value();
 metadataBuilder.put(key == null ? "" : key, value == null ? "" : value);
 }
 Map<String, String> metadata = metadataBuilder.build();
 return new Schema(fields, metadata);
 }

 private final List<Field> fields;
 private final Map<String, String> metadata;

 public Schema(Iterable<Field> fields) {
 this(fields, null);
 }

 @JsonCreator
 public Schema(@JsonProperty("fields") Iterable<Field> fields) {
 public Schema(@JsonProperty("fields") Iterable<Field> fields,
 @JsonProperty("metadata") Map<String, String> metadata) {
 List<Field> fieldList = new ArrayList<>();
 for (Field field : fields) {
 fieldList.add(field);
 }
 this.fields = Collections.unmodifiableList(fieldList);
 this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
 }

 public List<Field> getFields() {
 return fields;
 }

 @JsonInclude(Include.NON_EMPTY)
 public Map<String, String> getCustomMetadata() {
 return metadata;
 }

 /**
 * @param name the name of the field to return
 * @return the corresponding field
Expand All@@ -117,27 +144,42 @@ public int getSchema(FlatBufferBuilder builder) {
 fieldOffsets[i] = fields.get(i).getField(builder);
 }
 int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
 int[] metadataOffsets = new int[metadata.size()];
 Iterator<Entry<String, String>> metadataIterator = metadata.entrySet().iterator();
 for (int i = 0; i < metadataOffsets.length; i ++) {
 Entry<String, String> kv = metadataIterator.next();
 int keyOffset = builder.createString(kv.getKey());
 int valueOffset = builder.createString(kv.getValue());
 KeyValue.startKeyValue(builder);
 KeyValue.addKey(builder, keyOffset);
 KeyValue.addValue(builder, valueOffset);
 metadataOffsets[i] = KeyValue.endKeyValue(builder);
 }
 int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
 org.apache.arrow.flatbuf.Schema.startSchema(builder);
 org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
 org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
 return org.apache.arrow.flatbuf.Schema.endSchema(builder);
 }


 @Override
 public int hashCode() {
 return Objects.hashCode(fields);
 return Objects.hash(fields, metadata);
 }

 @Override
 public boolean equals(Object obj) {
 if (!(obj instanceof Schema)) {
 return false;
 }
 return Objects.equals(this.fields, ((Schema) obj).fields);
 return Objects.equals(this.fields, ((Schema) obj).fields) &&
 Objects.equals(this.metadata, ((Schema) obj).metadata);
 }

 @Override
 public String toString() {
 return "Schema<" + Joiner.on(", ").join(fields) + ">";
 String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
 return "Schema<" + Joiner.on(", ").join(fields) + ">" + meta;
 }
}

17 changes: 12 additions & 5 deletions
java/vector/src/test/java/org/apache/arrow/vector/file/TestArrowFile.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand DownExpand Up@@ -386,7 +387,7 @@ private void validateTinyData(VectorSchemaRoot root) {
 }

 @Test
 public void testWriteReadFieldMetadata() throws IOException {
 public void testWriteReadMetadata() throws IOException {
 File file = new File("target/mytest_metadata.arrow");
 ByteArrayOutputStream stream = new ByteArrayOutputStream();

Expand All@@ -397,7 +398,11 @@ public void testWriteReadFieldMetadata() throws IOException {
 childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
 ImmutableList.of(new Field("l1", FieldType.nullable(new ArrowType.Int(16 ,true)), null))));
 Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
 List<Field> fields = ImmutableList.of(field);
 Map<String, String> metadata = new HashMap<>();
 metadata.put("s1", "v1");
 metadata.put("s2", "v2");
 Schema originalSchema = new Schema(ImmutableList.of(field), metadata);
 Assert.assertEquals(metadata, originalSchema.getCustomMetadata());

 // write
 try (BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
Expand All@@ -406,7 +411,7 @@ public void testWriteReadFieldMetadata() throws IOException {
 vector.getMutator().setValueCount(0);

 List<FieldVector> vectors = ImmutableList.<FieldVector>of(vector);
 VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 0);
 VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);

 try (FileOutputStream fileOutputStream = new FileOutputStream(file);
 ArrowFileWriter fileWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());
Expand All@@ -428,7 +433,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand All@@ -443,7 +449,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand Down

21 changes: 18 additions & 3 deletions
java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,12 @@
import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
import static org.junit.Assert.assertEquals;

import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.UnionMode;
Expand All@@ -36,9 +42,6 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

/**
 * Test conversion between Flatbuf and Pojo field representations
 */
Expand DownExpand Up@@ -69,6 +72,18 @@ public void schema() {
 run(initialSchema);
 }

 @Test
 public void schemaMetadata() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
 childrenBuilder.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
 childrenBuilder.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), ImmutableList.<Field>of()));
 Map<String, String> metadata = new HashMap<>();
 metadata.put("key1", "value1");
 metadata.put("key2", "value2");
 Schema initialSchema = new Schema(childrenBuilder.build(), metadata);
 run(initialSchema);
 }

 @Test
 public void nestedSchema() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
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-1015 [Java] Schema-level metadata#676

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

 Closed

elahrvivaz
wants to merge
2
commits into

from

 Closed


ARROW-1015 [Java] Schema-level metadata
#676
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
9ffdb5a

ARROW-1015 [Java] Schema-level metadata


elahrvivaz May 12, 2017
9e94e1a

Changing accessor to getCustomMetadata


elahrvivaz May 15, 2017

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


12 changes: 8 additions & 4 deletions
java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,15 @@ public VectorSchemaRoot(FieldVector parent) {
 }

 public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int rowCount) {
 if (fields.size() != fieldVectors.size()) {
 this(new Schema(fields), fieldVectors, rowCount);
 }

 public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
 if (schema.getFields().size() != fieldVectors.size()) {
 throw new IllegalArgumentException("Fields must match field vectors. Found " +
 fieldVectors.size() + " vectors and " + fields.size() + " fields");
 fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
 }
 this.schema = new Schema(fields);
 this.schema = schema;
 this.rowCount = rowCount;
 this.fieldVectors = fieldVectors;
 for (int i = 0; i < schema.getFields().size(); ++i) {
Expand All@@ -65,7 +69,7 @@ public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator)
 throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
 fieldVectors.size() + " expected " + schema.getFields().size());
 }
 return new VectorSchemaRoot(schema.getFields(), fieldVectors, 0);
 return new VectorSchemaRoot(schema, fieldVectors, 0);
 }

 public List<FieldVector> getFieldVectors() {
Expand Down

7 changes: 4 additions & 3 deletions
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,18 +150,19 @@ protected void ensureInitialized() throws IOException {
 * Reads the schema and initializes the vectors
 */
 private void initialize() throws IOException {
 Schema schema = readSchema(in);
 Schema originalSchema = readSchema(in);
 List<Field> fields = new ArrayList<>();
 List<FieldVector> vectors = new ArrayList<>();
 Map<Long, Dictionary> dictionaries = new HashMap<>();

 for (Field field: schema.getFields()) {
 for (Field field: originalSchema.getFields()) {
 Field updated = toMemoryFormat(field, dictionaries);
 fields.add(updated);
 vectors.add(updated.createVector(allocator));
 }
 Schema schema = new Schema(fields, originalSchema.getCustomMetadata());

 this.root = new VectorSchemaRoot(fields, vectors, 0);
 this.root = new VectorSchemaRoot(schema, vectors, 0);
 this.loader = new VectorLoader(root);
 this.dictionaries = Collections.unmodifiableMap(dictionaries);
 }
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
 fields.add(toMessageFormat(field, provider, dictionaryBatches));
 }

 this.schema = new Schema(fields);
 this.schema = new Schema(fields, root.getSchema().getCustomMetadata());
 this.dictionaries = Collections.unmodifiableList(new ArrayList<>(dictionaryBatches.values()));
 }

Expand Down

52 changes: 47 additions & 5 deletions
java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,19 +25,27 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.flatbuf.KeyValue;

/**
 * An Arrow Schema
 */
Expand DownExpand Up@@ -76,24 +84,43 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
 childrenBuilder.add(convertField(schema.fields(i)));
 }
 List<Field> fields = childrenBuilder.build();
 return new Schema(fields);
 ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
 for (int i = 0; i < schema.customMetadataLength(); i++) {
 KeyValue kv = schema.customMetadata(i);
 String key = kv.key(), value = kv.value();
 metadataBuilder.put(key == null ? "" : key, value == null ? "" : value);
 }
 Map<String, String> metadata = metadataBuilder.build();
 return new Schema(fields, metadata);
 }

 private final List<Field> fields;
 private final Map<String, String> metadata;

 public Schema(Iterable<Field> fields) {
 this(fields, null);
 }

 @JsonCreator
 public Schema(@JsonProperty("fields") Iterable<Field> fields) {
 public Schema(@JsonProperty("fields") Iterable<Field> fields,
 @JsonProperty("metadata") Map<String, String> metadata) {
 List<Field> fieldList = new ArrayList<>();
 for (Field field : fields) {
 fieldList.add(field);
 }
 this.fields = Collections.unmodifiableList(fieldList);
 this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
 }

 public List<Field> getFields() {
 return fields;
 }

 @JsonInclude(Include.NON_EMPTY)
 public Map<String, String> getCustomMetadata() {
 return metadata;
 }

 /**
 * @param name the name of the field to return
 * @return the corresponding field
Expand All@@ -117,27 +144,42 @@ public int getSchema(FlatBufferBuilder builder) {
 fieldOffsets[i] = fields.get(i).getField(builder);
 }
 int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
 int[] metadataOffsets = new int[metadata.size()];
 Iterator<Entry<String, String>> metadataIterator = metadata.entrySet().iterator();
 for (int i = 0; i < metadataOffsets.length; i ++) {
 Entry<String, String> kv = metadataIterator.next();
 int keyOffset = builder.createString(kv.getKey());
 int valueOffset = builder.createString(kv.getValue());
 KeyValue.startKeyValue(builder);
 KeyValue.addKey(builder, keyOffset);
 KeyValue.addValue(builder, valueOffset);
 metadataOffsets[i] = KeyValue.endKeyValue(builder);
 }
 int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
 org.apache.arrow.flatbuf.Schema.startSchema(builder);
 org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
 org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
 return org.apache.arrow.flatbuf.Schema.endSchema(builder);
 }


 @Override
 public int hashCode() {
 return Objects.hashCode(fields);
 return Objects.hash(fields, metadata);
 }

 @Override
 public boolean equals(Object obj) {
 if (!(obj instanceof Schema)) {
 return false;
 }
 return Objects.equals(this.fields, ((Schema) obj).fields);
 return Objects.equals(this.fields, ((Schema) obj).fields) &&
 Objects.equals(this.metadata, ((Schema) obj).metadata);
 }

 @Override
 public String toString() {
 return "Schema<" + Joiner.on(", ").join(fields) + ">";
 String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
 return "Schema<" + Joiner.on(", ").join(fields) + ">" + meta;
 }
}

17 changes: 12 additions & 5 deletions
java/vector/src/test/java/org/apache/arrow/vector/file/TestArrowFile.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand DownExpand Up@@ -386,7 +387,7 @@ private void validateTinyData(VectorSchemaRoot root) {
 }

 @Test
 public void testWriteReadFieldMetadata() throws IOException {
 public void testWriteReadMetadata() throws IOException {
 File file = new File("target/mytest_metadata.arrow");
 ByteArrayOutputStream stream = new ByteArrayOutputStream();

Expand All@@ -397,7 +398,11 @@ public void testWriteReadFieldMetadata() throws IOException {
 childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
 ImmutableList.of(new Field("l1", FieldType.nullable(new ArrowType.Int(16 ,true)), null))));
 Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
 List<Field> fields = ImmutableList.of(field);
 Map<String, String> metadata = new HashMap<>();
 metadata.put("s1", "v1");
 metadata.put("s2", "v2");
 Schema originalSchema = new Schema(ImmutableList.of(field), metadata);
 Assert.assertEquals(metadata, originalSchema.getCustomMetadata());

 // write
 try (BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
Expand All@@ -406,7 +411,7 @@ public void testWriteReadFieldMetadata() throws IOException {
 vector.getMutator().setValueCount(0);

 List<FieldVector> vectors = ImmutableList.<FieldVector>of(vector);
 VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 0);
 VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);

 try (FileOutputStream fileOutputStream = new FileOutputStream(file);
 ArrowFileWriter fileWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());
Expand All@@ -428,7 +433,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand All@@ -443,7 +449,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand Down

21 changes: 18 additions & 3 deletions
java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,12 @@
import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
import static org.junit.Assert.assertEquals;

import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.UnionMode;
Expand All@@ -36,9 +42,6 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

/**
 * Test conversion between Flatbuf and Pojo field representations
 */
Expand DownExpand Up@@ -69,6 +72,18 @@ public void schema() {
 run(initialSchema);
 }

 @Test
 public void schemaMetadata() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
 childrenBuilder.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
 childrenBuilder.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), ImmutableList.<Field>of()));
 Map<String, String> metadata = new HashMap<>();
 metadata.put("key1", "value1");
 metadata.put("key2", "value2");
 Schema initialSchema = new Schema(childrenBuilder.build(), metadata);
 run(initialSchema);
 }

 @Test
 public void nestedSchema() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
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-1015 [Java] Schema-level metadata#676

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

 Closed

elahrvivaz
wants to merge
2
commits into

from

 Closed


ARROW-1015 [Java] Schema-level metadata
#676
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
9ffdb5a

ARROW-1015 [Java] Schema-level metadata


elahrvivaz May 12, 2017
9e94e1a

Changing accessor to getCustomMetadata


elahrvivaz May 15, 2017

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


12 changes: 8 additions & 4 deletions
java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,15 @@ public VectorSchemaRoot(FieldVector parent) {
 }

 public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int rowCount) {
 if (fields.size() != fieldVectors.size()) {
 this(new Schema(fields), fieldVectors, rowCount);
 }

 public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
 if (schema.getFields().size() != fieldVectors.size()) {
 throw new IllegalArgumentException("Fields must match field vectors. Found " +
 fieldVectors.size() + " vectors and " + fields.size() + " fields");
 fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
 }
 this.schema = new Schema(fields);
 this.schema = schema;
 this.rowCount = rowCount;
 this.fieldVectors = fieldVectors;
 for (int i = 0; i < schema.getFields().size(); ++i) {
Expand All@@ -65,7 +69,7 @@ public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator)
 throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
 fieldVectors.size() + " expected " + schema.getFields().size());
 }
 return new VectorSchemaRoot(schema.getFields(), fieldVectors, 0);
 return new VectorSchemaRoot(schema, fieldVectors, 0);
 }

 public List<FieldVector> getFieldVectors() {
Expand Down

7 changes: 4 additions & 3 deletions
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowReader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,18 +150,19 @@ protected void ensureInitialized() throws IOException {
 * Reads the schema and initializes the vectors
 */
 private void initialize() throws IOException {
 Schema schema = readSchema(in);
 Schema originalSchema = readSchema(in);
 List<Field> fields = new ArrayList<>();
 List<FieldVector> vectors = new ArrayList<>();
 Map<Long, Dictionary> dictionaries = new HashMap<>();

 for (Field field: schema.getFields()) {
 for (Field field: originalSchema.getFields()) {
 Field updated = toMemoryFormat(field, dictionaries);
 fields.add(updated);
 vectors.add(updated.createVector(allocator));
 }
 Schema schema = new Schema(fields, originalSchema.getCustomMetadata());

 this.root = new VectorSchemaRoot(fields, vectors, 0);
 this.root = new VectorSchemaRoot(schema, vectors, 0);
 this.loader = new VectorLoader(root);
 this.dictionaries = Collections.unmodifiableMap(dictionaries);
 }
Expand Down

2 changes: 1 addition & 1 deletion
java/vector/src/main/java/org/apache/arrow/vector/file/ArrowWriter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
 fields.add(toMessageFormat(field, provider, dictionaryBatches));
 }

 this.schema = new Schema(fields);
 this.schema = new Schema(fields, root.getSchema().getCustomMetadata());
 this.dictionaries = Collections.unmodifiableList(new ArrayList<>(dictionaryBatches.values()));
 }

Expand Down

52 changes: 47 additions & 5 deletions
java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,19 +25,27 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.flatbuf.KeyValue;

/**
 * An Arrow Schema
 */
Expand DownExpand Up@@ -76,24 +84,43 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
 childrenBuilder.add(convertField(schema.fields(i)));
 }
 List<Field> fields = childrenBuilder.build();
 return new Schema(fields);
 ImmutableMap.Builder<String, String> metadataBuilder = ImmutableMap.builder();
 for (int i = 0; i < schema.customMetadataLength(); i++) {
 KeyValue kv = schema.customMetadata(i);
 String key = kv.key(), value = kv.value();
 metadataBuilder.put(key == null ? "" : key, value == null ? "" : value);
 }
 Map<String, String> metadata = metadataBuilder.build();
 return new Schema(fields, metadata);
 }

 private final List<Field> fields;
 private final Map<String, String> metadata;

 public Schema(Iterable<Field> fields) {
 this(fields, null);
 }

 @JsonCreator
 public Schema(@JsonProperty("fields") Iterable<Field> fields) {
 public Schema(@JsonProperty("fields") Iterable<Field> fields,
 @JsonProperty("metadata") Map<String, String> metadata) {
 List<Field> fieldList = new ArrayList<>();
 for (Field field : fields) {
 fieldList.add(field);
 }
 this.fields = Collections.unmodifiableList(fieldList);
 this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
 }

 public List<Field> getFields() {
 return fields;
 }

 @JsonInclude(Include.NON_EMPTY)
 public Map<String, String> getCustomMetadata() {
 return metadata;
 }

 /**
 * @param name the name of the field to return
 * @return the corresponding field
Expand All@@ -117,27 +144,42 @@ public int getSchema(FlatBufferBuilder builder) {
 fieldOffsets[i] = fields.get(i).getField(builder);
 }
 int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
 int[] metadataOffsets = new int[metadata.size()];
 Iterator<Entry<String, String>> metadataIterator = metadata.entrySet().iterator();
 for (int i = 0; i < metadataOffsets.length; i ++) {
 Entry<String, String> kv = metadataIterator.next();
 int keyOffset = builder.createString(kv.getKey());
 int valueOffset = builder.createString(kv.getValue());
 KeyValue.startKeyValue(builder);
 KeyValue.addKey(builder, keyOffset);
 KeyValue.addValue(builder, valueOffset);
 metadataOffsets[i] = KeyValue.endKeyValue(builder);
 }
 int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
 org.apache.arrow.flatbuf.Schema.startSchema(builder);
 org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
 org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
 return org.apache.arrow.flatbuf.Schema.endSchema(builder);
 }


 @Override
 public int hashCode() {
 return Objects.hashCode(fields);
 return Objects.hash(fields, metadata);
 }

 @Override
 public boolean equals(Object obj) {
 if (!(obj instanceof Schema)) {
 return false;
 }
 return Objects.equals(this.fields, ((Schema) obj).fields);
 return Objects.equals(this.fields, ((Schema) obj).fields) &&
 Objects.equals(this.metadata, ((Schema) obj).metadata);
 }

 @Override
 public String toString() {
 return "Schema<" + Joiner.on(", ").join(fields) + ">";
 String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
 return "Schema<" + Joiner.on(", ").join(fields) + ">" + meta;
 }
}

17 changes: 12 additions & 5 deletions
java/vector/src/test/java/org/apache/arrow/vector/file/TestArrowFile.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand DownExpand Up@@ -386,7 +387,7 @@ private void validateTinyData(VectorSchemaRoot root) {
 }

 @Test
 public void testWriteReadFieldMetadata() throws IOException {
 public void testWriteReadMetadata() throws IOException {
 File file = new File("target/mytest_metadata.arrow");
 ByteArrayOutputStream stream = new ByteArrayOutputStream();

Expand All@@ -397,7 +398,11 @@ public void testWriteReadFieldMetadata() throws IOException {
 childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
 ImmutableList.of(new Field("l1", FieldType.nullable(new ArrowType.Int(16 ,true)), null))));
 Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
 List<Field> fields = ImmutableList.of(field);
 Map<String, String> metadata = new HashMap<>();
 metadata.put("s1", "v1");
 metadata.put("s2", "v2");
 Schema originalSchema = new Schema(ImmutableList.of(field), metadata);
 Assert.assertEquals(metadata, originalSchema.getCustomMetadata());

 // write
 try (BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
Expand All@@ -406,7 +411,7 @@ public void testWriteReadFieldMetadata() throws IOException {
 vector.getMutator().setValueCount(0);

 List<FieldVector> vectors = ImmutableList.<FieldVector>of(vector);
 VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 0);
 VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);

 try (FileOutputStream fileOutputStream = new FileOutputStream(file);
 ArrowFileWriter fileWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());
Expand All@@ -428,7 +433,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand All@@ -443,7 +449,8 @@ public void testWriteReadFieldMetadata() throws IOException {
 VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
 Schema schema = root.getSchema();
 LOGGER.debug("reading schema: " + schema);
 Assert.assertEquals(fields, schema.getFields());
 Assert.assertEquals(originalSchema, schema);
 Assert.assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
 Field top = schema.getFields().get(0);
 Assert.assertEquals(metadata(0), top.getMetadata());
 for (int i = 0; i < 4; i ++) {
Expand Down

21 changes: 18 additions & 3 deletions
java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,12 @@
import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
import static org.junit.Assert.assertEquals;

import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.UnionMode;
Expand All@@ -36,9 +42,6 @@
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.Test;

import com.google.common.collect.ImmutableList;
import com.google.flatbuffers.FlatBufferBuilder;

/**
 * Test conversion between Flatbuf and Pojo field representations
 */
Expand DownExpand Up@@ -69,6 +72,18 @@ public void schema() {
 run(initialSchema);
 }

 @Test
 public void schemaMetadata() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
 childrenBuilder.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
 childrenBuilder.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), ImmutableList.<Field>of()));
 Map<String, String> metadata = new HashMap<>();
 metadata.put("key1", "value1");
 metadata.put("key2", "value2");
 Schema initialSchema = new Schema(childrenBuilder.build(), metadata);
 run(initialSchema);
 }

 @Test
 public void nestedSchema() {
 ImmutableList.Builder<Field> childrenBuilder = ImmutableList.builder();
Expand Down