increment version number, update tests for new path format and version number

Author: ojhunt

llvm/lib/CAS/OnDiskGraphDB.cpp

@@ -81,7 +81,7 @@ static constexpr StringLiteral DataPoolTableName = "llvm.cas.data";
 static constexpr StringLiteral IndexFile = "index";
 static constexpr StringLiteral DataPoolFile = "data";
 
-static constexpr StringLiteral FilePrefix = "v9.";
+static constexpr StringLiteral FilePrefix = "v10.";
 static constexpr StringLiteral FileSuffixData = ".data";
 static constexpr StringLiteral FileSuffixLeaf = ".leaf";
 static constexpr StringLiteral FileSuffixLeaf0 = ".leaf+0";

llvm/test/CAS/logging.test

@@ -8,10 +8,10 @@ RUN: FileCheck %s --input-file %t/cas/v1.log
 RUN: FileCheck %s --input-file %t/cas/v1.log --check-prefix=STANDALONE
 
 
-// CHECK: resize mapped file '{{.*}}v9.index'
-// CHECK: mmap '{{.*}}v9.index' [[INDEX:0x[0-9a-f]+]]
-// CHECK: resize mapped file '{{.*}}v9.data'
-// CHECK: mmap '{{.*}}v9.data' [[DATA:0x[0-9a-f]+]]
+// CHECK: resize mapped file '{{.*}}v10.index'
+// CHECK: mmap '{{.*}}v10.index' [[INDEX:0x[0-9a-f]+]]
+// CHECK: resize mapped file '{{.*}}v10.data'
+// CHECK: mmap '{{.*}}v10.data' [[DATA:0x[0-9a-f]+]]
 // CHECK: resize mapped file '{{.*}}v4.actions'
 // CHECK: mmap '{{.*}}v4.actions' [[ACTIONS:0x[0-9a-f]+]]
 
@@ -22,16 +22,16 @@ RUN: FileCheck %s --input-file %t/cas/v1.log --check-prefix=STANDALONE
 
 // CHECK: resize mapped file '{{.*}}v4.actions'
 // CHECK: close mmap '{{.*}}v4.actions'
-// CHECK: resize mapped file '{{.*}}v9.data'
-// CHECK: close mmap '{{.*}}v9.data'
-// CHECK: resize mapped file '{{.*}}v9.index'
-// CHECK: close mmap '{{.*}}v9.index'
+// CHECK: resize mapped file '{{.*}}v10.data'
+// CHECK: close mmap '{{.*}}v10.data'
+// CHECK: resize mapped file '{{.*}}v10.index'
+// CHECK: close mmap '{{.*}}v10.index'
 
 // CHECK: validate-if-needed '{{.*}}cas' boot=[[BOOT:[0-9]+]] last-valid=0 check-hash=1 allow-recovery=0 force=0 llvm-cas={{.*}}llvm-cas
 // CHECK: validate-if-needed '{{.*}}cas' boot=[[BOOT]] last-valid=[[BOOT]] check-hash=0 allow-recovery=1 force=1 llvm-cas={{.*}}llvm-cas
 
-// STANDALONE: standalone file create '[[PATH:.*v9.[0-9a-f]*.leaf]].[[SUFFIX:[0-9a-f]*]]'
-// STANDALONE: standalone file rename '[[PATH]].[[SUFFIX]]' to '[[PATH]]'
+// STANDALONE: standalone file create '[[ROOT_PATH:.*/]][[FILENAME:v10.[0-9a-f]*.leaf]].[[SUFFIX:[0-9a-f]*]]'
+// STANDALONE: standalone file rename '[[ROOT_PATH]][[FILENAME]].[[SUFFIX]]' to '[[ROOT_PATH]]{{[0-9a-f]+}}/[[FILENAME]]'
 
 //--- input/a
 Input 1

llvm/test/CAS/validate-if-needed.test

@@ -1,6 +1,6 @@
 RUN: rm -rf %t && mkdir %t
 RUN: llvm-cas --cas %t/cas --ingest %S/Inputs > %t/cas.id
-RUN: mv %t/cas/v1.1/v9.data %t/cas/v1.1/v9.data.bak
+RUN: mv %t/cas/v1.1/v10.data %t/cas/v1.1/v10.data.bak
 
 # INVALID: bad record
 # VALID: validated successfully
@@ -12,15 +12,15 @@ RUN: not llvm-cas --cas %t/cas --validate-if-needed 2>&1 | FileCheck %s -check-p
 RUN: not llvm-cas --cas %t/cas --validate-if-needed 2>&1 | FileCheck %s -check-prefix=INVALID
 
 # Validation happens once per boot.
-RUN: mv %t/cas/v1.1/v9.data.bak %t/cas/v1.1/v9.data
+RUN: mv %t/cas/v1.1/v10.data.bak %t/cas/v1.1/v10.data
 RUN: llvm-cas --cas %t/cas --validate-if-needed | FileCheck %s -check-prefix=VALID
 RUN: llvm-cas --cas %t/cas --validate-if-needed | FileCheck %s -check-prefix=SKIPPED
 # Wrong timestamp triggers re-validation.
 RUN: echo '123' > %t/cas/v1.validation
 RUN: llvm-cas --cas %t/cas --validate-if-needed | FileCheck %s -check-prefix=VALID
 RUN: llvm-cas --cas %t/cas --validate-if-needed | FileCheck %s -check-prefix=SKIPPED
 # Skipped validation does not catch errors.
-RUN: mv %t/cas/v1.1/v9.data %t/cas/v1.1/v9.data.bak
+RUN: mv %t/cas/v1.1/v10.data %t/cas/v1.1/v10.data.bak
 RUN: llvm-cas --cas %t/cas --validate-if-needed | FileCheck %s -check-prefix=SKIPPED
 
 # Unless forced.
@@ -33,7 +33,7 @@ RUN: llvm-cas --cas %t/cas --validate-if-needed --allow-recovery | FileCheck %s
 RUN: llvm-cas --cas %t/cas --validate-if-needed --force | FileCheck %s -check-prefix=VALID
 RUN: rm -rf %t/cas/v1.1
 RUN: cp -r %t/cas/corrupt.0.v1.1 %t/cas/v1.1
-RUN: mv %t/cas/v1.1/v9.data %t/cas/v1.1/v9.data.bak
+RUN: mv %t/cas/v1.1/v10.data %t/cas/v1.1/v10.data.bak
 RUN: llvm-cas --cas %t/cas --validate-if-needed --allow-recovery --force | FileCheck %s -check-prefix=RECOVERED
 RUN: ls %t/cas/corrupt.1.v1.1
 

llvm/test/tools/llvm-cas/validation.test

@@ -12,7 +12,7 @@ RUN: llvm-cas --cas %t/cas --ingest %S/Inputs > %t/cas.id
 RUN: llvm-cas --cas %t/cas --validate
 RUN: llvm-cas --cas %t/cas --validate --check-hash
 
-RUN: rm %t/cas/v1.1/v9.data
+RUN: rm %t/cas/v1.1/v10.data
 RUN: not llvm-cas --cas %t/cas --validate
 RUN: not llvm-cas --cas %t/cas --validate --check-hash
 

llvm/tools/llvm-cas-test/llvm-cas-test.cpp

@@ -271,7 +271,7 @@ static int checkLockFiles() {
   ExitOnError ExitOnErr("llvm-cas-test: check-lock-files: ");
 
   SmallString<128> DataPoolPath(CASPath);
-  sys::path::append(DataPoolPath, "v1.1/v9.data");
+  sys::path::append(DataPoolPath, "v1.1/v10.data");
 
   auto OpenCASAndGetDataPoolSize = [&]() -> Expected<uint64_t> {
     auto Result = createOnDiskUnifiedCASDatabases(CASPath);