Skip to content
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.

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

support float type in data frame #129

Merged
merged 1 commit into from
Jan 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public enum ColumnType {
INTEGER,
DOUBLE,
BOOLEAN,
FLOAT,
NULL;

public static ColumnType from(Object object) {
Expand All @@ -36,6 +37,10 @@ public static ColumnType from(Object object) {
return BOOLEAN;
}

if(object instanceof Float) {
return FLOAT;
}

throw new IllegalArgumentException("unsupported type:" + object.getClass().getName());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ default double doubleValue() {
throw new RuntimeException("the value isn't Double type");
}

default float floatValue() {
throw new RuntimeException("the value isn't Float type");
}

default boolean booleanValue() {
throw new RuntimeException("the value isn't Boolean type");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ public ColumnValue build(Object object) {
return new BooleanValue((Boolean)object);
}

if(object instanceof Float) {
return new FloatValue((Float)object);
}

throw new IllegalArgumentException("unsupported type:" + object.getClass().getName());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public ColumnValue read(StreamInput in) throws IOException {
return new StringValue(in.readString());
case BOOLEAN:
return new BooleanValue(in.readBoolean());
case FLOAT:
return new FloatValue(in.readFloat());
case NULL:
return new NullValue();
default:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*
* Modifications Copyright OpenSearch Contributors. See
* GitHub history for details.
*
*/

package org.opensearch.ml.common.dataframe;

import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.ToString;
import lombok.experimental.FieldDefaults;
import org.opensearch.common.io.stream.StreamOutput;

import java.io.IOException;

@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
@RequiredArgsConstructor
@ToString
public class FloatValue implements ColumnValue {
float value;

@Override
public ColumnType columnType() {
return ColumnType.FLOAT;
}

@Override
public Object getValue() {
return value;
}

@Override
public double doubleValue() {
return Float.valueOf(value).doubleValue();
}

@Override
public float floatValue() {
return value;
}

@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeEnum(columnType());
out.writeFloat(value);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ public void build() {
value = ColumnValueBuilder.build(true);
assertEquals(ColumnType.BOOLEAN, value.columnType());
assertEquals(true, value.booleanValue());

value = ColumnValueBuilder.build(2.1f);
assertEquals(ColumnType.FLOAT, value.columnType());
assertEquals(2.1f, value.floatValue(), 1e-5);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,14 @@ public void read_BooleanValue() throws IOException {
assertEquals(ColumnType.BOOLEAN, value.columnType());
assertEquals(true, value.booleanValue());
}

@Test
public void read_FloatValue() throws IOException {
ColumnValue value = new FloatValue(2.1f);
BytesStreamOutput bytesStreamOutput = new BytesStreamOutput();
value.writeTo(bytesStreamOutput);
value = reader.read(bytesStreamOutput.bytes().streamInput());
assertEquals(ColumnType.FLOAT, value.columnType());
assertEquals(2.1f, value.floatValue(), 1e-5);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,12 @@ public void wrongDoubleValue() {
ColumnValue value = new IntValue(1);
value.doubleValue();
}

@Test
public void wrongFloatValue() {
exceptionRule.expect(RuntimeException.class);
exceptionRule.expectMessage("the value isn't Float type");
ColumnValue value = new IntValue(1);
value.floatValue();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*
* Modifications Copyright OpenSearch Contributors. See
* GitHub history for details.
*
*/

package org.opensearch.ml.common.dataframe;

import org.junit.Test;
import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;

import java.io.IOException;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

public class FloatValueTest {

@Test
public void floatValue() {
FloatValue floatValue = new FloatValue(2.1f);
assertEquals(ColumnType.FLOAT, floatValue.columnType());
assertEquals(2.1f, floatValue.getValue());
assertEquals(2.1f, floatValue.floatValue(), 1e-5);
assertEquals(2.1d, floatValue.doubleValue(), 1e-5);
}

@Test
public void testToXContent() throws IOException {
FloatValue floatValue = new FloatValue(2.1f);
XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
floatValue.toXContent(builder);

assertNotNull(builder);
String jsonStr = Strings.toString(builder);
assertEquals("{\"column_type\":\"FLOAT\",\"value\":2.1}", jsonStr);
}
}