Skip to content

Updated the version of spanner library #334

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

Merged
ace-n merged 7 commits into from
Apr 17, 2017
Merged

Updated the version of spanner library #334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bbad15
Updated the version of spanner library and changed the samples to wor…
vkedia Apr 4, 2017
43d28a4
Fixed some lint errors
vkedia Apr 4, 2017
026b2cb
Converted callbacks to promises wherever possible
vkedia Apr 4, 2017
b93f54c
Merge branch 'master' into txn-retry
vkedia Apr 4, 2017
cbf5f43
Fixed error handling
vkedia Apr 5, 2017
b698735
Used arrow functions
vkedia Apr 5, 2017
9541f13
Merge branch 'master' into txn-retry
vkedia Apr 17, 2017
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
25 changes: 12 additions & 13 deletions spanner/crud.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,17 @@ function insertData (instanceId, databaseId) {
const singersTable = database.table('Singers');
const albumsTable = database.table('Albums');

Promise.all([
// Inserts rows into the Singers table
// Note: Cloud Spanner interprets Node.js numbers as FLOAT64s, so
// they must be converted to strings before being inserted as INT64s
singersTable.insert([
{ SingerId: '1', FirstName: 'Marc', LastName: 'Richards' },
{ SingerId: '2', FirstName: 'Catalina', LastName: 'Smith' },
{ SingerId: '3', FirstName: 'Alice', LastName: 'Trentor' },
{ SingerId: '4', FirstName: 'Lea', LastName: 'Martin' },
{ SingerId: '5', FirstName: 'David', LastName: 'Lomond' }
]),

// Inserts rows into the Singers table
// Note: Cloud Spanner interprets Node.js numbers as FLOAT64s, so
// they must be converted to strings before being inserted as INT64s
singersTable.insert([
{ SingerId: '1', FirstName: 'Marc', LastName: 'Richards' },
{ SingerId: '2', FirstName: 'Catalina', LastName: 'Smith' },
{ SingerId: '3', FirstName: 'Alice', LastName: 'Trentor' },
{ SingerId: '4', FirstName: 'Lea', LastName: 'Martin' },
{ SingerId: '5', FirstName: 'David', LastName: 'Lomond' }
])
.then(() => {
// Inserts rows into the Albums table
albumsTable.insert([
{ SingerId: '1', AlbumId: '1', AlbumTitle: 'Go, Go, Go' },
Expand All @@ -86,7 +85,7 @@ function insertData (instanceId, databaseId) {
{ SingerId: '2', AlbumId: '2', AlbumTitle: 'Forever Hold your Peace' },
{ SingerId: '2', AlbumId: '3', AlbumTitle: 'Terrified' }
])
])
})
.then(() => {
console.log('Inserted data.');
});
Expand Down
2 changes: 1 addition & 1 deletion spanner/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": "cd ..; npm run st -- --verbose spanner/system-test/*.test.js"
},
"dependencies": {
"@google-cloud/spanner": "0.1.0",
"@google-cloud/spanner": "0.3.0",
"yargs": "6.6.0"
},
"engines": {
Expand Down
146 changes: 66 additions & 80 deletions spanner/transaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,46 +33,37 @@ function readOnlyTransaction (instanceId, databaseId) {

// Gets a transaction object that captures the database state
// at a specific point in time
database.runTransaction({readOnly: true})
.then((results) => {
const transaction = results[0];
database.runTransaction({readOnly: true}, function(err, transaction) {

const queryOne = 'SELECT SingerId, AlbumId, AlbumTitle FROM Albums';

// Read #1, using SQL
transaction.run(queryOne)
.then((results) => {
const rows = results[0];

transaction.run(queryOne, function(err, rows) {
Copy link
Contributor

@ace-n ace-n Apr 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid callbacks and the function keyword - stick to promises and arrow functions where possible.

rows.forEach((row) => {
const json = row.toJSON();
console.log(`SingerId: ${json.SingerId.value}, AlbumId: ${json.AlbumId.value}, AlbumTitle: ${json.AlbumTitle}`);
});
});

const queryTwo = {
columns: ['SingerId', 'AlbumId', 'AlbumTitle'],
keySet: {
all: true
}
};

// Read #2, using the `read` method. Even if changes occur
// in-between the reads, the transaction ensures that both
// return the same data.
transaction.read('Albums', queryTwo)
.then((results) => {
const rows = results[0];

rows.forEach((row) => {
const json = row.toJSON();
console.log(`SingerId: ${json.SingerId.value}, AlbumId: ${json.AlbumId.value}, AlbumTitle: ${json.AlbumTitle}`);
const queryTwo = {
columns: ['SingerId', 'AlbumId', 'AlbumTitle'],
keySet: {
all: true
}
};

// Read #2, using the `read` method. Even if changes occur
// in-between the reads, the transaction ensures that both
// return the same data.
transaction.read('Albums', queryTwo, function(err, rows) {
Copy link
Contributor

@ace-n ace-n Apr 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto callbacks v. promises

rows.forEach((row) => {
const json = row.toJSON();
console.log(`SingerId: ${json.SingerId.value}, AlbumId: ${json.AlbumId.value}, AlbumTitle: ${json.AlbumTitle}`);
});
console.log('Successfully executed read-only transaction.');
transaction.end();
});
});
})
.then(() => {
console.log('Successfully executed read-only transaction.');
});
});
});
// [END read_only_transaction]
}

Expand All @@ -96,53 +87,47 @@ function readWriteTransaction (instanceId, databaseId) {
const instance = spanner.instance(instanceId);
const database = instance.database(databaseId);

// Gets a transaction object that captures the database state
// at a specific point in time
let transaction, firstBudget, secondBudget;
const transferAmount = 200000;
const minimumAmountToTransfer = 300000;

database.runTransaction()
.then((results) => {
transaction = results[0];

const queryOne = {
columns: [`MarketingBudget`],
keys: [2, 2] // SingerId: 2, AlbumId: 2
};

const queryTwo = {
columns: ['MarketingBudget'],
keys: [1, 1] // SingerId: 1, AlbumId: 1
};

return Promise.all([
// Reads the second album's budget
transaction.read('Albums', queryOne).then((results) => {
// Gets second album's budget
// Note: MarketingBudget is an INT64, which comes from Cloud Spanner
// as a string - so we convert it to a number with parseInt()
const rows = results[0].map((row) => row.toJSON());
secondBudget = parseInt(rows[0].MarketingBudget.value);
console.log(`The second album's marketing budget: ${secondBudget}`);

// Makes sure the second album's budget is sufficient
if (secondBudget < minimumAmountToTransfer) {
throw new Error(`The second album's budget (${secondBudget}) is less than the minimum required amount to transfer.`);
}
}),

// Reads the first album's budget
transaction.read('Albums', queryTwo).then((results) => {
// Gets first album's budget
// As above, MarketingBudget is an INT64 and comes as a string
const rows = results[0].map((row) => row.toJSON());
firstBudget = parseInt(rows[0].MarketingBudget.value);
console.log(`The first album's marketing budget: ${firstBudget}`);
})
]);
})
.then(() => {
database.runTransaction(function(err, transaction) {
Copy link
Contributor

@ace-n ace-n Apr 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto callbacks vs. promises.

Copy link
Contributor Author

@vkedia vkedia Apr 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

database.runTransaction no longer returns a Promise. This was a change made in the latest release


let firstBudget, secondBudget;
const queryOne = {
columns: [`MarketingBudget`],
keys: [[2, 2]] // SingerId: 2, AlbumId: 2
};

const queryTwo = {
columns: ['MarketingBudget'],
keys: [[1, 1]] // SingerId: 1, AlbumId: 1
};

Promise.all([
// Reads the second album's budget
transaction.read('Albums', queryOne).then((results) => {
// Gets second album's budget
// Note: MarketingBudget is an INT64, which comes from Cloud Spanner
// as a string - so we convert it to a number with parseInt()
const rows = results[0].map((row) => row.toJSON());
secondBudget = parseInt(rows[0].MarketingBudget.value);
console.log(`The second album's marketing budget: ${secondBudget}`);

// Makes sure the second album's budget is sufficient
if (secondBudget < minimumAmountToTransfer) {
throw new Error(`The second album's budget (${secondBudget}) is less than the minimum required amount to transfer.`);
}
}),

// Reads the first album's budget
transaction.read('Albums', queryTwo).then((results) => {
// Gets first album's budget
// As above, MarketingBudget is an INT64 and comes as a string
const rows = results[0].map((row) => row.toJSON());
firstBudget = parseInt(rows[0].MarketingBudget.value);
console.log(`The first album's marketing budget: ${firstBudget}`);
})
]).then(() => {
// Transfer the budgets between the albums
console.log(firstBudget, secondBudget);
firstBudget += transferAmount;
Expand All @@ -159,12 +144,13 @@ function readWriteTransaction (instanceId, databaseId) {
]);
})
// Commits the transaction and send the changes to the database
.then(() => transaction.commit())
.then(() => {
// Logs success
console.log(`Successfully executed read-write transaction to transfer ${transferAmount} from Album 2 to Album 1.`);
});
// [END read_write_transaction]
.then(() => transaction.commit(function(err) {
Copy link
Contributor

@ace-n ace-n Apr 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto callbacks vs. promises.

Copy link
Contributor Author

@vkedia vkedia Apr 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think commit returns a Promise.

if (!err) {
console.log(`Successfully executed read-write transaction to transfer ${transferAmount} from Album 2 to Album 1.`);
}
}))
});
// [END read_write_transaction]
}

const cli = require(`yargs`)
Expand Down