sync with java: 4c961f143020b34aec8edd04963b599b3475c365

Author: ml054

src/Documents/BulkInsertOperation.ts

@@ -826,3 +826,8 @@ export class BulkInsertCommand extends RavenCommand<void> {
     }
 
 }
+
+export interface BulkInsertOptions {
+    useCompression?: boolean;
+    skipOverwriteIfUnchanged?: boolean;
+}

src/Documents/Commands/Batches/ClusterWideBatchCommand.ts

@@ -27,12 +27,12 @@ export class ClusterWideBatchCommand extends SingleNodeBatchCommand implements I
         let options = super._appendOptions();
 
         if (TypeUtil.isNullOrUndefined(this._disableAtomicDocumentWrites)) {
-            return ;
+            return "";
         }
 
         options
             += "&disableAtomicDocumentWrites=" + (this._disableAtomicDocumentWrites ? "true" : "false");
 
         return options;
     }
-}
+}

src/Documents/Commands/GetDocumentsCommand.ts

@@ -353,6 +353,7 @@ export class GetDocumentsCommand extends RavenCommand<GetDocumentsResult> {
             compareExchangeValueIncludes: ObjectUtil.mapCompareExchangeToLocalObject(json.CompareExchangeValueIncludes),
             timeSeriesIncludes: ObjectUtil.mapTimeSeriesIncludesToLocalObject(json.TimeSeriesIncludes),
             counterIncludes: ObjectUtil.mapCounterIncludesToLocalObject(json.CounterIncludes),
+            revisionIncludes: json.RevisionIncludes,
             nextPageStart: json.NextPageStart
         };
     }

src/Documents/Commands/QueryCommand.ts

@@ -184,6 +184,7 @@ export class QueryCommand extends RavenCommand<QueryResult> {
             includedCounterNames: json.IncludedCounterNames,
             timeSeriesIncludes: ObjectUtil.mapTimeSeriesIncludesToLocalObject(json.TimeSeriesIncludes),
             compareExchangeValueIncludes: ObjectUtil.mapCompareExchangeToLocalObject(json.CompareExchangeValueIncludes),
+            revisionIncludes: json.RevisionIncludes,
             timeSeriesFields: json.TimeSeriesFields,
             timings: QueryCommand._mapTimingsToLocalObject(json.Timings)
         }

src/Documents/Identity/HiloIdGenerator.ts

@@ -8,6 +8,7 @@ import { HiloReturnCommand } from "./Commands/HiloReturnCommand";
 import { NextHiloCommand, HiLoResult } from "./Commands/NextHiloCommand";
 import { HiloRangeValue } from "./HiloRangeValue";
 import { DocumentConventions } from "../Conventions/DocumentConventions";
+import { Lazy } from "../Lazy";
 
 export class HiloIdGenerator {
     private _store: IDocumentStore;
@@ -20,7 +21,8 @@ export class HiloIdGenerator {
     private _prefix?: string = null;
     private _lastBatchSize: number = 0;
     private _serverTag: string = null;
-    private _generatorLock = semaphore();
+
+    private _nextRangeTask: Lazy<void>;
 
     constructor(tag: string, store: IDocumentStore, dbName: string, identityPartsSeparator: string) {
         this._lastRangeAt = DateUtil.zeroDate();
@@ -44,6 +46,8 @@ export class HiloIdGenerator {
 
     public async nextId(): Promise<number> {
         while (true) {
+            const current = this._nextRangeTask;
+
             // local range is not exhausted yet
             const range = this._range;
 
@@ -52,28 +56,34 @@ export class HiloIdGenerator {
                 return id;
             }
 
-            let acquiredSemContext: SemaphoreAcquisitionContext;
             try {
-                //local range is exhausted , need to get a new range
-                acquiredSemContext = acquireSemaphore(this._generatorLock, {
-                    contextName: `${this.constructor.name}_${this._tag}`
-                });
-
-                await acquiredSemContext.promise;
-
-                const maybeNewRange = this._range;
-                if (maybeNewRange !== range) {
-                    id = maybeNewRange.increment();
-                    if (id <= maybeNewRange.maxId) {
-                        return id;
-                    }
+                // let's try to call the existing task for next range
+                await current.getValue();
+                if (range !== this._range) {
+                    continue;
                 }
+            } catch (e) {
+                // previous task was faulted, we will try to replace it
+            }
 
-                await this._getNextRange();
-            } finally {
-                if (acquiredSemContext) {
-                    acquiredSemContext.dispose();
-                }
+            // local range is exhausted , need to get a new range
+            const maybeNextTask = new Lazy(() => this._getNextRange());
+            let changed = false;
+            if (this._nextRangeTask === current) {
+                changed = true;
+                this._nextRangeTask = maybeNextTask;
+            }
+
+            if (changed) {
+                await maybeNextTask.getValue();
+                continue;
+            }
+
+            try {
+                // failed to replace, let's wait on the previous task
+                await this._nextRangeTask.getValue();
+            } catch (e) {
+                // previous task was faulted, we will try again
             }
         }
     }

src/Documents/Identity/MultiDatabaseHiLoIdGenerator.ts

@@ -3,7 +3,6 @@ import { DocumentStore } from "../DocumentStore";
 import { IRavenObject } from "../../Types/IRavenObject";
 import { DocumentStoreBase } from "../DocumentStoreBase";
 import { IHiLoIdGenerator } from "./IHiLoIdGenerator";
-import { DocumentType } from "../DocumentAbstractions";
 import { TypeUtil } from "../../Utility/TypeUtil";
 import { ObjectTypeDescriptor } from "../../Types";
 
@@ -53,7 +52,7 @@ export class MultiDatabaseHiLoIdGenerator implements IHiLoIdGenerator {
         return this._generateNextIdFor(database, collectionName);
     }
 
-    private _generateNextIdFor(database: string, collectionName: string): Promise<number> {
+    private async _generateNextIdFor(database: string, collectionName: string): Promise<number> {
         database = this._store.getEffectiveDatabase(database);
 
         if (!(database in this._generators)) {

src/Documents/Identity/MultiTypeHiLoIdGenerator.ts

@@ -112,6 +112,8 @@ export class MultiTypeHiLoIdGenerator {
         } finally {
             acquiredSem.dispose();
         }
+
+        return value.nextId();
     }
 
     protected _createGeneratorFor(tag: string): HiloIdGenerator {

src/Documents/Session/DocumentSessionRevisions.ts

@@ -38,6 +38,12 @@ export class DocumentSessionRevisions extends DocumentSessionRevisionsBase imple
         const operation = new GetRevisionOperation(this._session, id, options.start, options.pageSize);
 
         const command = operation.createRequest();
+        if (!command) {
+            return operation.getRevisionsFor(options.documentType);
+        }
+        if (this._sessionInfo) {
+            this._sessionInfo.incrementRequestCount();
+        }
         await this._requestExecutor.execute(command, this._sessionInfo);
         operation.result = command.result;
         return operation.getRevisionsFor(options.documentType);
@@ -52,12 +58,19 @@ export class DocumentSessionRevisions extends DocumentSessionRevisionsBase imple
         } as SessionRevisionsMetadataOptions, options || {});
         const operation = new GetRevisionOperation(this._session, id, options.start, options.pageSize, true);
         const command = operation.createRequest();
+        if (!command) {
+            return operation.getRevisionsMetadataFor();
+        }
+        if (this._sessionInfo) {
+            this._sessionInfo.incrementRequestCount();
+        }
         await this._requestExecutor.execute(command, this._sessionInfo);
         operation.result = command.result;
         return operation.getRevisionsMetadataFor();
     }
 
     public async get<TEntity extends object>(id: string, date: Date): Promise<TEntity | null>;
+    public async get<TEntity extends object>(id: string, date: Date, documentType: DocumentType<TEntity>): Promise<TEntity | null>;
     public async get<TEntity extends object>(changeVector: string): Promise<TEntity | null>;
     public async get<TEntity extends object>(changeVector: string,
                                              documentType: DocumentType<TEntity>): Promise<TEntity | null>;
@@ -67,7 +80,8 @@ export class DocumentSessionRevisions extends DocumentSessionRevisionsBase imple
         : Promise<RevisionsCollectionObject<TEntity>>;
     public async get<TEntity extends object>(
         changeVectorOrVectorsOrId: string | string[],
-        documentTypeOrDate?: DocumentType<TEntity> | Date)
+        documentTypeOrDate?: DocumentType<TEntity> | Date,
+        documentTypeForDateOverload?: DocumentType<TEntity>)
         : Promise<RevisionsCollectionObject<TEntity> | TEntity> {
 
         const documentType = TypeUtil.isDocumentType(documentTypeOrDate)
@@ -76,7 +90,7 @@ export class DocumentSessionRevisions extends DocumentSessionRevisionsBase imple
 
         if (TypeUtil.isDate(documentTypeOrDate)) {
             return this._getByIdAndDate(
-                changeVectorOrVectorsOrId as string, documentTypeOrDate);
+                changeVectorOrVectorsOrId as string, documentTypeOrDate, documentTypeForDateOverload);
         } else {
             return this._get(changeVectorOrVectorsOrId, documentType);
         }
@@ -86,6 +100,12 @@ export class DocumentSessionRevisions extends DocumentSessionRevisionsBase imple
         id: string, date: Date, clazz?: DocumentType<TEntity>) {
         const operation = new GetRevisionOperation(this._session, id, date);
         const command = operation.createRequest();
+        if (!command) {
+            return operation.getRevision(clazz);
+        }
+        if (this._sessionInfo) {
+            this._sessionInfo.incrementRequestCount();
+        }
         await this._requestExecutor.execute(command, this._sessionInfo);
         operation.result = command.result;
         return operation.getRevision(clazz);
@@ -97,6 +117,14 @@ export class DocumentSessionRevisions extends DocumentSessionRevisionsBase imple
         const operation = new GetRevisionOperation(this._session, changeVectorOrVectors as any);
 
         const command = operation.createRequest();
+        if (!command) {
+            return TypeUtil.isArray(changeVectorOrVectors)
+                ? operation.getRevisions(documentType)
+                : operation.getRevision(documentType);
+        }
+        if (this._sessionInfo) {
+            this._sessionInfo.incrementRequestCount();
+        }
         await this._requestExecutor.execute(command, this._sessionInfo);
         operation.result = command.result;
         return TypeUtil.isArray(changeVectorOrVectors)
@@ -107,6 +135,9 @@ export class DocumentSessionRevisions extends DocumentSessionRevisionsBase imple
     public async getCountFor(id: string): Promise<number> {
         const operation = new GetRevisionsCountOperation(id);
         const command = operation.createRequest();
+        if (this._sessionInfo) {
+            this._sessionInfo.incrementRequestCount();
+        }
         await this._requestExecutor.execute(command, this._sessionInfo);
         return command.result;
     }

src/Documents/Session/IRevisionsSessionOperations.ts

@@ -40,6 +40,11 @@ export interface IRevisionsSessionOperations {
      */
     get<TEntity extends object>(id: string, date: Date): Promise<TEntity>;
 
+    /**
+     * Returns a document revision by date.
+     */
+    get<TEntity extends object>(id: string, date: Date, documentType: DocumentType<TEntity>): Promise<TEntity>;
+
     /**
      * Returns a document revision by change vector.
      */

src/Documents/Session/InMemoryDocumentSessionOperations.ts

@@ -650,6 +650,49 @@ export abstract class InMemoryDocumentSessionOperations
         }
     }
 
+    public registerRevisionIncludes(revisionIncludes: any[]) {
+        if (this.noTracking) {
+            return;
+        }
+
+        if (!revisionIncludes) {
+            return;
+        }
+
+        if (!this.includeRevisionsByChangeVector) {
+            this.includeRevisionsByChangeVector = CaseInsensitiveKeysMap.create();
+        }
+
+        if (!this.includeRevisionsIdByDateTimeBefore) {
+            this.includeRevisionsIdByDateTimeBefore = CaseInsensitiveKeysMap.create();
+        }
+
+        for (const obj of revisionIncludes) {
+            if (!obj) {
+                continue;
+            }
+
+            const json = obj;
+            const id = json.Id;
+            const changeVector = json.ChangeVector;
+            const beforeAsText = json.Before;
+            const dateTime = beforeAsText ? DateUtil.utc.parse(beforeAsText) : null;
+            const revision = json.Revision;
+
+            this.includeRevisionsByChangeVector.set(changeVector, DocumentInfo.getNewDocumentInfo(revision));
+
+            if (dateTime && !StringUtil.isNullOrWhitespace(id)) {
+                const map = new Map<number, DocumentInfo>();
+
+                this.includeRevisionsIdByDateTimeBefore.set(id, map);
+
+                const documentInfo = new DocumentInfo();
+                documentInfo.document = revision;
+                map.set(dateTime.getTime(), documentInfo);
+            }
+        }
+    }
+
     public registerMissingIncludes(results: object[], includes: object, includePaths: string[]): void {
         if (this.noTracking) {
             return;