Ticket #385: v1.3.3-x64.patch

xapian-bindings/java/SmokeTest.java

@@ -74 +74 @@
             // FIXME: was WritableDatabase db = Xapian.InMemory.open();
             WritableDatabase db = InMemory.open();
             db.addDocument(doc);
-            if (db.getDocCount() != 1) {
-                System.err.println("Unexpected db.getDocCount()");
+            if (!db.getDocCount().equals(java.math.BigInteger.valueOf(1))) {
+                System.err.println("Unexpected db.getDocCount(): " + db.getDocCount().toString());
                 System.exit(1);
             }
 
@@ -109 +109 @@
             }
             Enquire enq = new Enquire(db);
             enq.setQuery(new Query(Query.OP_OR, "there", "is"));
-            MSet mset = enq.getMSet(0, 10);
-            if (mset.size() != 1) {
-                System.err.println("Unexpected mset.size()");
+            MSet mset = enq.getMSet(java.math.BigInteger.valueOf(0), java.math.BigInteger.valueOf(10));
+            if (!mset.size().equals(java.math.BigInteger.valueOf(1))) {
+                System.err.println("Unexpected mset.size(): " + mset.size().toString());
                 System.exit(1);
             }
             MSetIterator m_itor = mset.begin();
             Document m_doc = null;
-            long m_id;
+            java.math.BigInteger m_id;
             while(m_itor.hasNext()) {
                 m_id = m_itor.next();
                 if(m_itor.hasNext()) {
@@ -125 +125 @@
             }
 
             // Only one doc exists in this mset
-            if(m_doc != null && m_doc.getDocId() != 0) {
+            if(m_doc != null && m_doc.getDocId() != java.math.BigInteger.valueOf(0)) {
                 System.err.println("Unexpected docid");
                     System.exit(1);
             }
 
             String term_str = "";
-            TermIterator itor = enq.getMatchingTermsBegin(mset.getElement(0));
+            TermIterator itor = enq.getMatchingTermsBegin(mset.getElement(java.math.BigInteger.valueOf(0)));
             while (itor.hasNext()) {
                 term_str += itor.next();
                 if (itor.hasNext())
@@ -162 +162 @@
             }
 */
             RSet rset = new RSet();
-            rset.addDocument(1);
-            ESet eset = enq.getESet(10, rset, new MyExpandDecider());
+            rset.addDocument(java.math.BigInteger.valueOf(1));
+            ESet eset = enq.getESet(java.math.BigInteger.valueOf(10), rset, new MyExpandDecider());
             // FIXME: temporary simple check
-            if (0 == eset.size()) {
+            if (java.math.BigInteger.valueOf(0).equals(eset.size())) {
                 System.err.println("ESet.size() was 0");
                 System.exit(1);
             }
 
-            int count = 0;
+            java.math.BigInteger count = java.math.BigInteger.valueOf(0);
             for(ESetIterator eit = eset.begin(); eit.hasNext(); ) {
             // for (int i = 0; i < eset.size(); i++) {
                 if (eit.getTerm().charAt(0) == 'a') {
                     System.err.println("MyExpandDecider wasn't used");
                     System.exit(1);
                 }
-                ++count;
+                count = count.add(java.math.BigInteger.valueOf(1));
                 eit.next();
             }
-            if (count != eset.size()) {
+            if (!count.equals(eset.size())) {
                 System.err.println("ESet.size() mismatched number of terms returned by ESetIterator");
                 System.err.println(count + " " + eset.size());
                 System.exit(1);

xapian-core/api/snipper.cc

@@ -61 +61 @@
 }
 
 void
-Snipper::set_mset(const MSet & mset, unsigned int rm_docno)
+Snipper::set_mset(const MSet & mset, Xapian::doccount rm_docno)
 {
     internal->calculate_rm(mset, rm_docno);
 }
@@ -69 +69 @@
 string
 Snipper::generate_snippet(const string & text,
                           size_t length,
-                          unsigned int window_size,
+                          Xapian::termcount window_size,
                           double smoothing)
 {
     return internal->generate_snippet(text, length, window_size, smoothing);

xapian-core/api/snipperinternal.h

@@ -120 +120 @@
         /** Return snippet generated from text using the precalculated relevance model */
         std::string generate_snippet(const std::string & text,
                                      size_t length,
-                                     unsigned int window_size,
+                                     Xapian::termcount window_size,
                                      double smoothing);
 
         /** Calculate relevance model based on a MSet.

xapian-core/backends/chert/chert_database.cc

@@ -1145 +1145 @@
 {
     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() == CHERT_MAX_DOCID)
         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_types.h

@@ -55 +55 @@
  *  correspondingly.
  */
 #define CHERT_DEFAULT_BLOCK_SIZE 8192
+#define CHERT_MAX_DOCID 0xffffffff
 
 #endif /* OM_HGUARD_CHERT_TYPES_H */

xapian-core/backends/glass/glass_database.cc

@@ -989 +989 @@
 {
     LOGCALL(DB, Xapian::docid, "GlassWritableDatabase::add_document", document);
     // Make sure the docid counter doesn't overflow.
-    if (stats.get_last_docid() == Xapian::docid(-1))
+    if (stats.get_last_docid() == GLASS_MAX_DOCID)
         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/glass/glass_defs.h

@@ -28 +28 @@
 
 /// Default B-tree block size.
 #define GLASS_DEFAULT_BLOCKSIZE 8192
+#define GLASS_MAX_DOCID 0xffffffff
 
 namespace Glass {
     enum table_type {

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,
-                  "Template type U too wide for database format");
+//static_assert(sizeof(U) <= SORTABLE_UINT_MAX_BYTES,
+//                "Template type U too wide for database format");
 
     char tmp[sizeof(U) + 1];
     char * p = tmp + sizeof(tmp);

xapian-core/include/xapian/types.h

@@ -27 +27 @@
 
 #include <xapian/deprecated.h>
 
+#define USE_64BIT_DOCID 1
+#define USE_64BIT_TERMCOUNT 1
+
 namespace Xapian {
 
 /** A count of documents.
@@ -34 +37 @@
  *  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.
  *
@@ -68 +84 @@
  *
  *  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/length.cc

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

xapian-core/tests/api_wrdb.cc

@@ -1615 +1615 @@
     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

@@ -29 +29 @@
 // ######################################################################
 // 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