Float merge

.gitignore

@@ -44,3 +44,5 @@ Static library*/
 *.opensdf
 *.sdf
 /tightdb.xcodeproj
+
+/src/tightdb/array_generic_tpl.hpp

TightDB.vcxproj

@@ -222,7 +222,7 @@
  <WarningLevel>Level3</WarningLevel>
  <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  <CompileAs>CompileAsCpp</CompileAs>
- <AdditionalOptions>/DPTW32_STATIC_LIB /DTIGHTDB_DEBUG %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions>/DPTW32_STATIC_LIB /DTIGHTDB_DEBUG /DMAX_LIST_SIZE=1000 %(AdditionalOptions)</AdditionalOptions>
  <CompileAsManaged>false</CompileAsManaged>
  <DisableLanguageExtensions>false</DisableLanguageExtensions>
  <DisableSpecificWarnings>4355;4996</DisableSpecificWarnings>
@@ -277,6 +277,7 @@
  <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  <AdditionalOptions>/DPTW32_STATIC_LIB %(AdditionalOptions)</AdditionalOptions>
  <DisableSpecificWarnings>4355;4996</DisableSpecificWarnings>
+ <BrowseInformation>true</BrowseInformation>
  </ClCompile>
  <Link>
  <AdditionalDependencies>Release\UnitTest++.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -287,6 +288,9 @@
  <TargetMachine>MachineX86</TargetMachine>
  <AdditionalOptions>WS2_32.lib %(AdditionalOptions)</AdditionalOptions>
  </Link>
+ <Bscmake>
+ <PreserveSBR>true</PreserveSBR>
+ </Bscmake>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">
  <ClCompile>
@@ -439,6 +443,7 @@
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
  <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/DUSE_SSE42 %(AdditionalOptions)</AdditionalOptions>
  </ClCompile>
+ <ClCompile Include="test\performance\timer.cpp" />
  <ClCompile Include="test\testalloc.cpp">
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|x64'">true</ExcludedFromBuild>
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|Win32'">true</ExcludedFromBuild>
@@ -457,6 +462,12 @@
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">true</ExcludedFromBuild>
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
  </ClCompile>
+ <ClCompile Include="test\testarrayfloat.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
  <ClCompile Include="test\testarraystring.cpp">
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|x64'">true</ExcludedFromBuild>
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|Win32'">true</ExcludedFromBuild>
@@ -481,6 +492,9 @@
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">true</ExcludedFromBuild>
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
  </ClCompile>
+ <ClCompile Include="test\testcolumnfloat.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
  <ClCompile Include="test\testcolumnmixed.cpp">
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|x64'">true</ExcludedFromBuild>
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|Win32'">true</ExcludedFromBuild>
@@ -541,8 +555,18 @@
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">true</ExcludedFromBuild>
  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
  </ClCompile>
- <ClCompile Include="test\testtransactions_lasse.cpp" />
- <ClCompile Include="test\transactions.cpp" />
+ <ClCompile Include="test\testtransactions_lasse.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="test\transactions.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
+ </ClCompile>
  </ItemGroup>
  <ItemGroup>
  <ClInclude Include="src\tightdb.hpp" />
@@ -551,13 +575,23 @@
  <ClInclude Include="src\tightdb\array.hpp" />
  <ClInclude Include="src\tightdb\array_binary.hpp" />
  <ClInclude Include="src\tightdb\array_blob.hpp" />
+ <ClInclude Include="src\tightdb\array_double.hpp" />
+ <ClInclude Include="src\tightdb\array_float.hpp" />
+ <ClInclude Include="src\tightdb\array_basic.hpp" />
+ <ClInclude Include="src\tightdb\array_basic_tpl.hpp">
+ <FileType>CppHeader</FileType>
+ </ClInclude>
  <ClInclude Include="src\tightdb\array_string.hpp" />
  <ClInclude Include="src\tightdb\array_string_long.hpp" />
  <ClInclude Include="src\tightdb\binary_data.hpp" />
  <ClInclude Include="src\tightdb\bind_ptr.hpp" />
  <ClInclude Include="src\tightdb\column.hpp" />
  <ClInclude Include="src\tightdb\column_binary.hpp" />
+ <ClInclude Include="src\tightdb\column_double.hpp" />
+ <ClInclude Include="src\tightdb\column_float.hpp" />
  <ClInclude Include="src\tightdb\column_fwd.hpp" />
+ <ClInclude Include="src\tightdb\column_basic.hpp" />
+ <ClInclude Include="src\tightdb\column_basic_tpl.hpp" />
  <ClInclude Include="src\tightdb\column_mixed.hpp" />
  <ClInclude Include="src\tightdb\column_string.hpp" />
  <ClInclude Include="src\tightdb\column_string_enum.hpp" />

TightDB.vcxproj.filters

@@ -109,18 +109,12 @@
  <ClCompile Include="src\tightdb\utf8.cpp">
  <Filter>src</Filter>
  </ClCompile>
- <ClCompile Include="src\tightdb\utilities.cpp">
- <Filter>src</Filter>
- </ClCompile>
  <ClCompile Include="src\tightdb\alloc.cpp">
  <Filter>src</Filter>
  </ClCompile>
  <ClCompile Include="src\tightdb\alloc_slab.cpp">
  <Filter>src</Filter>
  </ClCompile>
- <ClCompile Include="src\tightdb\array.cpp">
- <Filter>src</Filter>
- </ClCompile>
  <ClCompile Include="src\tightdb\array_binary.cpp">
  <Filter>src</Filter>
  </ClCompile>
@@ -160,9 +154,22 @@
  <ClCompile Include="test\transactions.cpp">
  <Filter>test</Filter>
  </ClCompile>
+ <ClCompile Include="test\testarrayfloat.cpp">
+ <Filter>test</Filter>
+ </ClCompile>
+ <ClCompile Include="test\testcolumnfloat.cpp">
+ <Filter>test</Filter>
+ </ClCompile>
  <ClCompile Include="test\testtransactions_lasse.cpp">
  <Filter>test</Filter>
  </ClCompile>
+ <ClCompile Include="src\tightdb\array.cpp">
+ <Filter>src</Filter>
+ </ClCompile>
+ <ClCompile Include="test\performance\timer.cpp" />
+ <ClCompile Include="src\tightdb\utilities.cpp">
+ <Filter>test</Filter>
+ </ClCompile>
  </ItemGroup>
  <ItemGroup>
  <ClInclude Include="src\win32\pthread\pthread.h">
@@ -342,6 +349,30 @@
  <ClInclude Include="test\pthread_test.hpp">
  <Filter>test</Filter>
  </ClInclude>
+ <ClInclude Include="src\tightdb\array_float.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
+ <ClInclude Include="src\tightdb\array_double.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
+ <ClInclude Include="src\tightdb\column_float.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
+ <ClInclude Include="src\tightdb\column_double.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
+ <ClInclude Include="src\tightdb\array_basic.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
+ <ClInclude Include="src\tightdb\column_basic.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
+ <ClInclude Include="src\tightdb\array_basic_tpl.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
+ <ClInclude Include="src\tightdb\column_basic_tpl.hpp">
+ <Filter>src\include</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <Filter Include="pthreads">

changelog.txt

@@ -25,7 +25,6 @@ Format:
 - Group::set_shared() removed.
 - SharedGroup::is_valid() removed. Errors are now reported as exceptions from the constructor.
 
-
 2013-01-11 (Kristian Spangsege)
 + Simplified open-mode for Group constructor.
 - Group::is_valid() removed. Errors are now reported as exceptions from the constructor.
@@ -38,6 +37,9 @@ Format:
 + Mixed::set_int() added (same for other value types except subtables).
 + Removed two-argument Mixed constructor for binary data since its signature is expected to be used for strings that are not zero-terminated.
 
+2013-01-08 (Brian Munkholm)
+----------
++ New: Added a bunch of methods to support two new column types: float and double.
 
 2012-12-16 (Kristian Spangsege)
 ----------

config.mk-with-sse

@@ -0,0 +1,12 @@
+SOURCE_ROOT = src
+
+ifneq ($(CC_AND_CXX_ARE_GCC_LIKE),)
+CFLAGS_DEFAULT += -Wextra -ansi -pedantic -Wno-long-long -msse4.2
+# FIXME: '-fno-elide-constructors' currently causes TightDB to fail
+#CFLAGS_DEBUG += -fno-elide-constructors
+CFLAGS_PTHREAD += -pthread
+endif
+
+CFLAGS_DEFAULT += -DUSE_SSE42
+CFLAGS_DEBUG += -DTIGHTDB_DEBUG -DMAX_LIST_SIZE=4
+CFLAGS_COVERAGE += -DTIGHTDB_DEBUG -DMAX_LIST_SIZE=4

config.mk-without-sse

@@ -0,0 +1,11 @@
+SOURCE_ROOT = src
+
+ifneq ($(CC_AND_CXX_ARE_GCC_LIKE),)
+CFLAGS_DEFAULT += -Wextra -ansi -pedantic -Wno-long-long
+# FIXME: '-fno-elide-constructors' currently causes TightDB to fail
+#CFLAGS_DEBUG += -fno-elide-constructors
+CFLAGS_PTHREAD += -pthread
+endif
+
+CFLAGS_DEBUG += -DTIGHTDB_DEBUG -DMAX_LIST_SIZE=4
+CFLAGS_COVERAGE += -DTIGHTDB_DEBUG -DMAX_LIST_SIZE=4

src/tightdb/alloc_slab.cpp

@@ -27,7 +27,6 @@ size_t GetSizeFromHeader(void* p)
  const size_t count = (header[1] << 16) + (header[2] << 8) + header[3];
  const size_t wt = (header[0] & 0x18) >> 3; // Array::WidthType
 
- // Calculate bytes used by array
  size_t bytes = 0;
  if (wt == 0) { // TDB_BITS
  const size_t bits = (count * width);