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

feat(Spanner): float 32 support #7080

Merged
merged 11 commits into from
Mar 28, 2024
Merged

feat(Spanner): float 32 support #7080

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8cd361c
feat(Spanner): float 32 support
vishwarajanand Feb 21, 2024
5807016
Merge branch 'main' into float32_spanner
vishwarajanand Feb 21, 2024
86c3b08
fix: style and bc compat
vishwarajanand Mar 5, 2024
c0d12fc
fix: skip tests on emulator
vishwarajanand Mar 5, 2024
e9c579f
Merge branch 'main' into float32_spanner
vishwarajanand Mar 5, 2024
a19453b
Merge branch 'googleapis:main' into float32_spanner
vishwarajanand Mar 13, 2024
c260a86
fix(Spanner): address pr comments
vishwarajanand Mar 13, 2024
c13c09b
fix(Spanner): skip float32 tests for emulator
vishwarajanand Mar 13, 2024
3f003d4
Merge branch 'main' into float32_spanner
vishwarajanand Mar 26, 2024
d0ea9ed
fix: added internal for ValueMapper allowed types array
vishwarajanand Mar 26, 2024
c315245
Merge branch 'main' into float32_spanner
vishwarajanand Mar 28, 2024
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
1 change: 1 addition & 0 deletions Spanner/src/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class Database

const TYPE_BOOL = TypeCode::BOOL;
const TYPE_INT64 = TypeCode::INT64;
const TYPE_FLOAT32 = TypeCode::FLOAT32;
const TYPE_FLOAT64 = TypeCode::FLOAT64;
const TYPE_TIMESTAMP = TypeCode::TIMESTAMP;
const TYPE_DATE = TypeCode::DATE;
Expand Down
8 changes: 6 additions & 2 deletions Spanner/src/ValueMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

const TYPE_BOOL = TypeCode::BOOL;
const TYPE_INT64 = TypeCode::INT64;
const TYPE_FLOAT32 = TypeCode::FLOAT32;
const TYPE_FLOAT64 = TypeCode::FLOAT64;
const TYPE_TIMESTAMP = TypeCode::TIMESTAMP;
const TYPE_DATE = TypeCode::DATE;
Expand All @@ -48,7 +49,7 @@
/**
* @var array
*/
public static $allowedTypes = [

Check failure on line 52 in Spanner/src/ValueMapper.php

View workflow job for this annotation

GitHub Actions / backwards-compatibility-check 

Property Google\Cloud\Spanner\ValueMapper::$allowedTypes changed default value from array (
  0 => 1,
  1 => 2,
  2 => 3,
  3 => 4,
  4 => 5,
  5 => 6,
  6 => 7,
  7 => 8,
  8 => 9,
  9 => 10,
  10 => 11,
  11 => 'pgNumeric',
  12 => 'pgJsonb',
) to array (
  0 => 1,
  1 => 2,
  2 => 3,
  3 => 4,
  4 => 5,
  5 => 6,
  6 => 7,
  7 => 8,
  8 => 9,
  9 => 10,
  10 => 11,
  11 => 'pgNumeric',
  12 => 'pgJsonb',
  13 => 15,
)
self::TYPE_BOOL,
self::TYPE_INT64,
self::TYPE_FLOAT64,
Expand All @@ -62,6 +63,7 @@
self::TYPE_JSON,
self::TYPE_PG_NUMERIC,
self::TYPE_PG_JSONB,
self::TYPE_FLOAT32,
vishwarajanand marked this conversation as resolved.
Show resolved Hide resolved
];

/*
Expand Down Expand Up @@ -324,6 +326,7 @@
}
break;

case self::TYPE_FLOAT32:
vishwarajanand marked this conversation as resolved.
Show resolved Hide resolved
vishwarajanand marked this conversation as resolved.
Show resolved Hide resolved
case self::TYPE_FLOAT64:
// NaN, Infinite and -Infinite are possible FLOAT64 values,
// but when the gRPC response is decoded, they are represented
Expand All @@ -346,8 +349,9 @@

default:
throw new \RuntimeException(sprintf(
'Unexpected string value %s encountered in FLOAT64 field.',
$value
'Unexpected string value %s encountered in %s field.',
$value,
TypeCode::name($type['code'])
));
}
}
Expand Down
47 changes: 38 additions & 9 deletions Spanner/tests/System/PgQueryTest.php
View file
Open in desktop
vishwarajanand marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public static function setUpBeforeClass(): void
created_at timestamptz,
dt date,
data jsonb,
weight float4,
PRIMARY KEY (id)
)'
)->pollUntilComplete();
Expand All @@ -71,7 +72,8 @@ public static function setUpBeforeClass(): void
'bytes_col' => new Bytes('hello'),
'created_at' => self::$timestampVal,
'data' => '{"a": "hello", "b": "world"}',
'dt' => '2020-01-01'
'dt' => '2020-01-01',
'weight' => 1.432
],
[
'id' => 2,
Expand All @@ -81,7 +83,8 @@ public static function setUpBeforeClass(): void
'age' => 26,
'created_at' => self::$timestampVal,
'data' => '{}',
'dt' => '2021-01-01'
'dt' => '2021-01-01',
'weight' => 1.234
]
]);
}
Expand Down Expand Up @@ -200,32 +203,56 @@ public function testBindFloat64Parameter()
$this->assertCount(2, iterator_to_array($res));
}

public function testBindFloat64ParameterNull()
public function testBindFloat32Parameter()
{
$db = self::$database;

$res = $db->execute('SELECT * FROM ' . self::TABLE_NAME . ' WHERE weight = $1', [
'parameters' => [
'p1' => 1.234
ajupazhamayil marked this conversation as resolved.
Show resolved Hide resolved
],
'types' => [
'p1' => Database::TYPE_FLOAT32
]
]);

$this->assertCount(1, iterator_to_array($res));
}

public function testBindFloatParameterNull()
{
$res = self::$database->execute('SELECT * FROM ' . self::TABLE_NAME . ' WHERE rating IS NULL');
$currentFloat64NullCount = count(iterator_to_array($res));
$res = self::$database->execute('SELECT * FROM ' . self::TABLE_NAME . ' WHERE weight IS NULL');
$currentFloat32NullCount = count(iterator_to_array($res));
// insert a value with a float param binded to null
self::$database->runTransaction(function (Transaction $t) {
$t->executeUpdate(
'INSERT INTO ' . self::TABLE_NAME . '(id, name, registered, rating, age) '
. 'VALUES($1, $2, $3, $4, $5)',
'INSERT INTO ' . self::TABLE_NAME . '(id, name, registered, rating, age, weight) '
. 'VALUES($1, $2, $3, $4, $5, $6)',
[
'parameters' => [
'p1' => 5,
'p2' => 'Vince',
'p3' => true,
'p4' => null,
'p5' => 26
'p5' => 26,
'p6' => null
],
'types' => [
'p4' => Database::TYPE_FLOAT64
'p4' => Database::TYPE_FLOAT64,
'p6' => Database::TYPE_FLOAT32
]
]
);
$t->commit();
});

$res = self::$database->execute('SELECT * FROM ' . self::TABLE_NAME . ' WHERE rating IS NULL');
$resFloat64NullCount = self::$database->execute('SELECT * FROM ' . self::TABLE_NAME . ' WHERE rating IS NULL');
$resFloat32NullCount = self::$database->execute('SELECT * FROM ' . self::TABLE_NAME . ' WHERE weight IS NULL');

$this->assertCount(1, iterator_to_array($res));
$this->assertCount(1 + $currentFloat64NullCount, iterator_to_array($resFloat64NullCount));
$this->assertCount(1 + $currentFloat32NullCount, iterator_to_array($resFloat32NullCount));
}

public function testBindStringParameter()
Expand Down Expand Up @@ -650,6 +677,7 @@ public function arrayTypesEmptyProvider()
return [
[Database::TYPE_BOOL],
[Database::TYPE_INT64],
[Database::TYPE_FLOAT32],
[Database::TYPE_FLOAT64],
[Database::TYPE_STRING],
[Database::TYPE_BYTES],
Expand Down Expand Up @@ -686,6 +714,7 @@ public function arrayTypesNullProvider()
return [
[Database::TYPE_BOOL],
[Database::TYPE_INT64],
[Database::TYPE_FLOAT32],
[Database::TYPE_FLOAT64],
[Database::TYPE_STRING],
[Database::TYPE_BYTES],
Expand Down
31 changes: 27 additions & 4 deletions Spanner/tests/System/PgWriteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public static function setUpBeforeClass(): void
bytesfield bytea,
datefield date,
floatfield float,
float4field float4,
ajupazhamayil marked this conversation as resolved.
Show resolved Hide resolved
intfield bigint,
stringfield varchar(1024),
timestampfield timestamptz,
Expand All @@ -61,6 +62,7 @@ public static function setUpBeforeClass(): void
arrayfield bigint[],
arrayboolfield boolean[],
arrayfloatfield float[],
arrayfloat4field float4[],
vishwarajanand marked this conversation as resolved.
Show resolved Hide resolved
arraystringfield varchar(1024)[],
arraybytesfield bytea[],
arraytimestampfield timestamptz[],
Expand All @@ -85,6 +87,9 @@ public function fieldValueProvider()
[$this->randId(), 'floatfield', 3.1415],
[$this->randId(), 'floatfield', INF],
[$this->randId(), 'floatfield', -INF],
[$this->randId(), 'float4field', 3.1415],
[$this->randId(), 'float4field', INF],
[$this->randId(), 'float4field', -INF],
ajupazhamayil marked this conversation as resolved.
Show resolved Hide resolved
[$this->randId(), 'datefield', new Date(new \DateTime('1981-01-20'))],
[$this->randId(), 'intfield', 787878787],
[$this->randId(), 'stringfield', 'foo bar'],
Expand Down Expand Up @@ -115,7 +120,7 @@ public function testWriteAndReadBackValue($id, $field, $value)
if ($value instanceof Timestamp) {
$this->assertEquals($value->formatAsString(), $row[$field]->formatAsString());
} else {
$this->assertEquals($value, $row[$field]);
$this->assertValues($value, $row[$field]);
}

// test result from executeSql
Expand All @@ -129,7 +134,7 @@ public function testWriteAndReadBackValue($id, $field, $value)
if ($value instanceof Timestamp) {
$this->assertEquals($value->formatAsString(), $row[$field]->formatAsString());
} else {
$this->assertEquals($value, $row[$field]);
$this->assertValues($value, $row[$field]);
}
}

Expand Down Expand Up @@ -242,6 +247,10 @@ public function arrayFieldValueProvider()
[$this->randId(), 'arrayfloatfield', []],
[$this->randId(), 'arrayfloatfield', [1.1, null, 1.3]],
[$this->randId(), 'arrayfloatfield', null],
[$this->randId(), 'arrayfloat4field', [1.1, 1.2, 1.3]],
[$this->randId(), 'arrayfloat4field', []],
[$this->randId(), 'arrayfloat4field', [1.1, null, 1.3]],
[$this->randId(), 'arrayfloat4field', null],
[$this->randId(), 'arraystringfield', ['foo','bar','baz']],
[$this->randId(), 'arraystringfield', []],
[$this->randId(), 'arraystringfield', ['foo',null,'baz']],
Expand Down Expand Up @@ -276,7 +285,7 @@ public function testWriteAndReadBackArrayValue($id, $field, $value)
$read = $db->read(self::TABLE_NAME, $keyset, [$field]);
$row = $read->rows()->current();

$this->assertEquals($value, $row[$field]);
$this->assertValues($value, $row[$field]);

// test result from executeSql
$exec = $db->execute(sprintf('SELECT %s FROM %s WHERE id = $1', $field, self::TABLE_NAME), [
Expand All @@ -290,7 +299,7 @@ public function testWriteAndReadBackArrayValue($id, $field, $value)
if ($value instanceof Bytes) {
$this->assertEquals($value->formatAsString(), $row[$field]->formatAsString());
} else {
$this->assertEquals($value, $row[$field]);
$this->assertValues($value, $row[$field]);
}
}

Expand Down Expand Up @@ -1107,4 +1116,18 @@ public function testExecuteUpdateBatchMultipleErrors()
$this->assertEquals(Code::INVALID_ARGUMENT, $res->error()['status']['code']);
$this->assertEquals($statements[2], $res->error()['statement']);
}

private function assertValues($expected, $actual, $delta = 0.000001)
{
if (is_float($expected)) {
$this->assertEqualsWithDelta($expected, $actual, $delta);
vishwarajanand marked this conversation as resolved.
Show resolved Hide resolved
} elseif (is_array($expected)) {
$this->assertCount(count($expected), $actual);
foreach ($expected as $key => $value) {
$this->assertValues($value, $actual[$key]);
}
} else {
$this->assertEquals($expected, $actual);
}
}
}
Loading
Loading