Skip to content

Commit

Permalink
fix: adding test case for chunked struct with a null array
Browse files Browse the repository at this point in the history
  • Loading branch information
@asthamohta
asthamohta committed Jan 18, 2022
1 parent f699984 commit 1be1b70
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 65 deletions.
9 changes: 5 additions & 4 deletions test/data/streaming-read-acceptance-test.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,24 +337,25 @@
"result": {
"value": [
[
[
[
[
[
"ab"
"abc"
],
null,
null,
[
"def"
]
]
]
]
]
]
},
"chunks": [
"{\n \"metadata\": {\n \"rowType\": {\n \"fields\": [{\n \"name\": \"f1\",\n \"type\": {\n \"code\": \"ARRAY\",\n \"arrayElementType\": {\n \"code\": \"STRUCT\",\n \"structType\": {\n \"fields\": [{\n \"name\": \"f11\",\n \"type\": {\n \"code\": \"ARRAY\",\n \"arrayElementType\": {\n \"code\": \"STRING\"\n }\n }\n }]\n }\n }\n }\n }]\n }\n },\n \"values\": [[[[\"ab\"], null]]],\n \"chunkedValue\": true\n}",
"{\n \"values\": [[[null,[\"def\"]]]]\n}"
"{\n \"metadata\": {\n \"rowType\": {\n \"fields\": [{\n \"name\": \"f1\",\n \"type\": {\n \"code\": \"ARRAY\",\n \"arrayElementType\": {\n \"code\": \"STRUCT\",\n \"structType\": {\n \"fields\": [{\n \"name\": \"f11\",\n \"type\": {\n \"code\": \"ARRAY\",\n \"arrayElementType\": {\n \"code\": \"STRUCT\",\n \"structType\": {\n \"fields\": [{\n \"name\": \"f12\",\n \"type\": {\n \"code\": \"STRING\"\n }\n }]\n }\n }\n }\n }]\n }\n }\n }\n }]\n }\n },\n \"values\": [[[[[\"abc\"], null]]]],\n \"chunkedValue\": true\n}",
"{\n \"values\": [[[[[\"def\"]]]]]\n}"
],
"name": "Nested Struct Array Chunking Test With null"
}
Expand Down
96 changes: 35 additions & 61 deletions test/spanner.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ import {types} from '../src/session';
import {ExecuteSqlRequest, RunResponse} from '../src/transaction';
import {Row} from '../src/partial-result-stream';
import {GetDatabaseOperationsOptions} from '../src/instance';
import TypeCode = google.spanner.v1.TypeCode;
import NullValue = google.protobuf.NullValue;
import Struct = google.protobuf.Struct;
import {
isSessionNotFoundError,
SessionLeakError,
Expand All @@ -57,6 +54,8 @@ import RequestOptions = google.spanner.v1.RequestOptions;
import PartialResultSet = google.spanner.v1.PartialResultSet;
import protobuf = google.spanner.v1;
import Priority = google.spanner.v1.RequestOptions.Priority;
import TypeCode = google.spanner.v1.TypeCode;
import NullValue = google.protobuf.NullValue;

function numberToEnglishWord(num: number): string {
switch (num) {
Expand Down Expand Up @@ -3392,7 +3391,7 @@ describe('Spanner with mock server', () => {
}
});

it('should return all values from PartialResultSet with chunked array of struct', async () => {
it('should return all values from PartialResultSet with chunked struct with a null array field', async () => {
const sql = 'SELECT * FROM TestTable';
const prs1 = PartialResultSet.create({
metadata: createArrayOfStructMetadata(),
Expand All @@ -3401,62 +3400,29 @@ describe('Spanner with mock server', () => {
listValue: {
values: [
{
structValue: Struct.create({
fields: {
innerArray: {
listValue: {
values: [{stringValue: 'One'}],
},
},
},
}),
},
],
},
},
],
});
const prs2 = PartialResultSet.create({
resumeToken: Buffer.from('00000001'),
values: [
{
listValue: {
values: [
{
structValue: Struct.create({
fields: {
innerArray: {
listValue: {
values: [
{nullValue: NullValue.NULL_VALUE},
{stringValue: 'Two'},
],
},
},
},
}),
listValue: {
values: [
// The array field is NULL.
{nullValue: NullValue.NULL_VALUE},
],
},
},
],
},
},
],
// This PartialResultSet is chunked, and the last value was the NULL value for the ARRAY field.
// This means that the next value will be the STRING field.
chunkedValue: true,
});
const prs3 = PartialResultSet.create({
resumeToken: Buffer.from('00000002'),
const prs2 = PartialResultSet.create({
values: [
{
listValue: {
values: [
{
structValue: {
fields: {
innerArray: {
listValue: {
values: [{stringValue: 'Three'}],
},
},
},
listValue: {
values: [{stringValue: 'First row'}],
},
},
],
Expand All @@ -3466,32 +3432,36 @@ describe('Spanner with mock server', () => {
listValue: {
values: [
{
structValue: {
fields: {
innerArray: {
listValue: {
values: [
{stringValue: 'Four'},
{stringValue: 'Five'},
],
},
},
},
listValue: {
values: [
{listValue: {values: [{stringValue: '1'}]}},
{stringValue: 'Second row'},
],
},
},
],
},
},
],
});
setupResultsAndErrors(sql, [prs1, prs2, prs3], []);
setupResultsAndErrors(sql, [prs1, prs2], []);
const database = newTestDatabase();
try {
const [rows] = (await database.run({
sql,
json: true,
})) as Json[];
assert.strictEqual(rows.length, 3);
assert.strictEqual(rows.length, 2);
assert.strictEqual(rows[0].outerArray.length, 1);
assert.strictEqual(rows[0].outerArray[0].innerField, 'First row');
assert.ok(
rows[0].outerArray[0].innerArray === null,
'Inner array should be null'
);
assert.strictEqual(rows[1].outerArray.length, 1);
assert.strictEqual(rows[1].outerArray[0].innerField, 'Second row');
assert.strictEqual(rows[1].outerArray[0].innerArray.length, 1);
assert.strictEqual(rows[1].outerArray[0].innerArray[0], '1');
} finally {
await database.close();
}
Expand All @@ -3516,6 +3486,10 @@ describe('Spanner with mock server', () => {
}),
}),
},
{
name: 'innerField',
type: protobuf.Type.create({code: TypeCode.STRING}),
},
],
}),
}),
Expand Down

0 comments on commit 1be1b70

Please sign in to comment.