Merge pull request #3211 from grandinj/Large-JSON-and-GEOMETRY-object…

…s-#3016 Large JSON and GEOMETRY objects #3016
h2database · Nov 25, 2021 · 7381627 · 7381627
2 parents 4c56d7c + 401e84d
commit 7381627
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 12 deletions.
diff --git a/h2/src/main/org/h2/value/DataType.java b/h2/src/main/org/h2/value/DataType.java
@@ -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;
     }
 

diff --git a/h2/src/main/org/h2/value/ValueBinary.java b/h2/src/main/org/h2/value/ValueBinary.java
@@ -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;
 
 /**
@@ -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);
+        }
     }
 
     /**

diff --git a/h2/src/main/org/h2/value/ValueBytesBase.java b/h2/src/main/org/h2/value/ValueBytesBase.java
@@ -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;
     }
 

diff --git a/h2/src/main/org/h2/value/ValueJavaObject.java b/h2/src/main/org/h2/value/ValueJavaObject.java
@@ -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;
 
 /**
@@ -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);
+        }
     }
 
     /**

diff --git a/h2/src/main/org/h2/value/ValueJson.java b/h2/src/main/org/h2/value/ValueJson.java
@@ -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;
@@ -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

diff --git a/h2/src/main/org/h2/value/ValueVarbinary.java b/h2/src/main/org/h2/value/ValueVarbinary.java
@@ -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;
 
 /**
@@ -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);
+        }
     }
 
     /**

diff --git a/h2/src/test/org/h2/test/jdbc/TestMetaData.java b/h2/src/test/org/h2/test/jdbc/TestMetaData.java
@@ -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);
@@ -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));