rename Native.Raw.cs -> Native.cs and auto-generate exception-throwing wrappers

Author: warrenfalk

RocksDbSharp/Native.Marshaled.cs

@@ -1171,5 +1171,26 @@ public void rocksdb_writebatch_wi_put_log_data(IntPtr writeBatch, byte[] blob, u
             rocksdb_writebatch_wi_put_log_data(writeBatch, blob, new UIntPtr(len));
         }
 
+        public byte[] rocksdb_iter_key(IntPtr iterator)
+        {
+            IntPtr buffer = rocksdb_iter_key(iterator, out UIntPtr length);
+            byte[] result = new byte[(int)length];
+            Marshal.Copy(buffer, result, 0, (int)length);
+            // Do not free, this is owned by the iterator and will be freed there
+            //rocksdb_free(buffer);
+            return result;
+        }
+
+        public byte[] rocksdb_iter_value(IntPtr iterator)
+        {
+            IntPtr buffer = rocksdb_iter_value(iterator, out UIntPtr length);
+            byte[] result = new byte[(int)length];
+            Marshal.Copy(buffer, result, 0, (int)length);
+            // Do not free, this is owned by the iterator and will be freed there
+            //rocksdb_free(buffer);
+            return result;
+        }
+
+
     }
 }

RocksDbSharp/Native.Wrap.cs

@@ -12,106 +12,13 @@ These wrappers provide translation from the error output of the C API into excep
     */
     public abstract partial class Native
     {
-        public IntPtr rocksdb_open(
-            /* const rocksdb_options_t* */ IntPtr options,
-            string name)
-        {
-            var result = rocksdb_open(options, name, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-            return result;
-        }
-
-        public IntPtr rocksdb_open_for_read_only(
-            /* const rocksdb_options_t* */ IntPtr options,
-            string name,
-            bool error_if_log_file_exists = false)
-        {
-            var result = rocksdb_open_for_read_only(options, name, error_if_log_file_exists, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-            return result;
-        }
-
-        public IntPtr rocksdb_open_with_ttl(
-            /* const rocksdb_options_t* */ IntPtr options,
-            string name,
-            int ttlSeconds)
-        {
-            var result = rocksdb_open_with_ttl(options, name, ttlSeconds, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-            return result;
-        }
-
-        public IntPtr rocksdb_open_column_families(
-            /* const rocksdb_options_t* */ IntPtr options,
-            string name,
-            int num_column_families,
-            string[] column_family_names,
-            IntPtr[] column_family_options,
-            IntPtr[] column_family_handles)
-        {
-            var result = rocksdb_open_column_families(options, name, num_column_families, column_family_names, column_family_options, column_family_handles, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-            return result;
-        }
-
-        public IntPtr rocksdb_open_for_read_only_column_families(
-            /* const rocksdb_options_t* */ IntPtr options,
-            string name,
-            int num_column_families,
-            string[] column_family_names,
-            IntPtr[] column_family_options,
-            IntPtr[] column_family_handles,
-            bool error_if_log_file_exists)
-        {
-            var result = rocksdb_open_for_read_only_column_families(options, name, num_column_families, column_family_names, column_family_options, column_family_handles, error_if_log_file_exists, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-            return result;
-        }
-
-        public /*(rocksdb_checkpoint_t*)*/ IntPtr rocksdb_checkpoint_object_create(
-            /*(rocksdb_t*)*/ IntPtr db)
-        {
-            var result = rocksdb_checkpoint_object_create(db, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-            return result;
-        }
-
-        public void rocksdb_checkpoint_create(
-            /*(rocksdb_checkpoint_t*)*/ IntPtr checkpoint,
-            /*(const char*)*/ string checkpoint_dir,
-            /*(uint64_t)*/ ulong log_size_for_flush)
-        {
-            rocksdb_checkpoint_create(checkpoint, checkpoint_dir, log_size_for_flush, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public IntPtr rocksdb_list_column_families(
-            /* const rocksdb_options_t* */ IntPtr options,
-            string name,
-            out ulong lencf
-            )
-        {
-            var result = rocksdb_list_column_families(options, name, out UIntPtr lencfValue, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-            lencf = (ulong)lencfValue;
-            return result;
-        }
-
         public void rocksdb_put(
             /*rocksdb_t**/ IntPtr db,
             /*const rocksdb_writeoptions_t**/ IntPtr writeOptions,
             string key,
             string val,
             ColumnFamilyHandle cf = null,
-            Encoding encoding = null)
+            System.Text.Encoding encoding = null)
         {
             rocksdb_put(db, writeOptions, key, val, out IntPtr errptr, cf, encoding);
             if (errptr != IntPtr.Zero)
@@ -144,7 +51,7 @@ public string rocksdb_get(
             /*const rocksdb_readoptions_t**/ IntPtr read_options,
             string key,
             ColumnFamilyHandle cf,
-            Encoding encoding = null)
+            System.Text.Encoding encoding = null)
         {
             var result = rocksdb_get(db, read_options, key, out IntPtr errptr, cf, encoding);
             if (errptr != IntPtr.Zero)
@@ -183,15 +90,15 @@ public byte[] rocksdb_get(
             return result;
         }
 
-        public KeyValuePair<string, string>[] rocksdb_multi_get(
+        public System.Collections.Generic.KeyValuePair<string, string>[] rocksdb_multi_get(
             IntPtr db,
             IntPtr read_options,
             string[] keys,
             ColumnFamilyHandle[] cf = null,
-            Encoding encoding = null)
+            System.Text.Encoding encoding = null)
         {
             if (encoding == null)
-                encoding = Encoding.UTF8;
+                encoding = System.Text.Encoding.UTF8;
             IntPtr[] errptrs = new IntPtr[keys.Length];
             var result = rocksdb_multi_get(db, read_options, keys, cf: cf, errptrs: errptrs, encoding: encoding);
             foreach (var errptr in errptrs)
@@ -201,7 +108,7 @@ public KeyValuePair<string, string>[] rocksdb_multi_get(
         }
 
 
-        public KeyValuePair<byte[], byte[]>[] rocksdb_multi_get(
+        public System.Collections.Generic.KeyValuePair<byte[], byte[]>[] rocksdb_multi_get(
             IntPtr db,
             IntPtr read_options,
             byte[][] keys,
@@ -251,109 +158,6 @@ public void rocksdb_delete_cf(
                 throw new RocksDbException(errptr);
         }
 
-        public void rocksdb_write(
-            /*rocksdb_t**/ IntPtr db,
-            /*const rocksdb_writeoptions_t**/ IntPtr writeOptions,
-            /*(rocksdb_writebatch_t*)*/ IntPtr writeBatch)
-        {
-            rocksdb_write(db, writeOptions, writeBatch, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_write_writebatch_wi(
-            /*rocksdb_t**/ IntPtr db,
-            /*const rocksdb_writeoptions_t**/ IntPtr writeOptions,
-            /*(rocksdb_writebatch_wi_t*)*/ IntPtr writeBatchWithIndex)
-        {
-            rocksdb_write_writebatch_wi(db, writeOptions, writeBatchWithIndex, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public byte[] rocksdb_iter_key(IntPtr iterator)
-        {
-            IntPtr buffer = rocksdb_iter_key(iterator, out UIntPtr length);
-            byte[] result = new byte[(int)length];
-            Marshal.Copy(buffer, result, 0, (int)length);
-            // Do not free, this is owned by the iterator and will be freed there
-            //rocksdb_free(buffer);
-            return result;
-        }
-
-        public byte[] rocksdb_iter_value(IntPtr iterator)
-        {
-            IntPtr buffer = rocksdb_iter_value(iterator, out UIntPtr length);
-            byte[] result = new byte[(int)length];
-            Marshal.Copy(buffer, result, 0, (int)length);
-            // Do not free, this is owned by the iterator and will be freed there
-            //rocksdb_free(buffer);
-            return result;
-        }
-
-        public IntPtr rocksdb_create_column_family(
-            /*rocksdb_t**/ IntPtr db,
-            /* const rocksdb_options_t* */ IntPtr column_family_options,
-            string column_family_name)
-        {
-            var result = rocksdb_create_column_family(db, column_family_options, column_family_name, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-            return result;
-        }
-
-        public void rocksdb_drop_column_family(
-            /*rocksdb_t**/ IntPtr db,
-            /*(rocksdb_column_family_handle_t*)*/ IntPtr column_family_handle
-            )
-        {
-            rocksdb_drop_column_family(db, column_family_handle, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_set_options(IntPtr db, int count, string[] keys, string[] values)
-        {
-            rocksdb_set_options(db, keys.Length, keys, values, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_sstfilewriter_open(IntPtr writer, string name)
-        {
-            rocksdb_sstfilewriter_open(writer, name, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_sstfilewriter_finish(IntPtr writer)
-        {
-            rocksdb_sstfilewriter_finish(writer, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_writebatch_rollback_to_save_point(IntPtr writeBatch)
-        {
-            rocksdb_writebatch_rollback_to_save_point(writeBatch, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_writebatch_pop_save_point(IntPtr writeBatch)
-        {
-            rocksdb_writebatch_pop_save_point(writeBatch, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_writebatch_wi_rollback_to_save_point(IntPtr writeBatch)
-        {
-            rocksdb_writebatch_wi_rollback_to_save_point(writeBatch, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
         public void rocksdb_ingest_external_file(IntPtr db, string[] file_list, ulong list_len, IntPtr opt)
         {
             UIntPtr llen = (UIntPtr)list_len;
@@ -370,20 +174,6 @@ public void rocksdb_ingest_external_file_cf(IntPtr db, IntPtr handle, string[] f
                 throw new RocksDbException(errptr);
         }
 
-        public unsafe void rocksdb_sstfilewriter_add(
-            IntPtr writer,
-            byte* key,
-            ulong keylen,
-            byte* val,
-            ulong vallen)
-        {
-            UIntPtr sklength = (UIntPtr)keylen;
-            UIntPtr svlength = (UIntPtr)vallen;
-            rocksdb_sstfilewriter_add(writer, key, sklength, val, svlength, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
         public unsafe void rocksdb_sstfilewriter_add(
             IntPtr writer,
             byte[] key,
@@ -410,46 +200,12 @@ public unsafe void rocksdb_sstfilewriter_add(
                 throw new RocksDbException(errptr);
         }
 
-        public void rocksdb_sstfilewriter_put(
-            /*(rocksdb_sstfilewriter_t*)*/ IntPtr writer,
-            /*(const char*)*/ byte[] key,
-            size_t keylen,
-            /*(const char*)*/ byte[] val,
-            size_t vallen)
-        {
-            rocksdb_sstfilewriter_put(writer, key, keylen, val, vallen, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_sstfilewriter_merge(
-            /*(rocksdb_sstfilewriter_t*)*/ IntPtr writer,
-            /*(const char*)*/ byte[] key,
-            size_t keylen,
-            /*(const char*)*/ byte[] val,
-            size_t vallen)
-        {
-            rocksdb_sstfilewriter_merge(writer, key, keylen, val, vallen, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
-        public void rocksdb_sstfilewriter_delete(
-            /*(rocksdb_sstfilewriter_t*)*/ IntPtr writer,
-            /*(const char*)*/ byte[] key,
-            size_t keylen)
-        {
-            rocksdb_sstfilewriter_delete(writer, key, keylen, out IntPtr errptr);
-            if (errptr != IntPtr.Zero)
-                throw new RocksDbException(errptr);
-        }
-
         public string rocksdb_writebatch_wi_get_from_batch(
             IntPtr wb,
             IntPtr options,
             string key,
             ColumnFamilyHandle cf,
-            Encoding encoding = null)
+            System.Text.Encoding encoding = null)
         {
             var result = rocksdb_writebatch_wi_get_from_batch(wb, options, key, out IntPtr errptr, cf, encoding);
             if (errptr != IntPtr.Zero)
@@ -494,7 +250,7 @@ public string rocksdb_writebatch_wi_get_from_batch_and_db(
             IntPtr read_options,
             string key,
             ColumnFamilyHandle cf,
-            Encoding encoding = null)
+            System.Text.Encoding encoding = null)
         {
             var result = rocksdb_writebatch_wi_get_from_batch_and_db(wb, db, read_options, key, out IntPtr errptr, cf, encoding);
             if (errptr != IntPtr.Zero)