Merge branch 'async-support' of https://github.com/Microsoft/FASTER i…

…nto async-support
microsoft · Aug 9, 2019 · e5a4859 · e5a4859
2 parents d72c92a + 869a88e
commit e5a4859
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/cc/test/in_memory_test.cc b/cc/test/in_memory_test.cc
@@ -680,7 +680,7 @@ TEST(InMemFaster, UpsertRead_ResizeValue_Concurrent) {
       return false;
     }
     inline void unlock(bool replaced) {
-      if(replaced) {
+      if(!replaced) {
         // Just turn off "locked" bit and increase gen number.
         uint64_t sub_delta = ((uint64_t)1 << 62) - 1;
         control_.fetch_sub(sub_delta);
@@ -1409,7 +1409,7 @@ TEST(InMemFaster, Rmw_ResizeValue_Concurrent) {
       return false;
     }
     inline void unlock(bool replaced) {
-      if(replaced) {
+      if(!replaced) {
         // Just turn off "locked" bit and increase gen number.
         uint64_t sub_delta = ((uint64_t)1 << 62) - 1;
         control_.fetch_sub(sub_delta);

diff --git a/cs/src/core/FASTER.core.debug.nuspec b/cs/src/core/FASTER.core.debug.nuspec
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>FASTER.Debug</id>
+    <id>Microsoft.FASTER.Debug</id>
     <version>$version$</version>
-    <title>FASTER.Debug</title>
+    <title>FASTER (Debug)</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <projectUrl>https://github.com/Microsoft/FASTER</projectUrl>
@@ -31,4 +31,4 @@
     <file src="bin\AnyCPU\Debug\netstandard2.0\FASTER.core.pdb" target="lib\netstandard2.0" />
     <file src="bin\AnyCPU\Debug\netstandard2.0\FASTER.core.xml" target="lib\netstandard2.0" />
   </files>
-</package>
+</package>
diff --git a/cs/src/core/FASTER.core.nuspec b/cs/src/core/FASTER.core.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>FASTER</id>
+    <id>Microsoft.FASTER</id>
     <version>$version$</version>
     <title>FASTER</title>
     <authors>Microsoft</authors>
@@ -31,4 +31,4 @@
     <file src="bin\AnyCPU\Release\netstandard2.0\FASTER.core.pdb" target="lib\netstandard2.0" />
     <file src="bin\AnyCPU\Release\netstandard2.0\FASTER.core.xml" target="lib\netstandard2.0" />
   </files>
-</package>
+</package>
diff --git a/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.nuspec b/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.nuspec
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>FASTER.devices.AzureStorageDevice</id>
+    <id>Microsoft.FASTER.devices.AzureStorageDevice</id>
     <version>$version$</version>
-    <title>FASTER.devices.AzureStorageDevice</title>
+    <title>Azure storage device for FASTER</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <projectUrl>https://github.com/Microsoft/FASTER</projectUrl>
@@ -17,11 +17,11 @@
     <dependencies>
       <group targetFramework="net46">
         <dependency id="Microsoft.Azure.Storage.Blob" version="10.0.3" />
-        <dependency id="FASTER" version="$version$" />
+        <dependency id="Microsoft.FASTER" version="$version$" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="Microsoft.Azure.Storage.Blob" version="10.0.3" />
-        <dependency id="FASTER" version="$version$" />
+        <dependency id="Microsoft.FASTER" version="$version$" />
       </group>
     </dependencies>
   </metadata>
@@ -33,4 +33,4 @@
     <file src="bin\AnyCPU\Release\netstandard2.0\FASTER.devices.AzureStorageDevice.pdb" target="lib\netstandard2.0" />
     <file src="bin\AnyCPU\Release\netstandard2.0\FASTER.devices.AzureStorageDevice.xml" target="lib\netstandard2.0" />
   </files>
-</package>
+</package>