Test build for bug fix #27

Irrelon · Feb 24, 2015 · c02a94c · c02a94c
1 parent e5a8452
commit c02a94c
Show file tree

Hide file tree

Showing 10 changed files with 758 additions and 649 deletions.
diff --git a/js/dist/fdb-all.js b/js/dist/fdb-all.js
@@ -516,6 +516,11 @@ Collection.prototype.setData = function (data, options, callback) {
 		this.rebuildPrimaryKeyIndex(options);
 		op.time('Rebuild Primary Key Index');
 
+		// Rebuild all other indexes
+		op.time('Rebuild All Other Indexes');
+		this._rebuildIndexes();
+		op.time('Rebuild All Other Indexes');
+
 		op.time('Resolve chains');
 		this.chainSend('setData', data, {oldData: oldData});
 		op.time('Resolve chains');
@@ -1728,6 +1733,22 @@ Collection.prototype._removeFromIndexes = function (doc) {
 	}
 };
 
+/**
+ * Rebuild collection indexes.
+ * @private
+ */
+Collection.prototype._rebuildIndexes = function () {
+	var arr = this._indexByName,
+		arrIndex;
+
+	// Remove from other indexes
+	for (arrIndex in arr) {
+		if (arr.hasOwnProperty(arrIndex)) {
+			arr[arrIndex].rebuild();
+		}
+	}
+};
+
 /**
  * Returns the index of the document identified by the passed item's primary key.
  * @param {Object} item The item whose primary key should be used to lookup.

diff --git a/js/dist/fdb-all.min.js b/js/dist/fdb-all.min.js
diff --git a/js/dist/fdb-core+persist.js b/js/dist/fdb-core+persist.js
@@ -250,6 +250,11 @@ Collection.prototype.setData = function (data, options, callback) {
 		this.rebuildPrimaryKeyIndex(options);
 		op.time('Rebuild Primary Key Index');
 
+		// Rebuild all other indexes
+		op.time('Rebuild All Other Indexes');
+		this._rebuildIndexes();
+		op.time('Rebuild All Other Indexes');
+
 		op.time('Resolve chains');
 		this.chainSend('setData', data, {oldData: oldData});
 		op.time('Resolve chains');
@@ -1462,6 +1467,22 @@ Collection.prototype._removeFromIndexes = function (doc) {
 	}
 };
 
+/**
+ * Rebuild collection indexes.
+ * @private
+ */
+Collection.prototype._rebuildIndexes = function () {
+	var arr = this._indexByName,
+		arrIndex;
+
+	// Remove from other indexes
+	for (arrIndex in arr) {
+		if (arr.hasOwnProperty(arrIndex)) {
+			arr[arrIndex].rebuild();
+		}
+	}
+};
+
 /**
  * Returns the index of the document identified by the passed item's primary key.
  * @param {Object} item The item whose primary key should be used to lookup.

diff --git a/js/dist/fdb-core+persist.min.js b/js/dist/fdb-core+persist.min.js
diff --git a/js/dist/fdb-core+views.js b/js/dist/fdb-core+views.js
@@ -510,6 +510,11 @@ Collection.prototype.setData = function (data, options, callback) {
 		this.rebuildPrimaryKeyIndex(options);
 		op.time('Rebuild Primary Key Index');
 
+		// Rebuild all other indexes
+		op.time('Rebuild All Other Indexes');
+		this._rebuildIndexes();
+		op.time('Rebuild All Other Indexes');
+
 		op.time('Resolve chains');
 		this.chainSend('setData', data, {oldData: oldData});
 		op.time('Resolve chains');
@@ -1722,6 +1727,22 @@ Collection.prototype._removeFromIndexes = function (doc) {
 	}
 };
 
+/**
+ * Rebuild collection indexes.
+ * @private
+ */
+Collection.prototype._rebuildIndexes = function () {
+	var arr = this._indexByName,
+		arrIndex;
+
+	// Remove from other indexes
+	for (arrIndex in arr) {
+		if (arr.hasOwnProperty(arrIndex)) {
+			arr[arrIndex].rebuild();
+		}
+	}
+};
+
 /**
  * Returns the index of the document identified by the passed item's primary key.
  * @param {Object} item The item whose primary key should be used to lookup.

diff --git a/js/dist/fdb-core+views.min.js b/js/dist/fdb-core+views.min.js
diff --git a/js/dist/fdb-core.js b/js/dist/fdb-core.js
@@ -249,6 +249,11 @@ Collection.prototype.setData = function (data, options, callback) {
 		this.rebuildPrimaryKeyIndex(options);
 		op.time('Rebuild Primary Key Index');
 
+		// Rebuild all other indexes
+		op.time('Rebuild All Other Indexes');
+		this._rebuildIndexes();
+		op.time('Rebuild All Other Indexes');
+
 		op.time('Resolve chains');
 		this.chainSend('setData', data, {oldData: oldData});
 		op.time('Resolve chains');
@@ -1461,6 +1466,22 @@ Collection.prototype._removeFromIndexes = function (doc) {
 	}
 };
 
+/**
+ * Rebuild collection indexes.
+ * @private
+ */
+Collection.prototype._rebuildIndexes = function () {
+	var arr = this._indexByName,
+		arrIndex;
+
+	// Remove from other indexes
+	for (arrIndex in arr) {
+		if (arr.hasOwnProperty(arrIndex)) {
+			arr[arrIndex].rebuild();
+		}
+	}
+};
+
 /**
  * Returns the index of the document identified by the passed item's primary key.
  * @param {Object} item The item whose primary key should be used to lookup.

diff --git a/js/dist/fdb-core.min.js b/js/dist/fdb-core.min.js
diff --git a/js/dist/fdb-legacy.js b/js/dist/fdb-legacy.js
@@ -517,6 +517,11 @@ Collection.prototype.setData = function (data, options, callback) {
 		this.rebuildPrimaryKeyIndex(options);
 		op.time('Rebuild Primary Key Index');
 
+		// Rebuild all other indexes
+		op.time('Rebuild All Other Indexes');
+		this._rebuildIndexes();
+		op.time('Rebuild All Other Indexes');
+
 		op.time('Resolve chains');
 		this.chainSend('setData', data, {oldData: oldData});
 		op.time('Resolve chains');
@@ -1729,6 +1734,22 @@ Collection.prototype._removeFromIndexes = function (doc) {
 	}
 };
 
+/**
+ * Rebuild collection indexes.
+ * @private
+ */
+Collection.prototype._rebuildIndexes = function () {
+	var arr = this._indexByName,
+		arrIndex;
+
+	// Remove from other indexes
+	for (arrIndex in arr) {
+		if (arr.hasOwnProperty(arrIndex)) {
+			arr[arrIndex].rebuild();
+		}
+	}
+};
+
 /**
  * Returns the index of the document identified by the passed item's primary key.
  * @param {Object} item The item whose primary key should be used to lookup.