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.

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

Jump to bottom

Large JSON and GEOMETRY objects #3016 #3211

Merged
merged 2 commits into from Nov 25, 2021
Merged

Large JSON and GEOMETRY objects #3016 #3211

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
0bed95c
Large JSON and GEOMETRY objects #3016
grandinj Nov 25, 2021
401e84d
fix test
grandinj Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions h2/src/main/org/h2/value/DataType.java
View file
Open in desktop
Expand Up @@ -312,8 +312,8 @@ private static DataType createGeometry() {
dataType.prefix = "'";
dataType.suffix = "'";
dataType.params = "TYPE,SRID";
dataType.maxPrecision = Constants.MAX_STRING_LENGTH;
dataType.defaultPrecision = Constants.MAX_STRING_LENGTH;
dataType.maxPrecision = Long.MAX_VALUE;
dataType.defaultPrecision = Long.MAX_VALUE;
return dataType;
}

Expand Down
9 changes: 8 additions & 1 deletion h2/src/main/org/h2/value/ValueBinary.java
View file
Open in desktop
Expand Up @@ -6,8 +6,10 @@
package org.h2.value;

import java.nio.charset.StandardCharsets;

import org.h2.engine.Constants;
import org.h2.engine.SysProperties;
import org.h2.message.DbException;
import org.h2.util.StringUtils;
import org.h2.util.Utils;

/**
Expand All @@ -22,6 +24,11 @@ public final class ValueBinary extends ValueBytesBase {

protected ValueBinary(byte[] value) {
super(value);
int length = value.length;
if (length > Constants.MAX_STRING_LENGTH) {
throw DbException.getValueTooLongException(getTypeName(getValueType()),
StringUtils.convertBytesToHex(value, 41), length);
}
}

/**
Expand Down
5 changes: 0 additions & 5 deletions h2/src/main/org/h2/value/ValueBytesBase.java
View file
Open in desktop
Expand Up @@ -30,11 +30,6 @@ abstract class ValueBytesBase extends Value {
int hash;

ValueBytesBase(byte[] value) {
int length = value.length;
if (length > Constants.MAX_STRING_LENGTH) {
throw DbException.getValueTooLongException(getTypeName(getValueType()),
StringUtils.convertBytesToHex(value, 41), length);
}
this.value = value;
}

Expand Down
7 changes: 7 additions & 0 deletions h2/src/main/org/h2/value/ValueJavaObject.java
View file
Open in desktop
Expand Up @@ -6,8 +6,10 @@
package org.h2.value;

import org.h2.api.ErrorCode;
import org.h2.engine.Constants;
import org.h2.engine.SysProperties;
import org.h2.message.DbException;
import org.h2.util.StringUtils;
import org.h2.util.Utils;

/**
Expand All @@ -19,6 +21,11 @@ public final class ValueJavaObject extends ValueBytesBase {

protected ValueJavaObject(byte[] v) {
super(v);
int length = value.length;
if (length > Constants.MAX_STRING_LENGTH) {
throw DbException.getValueTooLongException(getTypeName(getValueType()),
StringUtils.convertBytesToHex(value, 41), length);
}
}

/**
Expand Down
6 changes: 6 additions & 0 deletions h2/src/main/org/h2/value/ValueJson.java
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
import java.util.Arrays;

import org.h2.api.ErrorCode;
import org.h2.engine.Constants;
import org.h2.message.DbException;
import org.h2.util.StringUtils;
import org.h2.util.json.JSONByteArrayTarget;
Expand Down Expand Up @@ -50,6 +51,11 @@ public final class ValueJson extends ValueBytesBase {

private ValueJson(byte[] value) {
super(value);
int length = value.length;
if (length > Constants.MAX_STRING_LENGTH) {
throw DbException.getValueTooLongException(getTypeName(getValueType()),
StringUtils.convertBytesToHex(value, 41), length);
}
}

@Override
Expand Down
9 changes: 8 additions & 1 deletion h2/src/main/org/h2/value/ValueVarbinary.java
View file
Open in desktop
Expand Up @@ -6,8 +6,10 @@
package org.h2.value;

import java.nio.charset.StandardCharsets;

import org.h2.engine.Constants;
import org.h2.engine.SysProperties;
import org.h2.message.DbException;
import org.h2.util.StringUtils;
import org.h2.util.Utils;

/**
Expand All @@ -27,6 +29,11 @@ public final class ValueVarbinary extends ValueBytesBase {

protected ValueVarbinary(byte[] value) {
super(value);
int length = value.length;
if (length > Constants.MAX_STRING_LENGTH) {
throw DbException.getValueTooLongException(getTypeName(getValueType()),
StringUtils.convertBytesToHex(value, 41), length);
}
}

/**
Expand Down
6 changes: 3 additions & 3 deletions h2/src/test/org/h2/test/jdbc/TestMetaData.java
View file
Open in desktop
Expand Up @@ -357,7 +357,7 @@ private void testTypeInfo() throws SQLException {
"PRECISION,SCALE", false, false, (short) 0, (short) 9, 0);
testTypeInfo(rs, "ENUM", Types.OTHER, MAX_STRING_LENGTH, "'", "'", "ELEMENT [,...]", false, false, (short) 0,
(short) 0, 0);
testTypeInfo(rs, "GEOMETRY", Types.OTHER, MAX_STRING_LENGTH, "'", "'", "TYPE,SRID", false, false, (short) 0,
testTypeInfo(rs, "GEOMETRY", Types.OTHER, Integer.MAX_VALUE, "'", "'", "TYPE,SRID", false, false, (short) 0,
(short) 0, 0);
testTypeInfo(rs, "JSON", Types.OTHER, MAX_STRING_LENGTH, "JSON '", "'", "LENGTH", true, false, (short) 0,
(short) 0, 0);
Expand All @@ -379,13 +379,13 @@ private void testTypeInfo() throws SQLException {
conn.close();
}

private void testTypeInfo(ResultSet rs, String name, int type, int precision, String prefix, String suffix,
private void testTypeInfo(ResultSet rs, String name, int type, long precision, String prefix, String suffix,
String params, boolean caseSensitive, boolean fixed, short minScale, short maxScale, int radix)
throws SQLException {
assertTrue(rs.next());
assertEquals(name, rs.getString(1));
assertEquals(type, rs.getInt(2));
assertEquals(precision, rs.getInt(3));
assertEquals(precision, rs.getLong(3));
assertEquals(prefix, rs.getString(4));
assertEquals(suffix, rs.getString(5));
assertEquals(params, rs.getString(6));
Expand Down