Ticket #385: v1.2.21-x64.patch

xapian-core/backends/brass/brass_database.cc

@@ -1106 +1106 @@
 {
     LOGCALL(DB, Xapian::docid, "BrassWritableDatabase::add_document", document);
     // Make sure the docid counter doesn't overflow.
-    if (stats.get_last_docid() == Xapian::docid(-1))
+    if (stats.get_last_docid() == 0xffffffff)
         throw Xapian::DatabaseError("Run out of docids - you'll have to use copydatabase to eliminate any gaps before you can add more documents");
     // Use the next unused document ID.
     RETURN(add_document_(stats.get_next_docid(), document));

xapian-core/backends/chert/chert_database.cc

@@ -1152 +1152 @@
 {
     LOGCALL(DB, Xapian::docid, "ChertWritableDatabase::add_document", document);
     // Make sure the docid counter doesn't overflow.
-    if (stats.get_last_docid() == Xapian::docid(-1))
+    if (stats.get_last_docid() == 0xffffffff)
         throw Xapian::DatabaseError("Run out of docids - you'll have to use copydatabase to eliminate any gaps before you can add more documents");
     // Use the next unused document ID.
     RETURN(add_document_(stats.get_next_docid(), document));

xapian-core/backends/flint/flint_database.cc

@@ -1127 +1127 @@
 {
     LOGCALL(DB, Xapian::docid, "FlintWritableDatabase::add_document", document);
     // Make sure the docid counter doesn't overflow.
-    if (lastdocid == Xapian::docid(-1))
+    if (lastdocid == 0xffffffff)
         throw Xapian::DatabaseError("Run out of docids - you'll have to use copydatabase to eliminate any gaps before you can add more documents");
     // Use the next unused document ID.
     RETURN(add_document_(++lastdocid, document));

xapian-core/common/pack.h

@@ -145 +145 @@
 {
     // Check U is an unsigned type.
     STATIC_ASSERT_UNSIGNED_TYPE(U);
-    STATIC_ASSERT(sizeof(U) <= SORTABLE_UINT_MAX_BYTES);
+    //STATIC_ASSERT(sizeof(U) <= SORTABLE_UINT_MAX_BYTES);
 
     char tmp[sizeof(U) + 1];
     char * p = tmp + sizeof(tmp);

xapian-core/include/xapian/types.h

@@ -21 +21 @@
 #ifndef XAPIAN_INCLUDED_TYPES_H
 #define XAPIAN_INCLUDED_TYPES_H
 
+#define USE_64BIT_DOCID 1
+#define USE_64BIT_TERMCOUNT 1
+
 namespace Xapian {
 
 /** A count of documents.
@@ -28 +31 @@
  *  This is used to hold values such as the number of documents in a database
  *  and the frequency of a term in the database.
  */
+#ifdef USE_64BIT_DOCID
+typedef unsigned long long doccount;
+#else
 typedef unsigned doccount;
+#endif
 
 /** A signed difference between two counts of documents.
  *
  *  This is used by the Xapian classes which are STL containers of documents
  *  for "difference_type".
  */
-typedef int doccount_diff; /* FIXME: can overflow with more than 2^31 docs. */
+/* FIXME: can overflow. */
+#ifdef USE_64BIT_DOCID
+typedef long long doccount_diff;
+#else
+typedef int doccount_diff;
+#endif
 
 /** A unique identifier for a document.
  *
  *  Docid 0 is invalid, providing an "out of range" value which can be
  *  used to mean "not a valid document".
  */
+#ifdef USE_64BIT_DOCID
+typedef unsigned long long docid;
+#else
 typedef unsigned docid;
+#endif
 
 /** A normalised document length.
  *
@@ -58 +74 @@
  *
  *  This is used to hold values such as the Within Document Frequency (wdf).
  */
+#ifdef USE_64BIT_TERMCOUNT
+typedef unsigned long long termcount;
+#else
 typedef unsigned termcount;
+#endif
 
 /** A signed difference between two counts of terms.
  *
  *  This is used by the Xapian classes which are STL containers of terms
  *  for "difference_type".
  */
-typedef int termcount_diff; /* FIXME: can overflow with more than 2^31 terms. */
+/* FIXME: can overflow. */
+#ifdef USE_64BIT_DOCID
+typedef long long termcount_diff;
+#else
+typedef int termcount_diff;
+#endif
 
 /** A term position within a document or query.
  */

xapian-core/net/remoteconnection.cc

@@ -489 +489 @@
     unsigned char ch;
     int shift = 0;
     do {
-        if (i == buffer.end() || shift > 28) {
+        if (i == buffer.end() || shift > 63) {
             // Something is very wrong...
             throw Xapian::NetworkError("Insane message length specified!");
         }

xapian-core/net/serialise.cc

@@ -51 +51 @@
         unsigned char ch;
         int shift = 0;
         do {
-            if (*p == end || shift > 28)
+            if (*p == end || shift > 63)
                 throw Xapian::NetworkError("Bad encoded length: insufficient data");
             ch = *(*p)++;
             len |= size_t(ch & 0x7f) << shift;

xapian-core/tests/api_wrdb.cc

@@ -1592 +1592 @@
     doc.set_data("prose");
     doc.add_term("word");
 
-    db.replace_document(Xapian::docid(-1), doc);
+    db.replace_document(0xffffffff, doc);
 
     TEST_EXCEPTION(Xapian::DatabaseError, db.add_document(doc));
 

xapian-core/tests/harness/testutils.cc

@@ -30 +30 @@
 
 using namespace std;
 
-ostream &
-operator<<(ostream &os, const vector<unsigned int> &ints)
+template<class T> ostream &
+operator<<(ostream &os, const vector<T> &ints)
 {
     copy(ints.begin(), ints.end(),
-         ostream_iterator<unsigned int>(os, ", "));
+            ostream_iterator<T>(os, ", "));
     return os;
 }
 

xapian-core/tests/harness/testutils.h

@@ -28 +28 @@
 // ######################################################################
 // Useful display operators
 
+template<class T>
 std::ostream &operator<<(std::ostream &os,
-                         const std::vector<unsigned int> &ints);
+                         const std::vector<T> &ints);
 
 // ######################################################################
 // Useful comparison operators