Skip to content

Commit

Permalink
decleariction.
Browse files Browse the repository at this point in the history
  • Loading branch information
@yathit
yathit committed Oct 22, 2014
1 parent 2e35609 commit 4f088ab
Show file tree
Hide file tree
Showing 3 changed files with 109 additions and 59 deletions.
25 changes: 25 additions & 0 deletions src/ydn/db/base/base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,28 @@ ydn.db.base.QueryMethod = {
* @typedef {(SQLTransaction|IDBTransaction|Object)}
*/
ydn.db.base.Transaction;


/**
* @define {string} Store name for history.
*/
ydn.db.base.SN_ENTITY_HISTORY = '_ydn_sync_history';


/**
* Store schema for storing history log for recovery.
* This is used in ydn-db-sync module.
* @const
* @type {StoreSchema}
*/
ydn.db.base.entitySchema = /** @type {StoreSchema} */ (/** @type {Object} */({
name: ydn.db.base.SN_ENTITY_HISTORY,
keyPath: 'sequence',
autoIncrement: true,
indexes: [
{
name: 'key',
keyPath: ['entity', 'id']
}
]
}));
140 changes: 82 additions & 58 deletions src/ydn/db/crud/operator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,71 @@ ydn.db.crud.DbOperator.prototype.get = function(arg1, arg2) {
};


/**
* Value by key range.
* @param {string} store_name
* @param {ydn.db.KeyRange|IDBKeyRange=} opt_kr
* @param {number=} opt_limit
* @param {number=} opt_offset
* @param {boolean=} opt_reverse
* @return {!ydn.db.Request.<!Array.<Object>>}
*/
ydn.db.crud.DbOperator.prototype.keysByKeyRange = function(store_name, opt_kr,
opt_limit, opt_offset, opt_reverse) {
var store = this.schema.getStore(store_name);
var limit, offset, reverse;
var range = null;
if (goog.isObject(opt_kr)) {
if (goog.DEBUG) {
var msg = ydn.db.KeyRange.validate(opt_kr);
if (msg) {
throw new ydn.debug.error.ArgumentException('invalid key range: ' +
opt_kr + ' ' + msg);
}
}
range = ydn.db.KeyRange.parseIDBKeyRange(opt_kr);
} else if (goog.DEBUG && goog.isDefAndNotNull(opt_kr)) {
throw new ydn.debug.error.ArgumentException('expect key range object,' +
' but found "' + ydn.json.toShortString(opt_kr) + '" of type ' + typeof opt_kr);
}
if (!goog.isDef(opt_limit)) {
limit = ydn.db.base.DEFAULT_RESULT_LIMIT;
} else if (goog.isNumber(opt_limit)) {
limit = opt_limit;
} else {
throw new ydn.debug.error.ArgumentException('limit must be a number, ' +
'but ' + opt_limit + ' is ' + typeof opt_limit);
}
if (!goog.isDef(opt_offset)) {
offset = 0;
} else if (goog.isNumber(opt_offset)) {
offset = opt_offset;
} else {
throw new ydn.debug.error.ArgumentException(
'offset must be a number, ' + 'but ' + opt_offset + ' is ' +
typeof opt_offset);
}
if (goog.isDef(opt_reverse)) {
if (goog.isBoolean(opt_reverse)) {
reverse = opt_reverse;
} else {
throw new ydn.debug.error.ArgumentException('reverse must be a ' +
'boolean, but ' + opt_reverse + ' is ' + typeof opt_reverse);
}
}

goog.log.finer(this.logger, 'keysByKeyRange: ' + store_name);
var req = this.tx_thread.request(ydn.db.Request.Method.KEYS, [store_name]);
store.hook(req, arguments);
req.addTxback(function() {
this.getCrudExecutor().list(req, ydn.db.base.QueryMethod.LIST_PRIMARY_KEY,
store_name, null, range, limit, offset, reverse, false);
}, this);

return req;
};


/**
*
* @inheritDoc
Expand Down Expand Up @@ -416,51 +481,10 @@ ydn.db.crud.DbOperator.prototype.keys = function(opt_store_name, arg1,
store_name, index_name, range, limit, offset, reverse, unique);
}, this);
} else {
if (goog.isObject(arg1)) {
if (goog.DEBUG) {
var msg = ydn.db.KeyRange.validate(arg1);
if (msg) {
throw new ydn.debug.error.ArgumentException('invalid key range: ' +
ydn.json.toShortString(arg1) + ' ' + msg);
}
}
range = ydn.db.KeyRange.parseIDBKeyRange(arg1);
} else {
if (goog.DEBUG && goog.isDefAndNotNull(arg1)) {
throw new ydn.debug.error.ArgumentException('invalid key range: ' +
ydn.json.toShortString(arg1) + ' of type ' + typeof arg1);
}
range = null;
}
if (goog.isNumber(arg2)) {
limit = arg2;
} else if (!goog.isDef(arg2)) {
limit = ydn.db.base.DEFAULT_RESULT_LIMIT;
} else {
throw new ydn.debug.error.ArgumentException('limit must be a number');
}
if (goog.isNumber(arg3)) {
offset = arg3;
} else if (!goog.isDef(arg3)) {
offset = 0;
} else {
throw new ydn.debug.error.ArgumentException('offset must be a number');
}
if (goog.isDef(arg4)) {
if (goog.isBoolean(arg4)) {
reverse = arg4;
} else {
throw new ydn.debug.error.ArgumentException(
'reverse must be a boolean');
}
}
goog.log.finer(this.logger, 'keysByKeyRange: ' + store_name);
req = this.tx_thread.request(ydn.db.Request.Method.KEYS, [store_name]);
store.hook(req, arguments);
req.addTxback(function() {
this.getCrudExecutor().list(req, ydn.db.base.QueryMethod.LIST_PRIMARY_KEY,
store_name, null, range, limit, offset, reverse, false);
}, this);
req = this.keysByKeyRange(store_name,
/** @type {ydn.db.KeyRange|IDBKeyRange} */ (arg1),
/** @type {number|undefined} */ (arg2), arg3,
/** @type {boolean|undefined} */ (arg4));
}

return req;
Expand Down Expand Up @@ -591,29 +615,29 @@ ydn.db.crud.DbOperator.prototype.values = function(arg0, arg1, arg2, arg3, arg4,
/**
* Value by key range.
* @param {string} store_name
* @param {ydn.db.KeyRange|IDBKeyRange} kr
* @param {ydn.db.KeyRange|IDBKeyRange=} opt_kr
* @param {number=} opt_limit
* @param {number=} opt_offset
* @param {boolean=} opt_reverse
* @return {!ydn.db.Request.<!Array.<Object>>}
*/
ydn.db.crud.DbOperator.prototype.valuesByKeyRange = function(store_name, kr,
ydn.db.crud.DbOperator.prototype.valuesByKeyRange = function(store_name, opt_kr,
opt_limit, opt_offset, opt_reverse) {
var store = this.schema.getStore(store_name);
var limit, offset, reverse;
var range = null;
if (goog.isObject(kr)) {
if (goog.isObject(opt_kr)) {
if (goog.DEBUG) {
var msg = ydn.db.KeyRange.validate(kr);
var msg = ydn.db.KeyRange.validate(opt_kr);
if (msg) {
throw new ydn.debug.error.ArgumentException('invalid key range: ' +
kr + ' ' + msg);
opt_kr + ' ' + msg);
}
}
range = ydn.db.KeyRange.parseIDBKeyRange(kr);
} else if (goog.DEBUG && goog.isDefAndNotNull(kr)) {
range = ydn.db.KeyRange.parseIDBKeyRange(opt_kr);
} else if (goog.DEBUG && goog.isDefAndNotNull(opt_kr)) {
throw new ydn.debug.error.ArgumentException('expect key range object,' +
' but found "' + ydn.json.toShortString(kr) + '" of type ' + typeof kr);
' but found "' + ydn.json.toShortString(opt_kr) + '" of type ' + typeof opt_kr);
}
if (!goog.isDef(opt_limit)) {
limit = ydn.db.base.DEFAULT_RESULT_LIMIT;
Expand Down Expand Up @@ -657,30 +681,30 @@ ydn.db.crud.DbOperator.prototype.valuesByKeyRange = function(store_name, kr,
* Value by key range.
* @param {string} store_name
* @param {string} index_name index name.
* @param {ydn.db.KeyRange|IDBKeyRange|KeyRangeJson} kr
* @param {ydn.db.KeyRange|IDBKeyRange|KeyRangeJson=} opt_kr
* @param {number=} opt_limit
* @param {number=} opt_offset
* @param {boolean=} opt_reverse
* @param {boolean=} opt_unique
* @return {!ydn.db.Request.<!Array.<Object>>}
*/
ydn.db.crud.DbOperator.prototype.valuesByIndexKeyRange = function(store_name,
index_name, kr, opt_limit, opt_offset, opt_reverse, opt_unique) {
index_name, opt_kr, opt_limit, opt_offset, opt_reverse, opt_unique) {
var store = this.schema.getStore(store_name);
var limit, offset, reverse, unique;
if (goog.DEBUG) {
if (!store.hasIndex(index_name)) {
throw new ydn.debug.error.ArgumentException('index "' +
index_name + '" not found in store "' + store_name + '"');
}
var msg = ydn.db.KeyRange.validate(/** @type {KeyRangeJson} */ (kr));
var msg = ydn.db.KeyRange.validate(/** @type {KeyRangeJson} */ (opt_kr));
if (msg) {
throw new ydn.debug.error.ArgumentException('invalid key range: ' +
kr + ' ' + msg);
opt_kr + ' ' + msg);
}
}
var range = ydn.db.KeyRange.parseIDBKeyRange(
/** @type {KeyRangeJson} */ (kr));
/** @type {KeyRangeJson} */ (opt_kr));
if (!goog.isDef(opt_limit)) {
limit = ydn.db.base.DEFAULT_RESULT_LIMIT;
} else if (goog.isNumber(opt_limit)) {
Expand Down
3 changes: 2 additions & 1 deletion test/qunit/test_dev_ver_1_crud.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
<body>

<div id="qunit"></div>
<script type="text/javascript" src="qunit-base.js"></script>

<script type="text/javascript" src="ver_1_crud.js"></script>
<script type="text/javascript" src="crud.js"></script>

</body>
</html>

0 comments on commit 4f088ab

Please sign in to comment.