roaring 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,17 @@
1
+ #ifndef ROARING_RUBY_H
2
+ #define ROARING_RUBY_H
3
+
4
+ #include <ruby.h>
5
+
6
+ #include "roaring.h"
7
+
8
+ #ifndef RBOOL
9
+ #define RBOOL(x) ((x) ? Qtrue : Qfalse)
10
+ #endif
11
+
12
+ extern VALUE rb_mRoaring;
13
+
14
+ void rb_roaring32_init();
15
+ void rb_roaring64_init();
16
+
17
+ #endif
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Roaring
4
- VERSION = "0.2.0"
4
+ VERSION = "0.3.0"
5
5
  end
data/lib/roaring.rb CHANGED
@@ -7,31 +7,60 @@ require "set"
7
7
  module Roaring
8
8
  class Error < StandardError; end
9
9
 
10
- class Bitmap
11
- include Enumerable
10
+ module BitmapCommon
11
+ def self.included(base)
12
+ super
13
+
14
+ base.extend ClassMethods
15
+
16
+ base.alias_method :size, :cardinality
17
+ base.alias_method :length, :cardinality
18
+ base.alias_method :count, :cardinality
19
+
20
+ base.alias_method :+, :|
21
+ base.alias_method :union, :|
22
+ base.alias_method :intersection, :&
23
+ base.alias_method :difference, :-
12
24
 
13
- alias size cardinality
14
- alias length cardinality
15
- alias count cardinality
25
+ base.alias_method :delete, :remove
26
+ base.alias_method :delete?, :remove?
16
27
 
17
- alias + |
18
- alias union |
19
- alias intersection &
20
- alias difference -
28
+ base.alias_method :first, :min
29
+ base.alias_method :last, :max
21
30
 
22
- alias delete remove
23
- alias delete? remove?
31
+ base.alias_method :eql?, :==
24
32
 
25
- alias first min
26
- alias last max
33
+ base.alias_method :===, :include?
27
34
 
28
- alias === include?
35
+ base.alias_method :subset?, :<=
36
+ base.alias_method :proper_subset?, :<
37
+ base.alias_method :superset?, :>=
38
+ base.alias_method :proper_superset?, :>
39
+ end
40
+
41
+ module ClassMethods
42
+ def [](*args)
43
+ if args.size == 0
44
+ new
45
+ elsif args.size == 1 && !(Integer === args[0])
46
+ new(args[0])
47
+ else
48
+ new(args)
49
+ end
50
+ end
51
+
52
+ def _load args
53
+ deserialize(args)
54
+ end
55
+ end
56
+
57
+ include Enumerable
29
58
 
30
59
  def initialize(enum = nil)
31
60
  return unless enum
32
61
 
33
- if enum.instance_of?(Roaring::Bitmap)
34
- initialize_copy(enum)
62
+ if enum.instance_of?(self.class)
63
+ replace(enum)
35
64
  else
36
65
  enum.each { |x| self << x }
37
66
  end
@@ -41,21 +70,8 @@ module Roaring
41
70
  to_a.hash
42
71
  end
43
72
 
44
- alias eql? ==
45
-
46
- def replace(other)
47
- # FIXME: this should probably be initialize_copy and replace should be in C
48
- initialize_copy(other)
49
- end
50
-
51
- def self.[](*args)
52
- if args.size == 0
53
- new
54
- elsif args.size == 1 && !(Integer === args[0])
55
- new(args[0])
56
- else
57
- new(args)
58
- end
73
+ def initialize_copy(other)
74
+ replace(other)
59
75
  end
60
76
 
61
77
  def >(other)
@@ -66,11 +82,6 @@ module Roaring
66
82
  other <= self
67
83
  end
68
84
 
69
- alias subset? <=
70
- alias proper_subset? <
71
- alias superset? >=
72
- alias proper_superset? >
73
-
74
85
  def <=>(other)
75
86
  if self == other
76
87
  0
@@ -91,10 +102,6 @@ module Roaring
91
102
  serialize
92
103
  end
93
104
 
94
- def self._load args
95
- deserialize(args)
96
- end
97
-
98
105
  def to_a
99
106
  map(&:itself)
100
107
  end
@@ -112,4 +119,20 @@ module Roaring
112
119
  end
113
120
  end
114
121
  end
122
+
123
+ class Bitmap32
124
+ include BitmapCommon
125
+
126
+ MIN = 0
127
+ MAX = (2**32) - 1
128
+ RANGE = MIN..MAX
129
+ end
130
+
131
+ class Bitmap64
132
+ include BitmapCommon
133
+
134
+ MIN = 0
135
+ MAX = (2**64) - 1
136
+ RANGE = MIN..MAX
137
+ end
115
138
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: roaring
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Hawthorn
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-02-11 00:00:00.000000000 Z
11
+ date: 2024-06-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: prime
@@ -38,13 +38,13 @@ files:
38
38
  - LICENSE.txt
39
39
  - README.md
40
40
  - Rakefile
41
+ - ext/roaring/bitmap32.c
42
+ - ext/roaring/bitmap64.c
41
43
  - ext/roaring/cext.c
42
44
  - ext/roaring/extconf.rb
43
- - ext/roaring/roaring/LICENSE
44
- - ext/roaring/roaring/README.md
45
- - ext/roaring/roaring/roaring.c
46
- - ext/roaring/roaring/roaring.h
47
- - ext/roaring/roaring/roaring.hh
45
+ - ext/roaring/roaring.c
46
+ - ext/roaring/roaring.h
47
+ - ext/roaring/roaring_ruby.h
48
48
  - lib/roaring.rb
49
49
  - lib/roaring/version.rb
50
50
  - roaring.gemspec
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
71
71
  - !ruby/object:Gem::Version
72
72
  version: '0'
73
73
  requirements: []
74
- rubygems_version: 3.4.6
74
+ rubygems_version: 3.5.9
75
75
  signing_key:
76
76
  specification_version: 4
77
77
  summary: Roaring bitmaps for Ruby
@@ -1,235 +0,0 @@
1
- The CRoaring project is under a dual license (Apache/MIT).
2
- Users of the library may choose one or the other license.
3
-
4
- ------------------
5
-
6
- Apache License
7
- Version 2.0, January 2004
8
- http://www.apache.org/licenses/
9
-
10
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
11
-
12
- 1. Definitions.
13
-
14
- "License" shall mean the terms and conditions for use, reproduction,
15
- and distribution as defined by Sections 1 through 9 of this document.
16
-
17
- "Licensor" shall mean the copyright owner or entity authorized by
18
- the copyright owner that is granting the License.
19
-
20
- "Legal Entity" shall mean the union of the acting entity and all
21
- other entities that control, are controlled by, or are under common
22
- control with that entity. For the purposes of this definition,
23
- "control" means (i) the power, direct or indirect, to cause the
24
- direction or management of such entity, whether by contract or
25
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
26
- outstanding shares, or (iii) beneficial ownership of such entity.
27
-
28
- "You" (or "Your") shall mean an individual or Legal Entity
29
- exercising permissions granted by this License.
30
-
31
- "Source" form shall mean the preferred form for making modifications,
32
- including but not limited to software source code, documentation
33
- source, and configuration files.
34
-
35
- "Object" form shall mean any form resulting from mechanical
36
- transformation or translation of a Source form, including but
37
- not limited to compiled object code, generated documentation,
38
- and conversions to other media types.
39
-
40
- "Work" shall mean the work of authorship, whether in Source or
41
- Object form, made available under the License, as indicated by a
42
- copyright notice that is included in or attached to the work
43
- (an example is provided in the Appendix below).
44
-
45
- "Derivative Works" shall mean any work, whether in Source or Object
46
- form, that is based on (or derived from) the Work and for which the
47
- editorial revisions, annotations, elaborations, or other modifications
48
- represent, as a whole, an original work of authorship. For the purposes
49
- of this License, Derivative Works shall not include works that remain
50
- separable from, or merely link (or bind by name) to the interfaces of,
51
- the Work and Derivative Works thereof.
52
-
53
- "Contribution" shall mean any work of authorship, including
54
- the original version of the Work and any modifications or additions
55
- to that Work or Derivative Works thereof, that is intentionally
56
- submitted to Licensor for inclusion in the Work by the copyright owner
57
- or by an individual or Legal Entity authorized to submit on behalf of
58
- the copyright owner. For the purposes of this definition, "submitted"
59
- means any form of electronic, verbal, or written communication sent
60
- to the Licensor or its representatives, including but not limited to
61
- communication on electronic mailing lists, source code control systems,
62
- and issue tracking systems that are managed by, or on behalf of, the
63
- Licensor for the purpose of discussing and improving the Work, but
64
- excluding communication that is conspicuously marked or otherwise
65
- designated in writing by the copyright owner as "Not a Contribution."
66
-
67
- "Contributor" shall mean Licensor and any individual or Legal Entity
68
- on behalf of whom a Contribution has been received by Licensor and
69
- subsequently incorporated within the Work.
70
-
71
- 2. Grant of Copyright License. Subject to the terms and conditions of
72
- this License, each Contributor hereby grants to You a perpetual,
73
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
74
- copyright license to reproduce, prepare Derivative Works of,
75
- publicly display, publicly perform, sublicense, and distribute the
76
- Work and such Derivative Works in Source or Object form.
77
-
78
- 3. Grant of Patent License. Subject to the terms and conditions of
79
- this License, each Contributor hereby grants to You a perpetual,
80
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
81
- (except as stated in this section) patent license to make, have made,
82
- use, offer to sell, sell, import, and otherwise transfer the Work,
83
- where such license applies only to those patent claims licensable
84
- by such Contributor that are necessarily infringed by their
85
- Contribution(s) alone or by combination of their Contribution(s)
86
- with the Work to which such Contribution(s) was submitted. If You
87
- institute patent litigation against any entity (including a
88
- cross-claim or counterclaim in a lawsuit) alleging that the Work
89
- or a Contribution incorporated within the Work constitutes direct
90
- or contributory patent infringement, then any patent licenses
91
- granted to You under this License for that Work shall terminate
92
- as of the date such litigation is filed.
93
-
94
- 4. Redistribution. You may reproduce and distribute copies of the
95
- Work or Derivative Works thereof in any medium, with or without
96
- modifications, and in Source or Object form, provided that You
97
- meet the following conditions:
98
-
99
- (a) You must give any other recipients of the Work or
100
- Derivative Works a copy of this License; and
101
-
102
- (b) You must cause any modified files to carry prominent notices
103
- stating that You changed the files; and
104
-
105
- (c) You must retain, in the Source form of any Derivative Works
106
- that You distribute, all copyright, patent, trademark, and
107
- attribution notices from the Source form of the Work,
108
- excluding those notices that do not pertain to any part of
109
- the Derivative Works; and
110
-
111
- (d) If the Work includes a "NOTICE" text file as part of its
112
- distribution, then any Derivative Works that You distribute must
113
- include a readable copy of the attribution notices contained
114
- within such NOTICE file, excluding those notices that do not
115
- pertain to any part of the Derivative Works, in at least one
116
- of the following places: within a NOTICE text file distributed
117
- as part of the Derivative Works; within the Source form or
118
- documentation, if provided along with the Derivative Works; or,
119
- within a display generated by the Derivative Works, if and
120
- wherever such third-party notices normally appear. The contents
121
- of the NOTICE file are for informational purposes only and
122
- do not modify the License. You may add Your own attribution
123
- notices within Derivative Works that You distribute, alongside
124
- or as an addendum to the NOTICE text from the Work, provided
125
- that such additional attribution notices cannot be construed
126
- as modifying the License.
127
-
128
- You may add Your own copyright statement to Your modifications and
129
- may provide additional or different license terms and conditions
130
- for use, reproduction, or distribution of Your modifications, or
131
- for any such Derivative Works as a whole, provided Your use,
132
- reproduction, and distribution of the Work otherwise complies with
133
- the conditions stated in this License.
134
-
135
- 5. Submission of Contributions. Unless You explicitly state otherwise,
136
- any Contribution intentionally submitted for inclusion in the Work
137
- by You to the Licensor shall be under the terms and conditions of
138
- this License, without any additional terms or conditions.
139
- Notwithstanding the above, nothing herein shall supersede or modify
140
- the terms of any separate license agreement you may have executed
141
- with Licensor regarding such Contributions.
142
-
143
- 6. Trademarks. This License does not grant permission to use the trade
144
- names, trademarks, service marks, or product names of the Licensor,
145
- except as required for reasonable and customary use in describing the
146
- origin of the Work and reproducing the content of the NOTICE file.
147
-
148
- 7. Disclaimer of Warranty. Unless required by applicable law or
149
- agreed to in writing, Licensor provides the Work (and each
150
- Contributor provides its Contributions) on an "AS IS" BASIS,
151
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
152
- implied, including, without limitation, any warranties or conditions
153
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
154
- PARTICULAR PURPOSE. You are solely responsible for determining the
155
- appropriateness of using or redistributing the Work and assume any
156
- risks associated with Your exercise of permissions under this License.
157
-
158
- 8. Limitation of Liability. In no event and under no legal theory,
159
- whether in tort (including negligence), contract, or otherwise,
160
- unless required by applicable law (such as deliberate and grossly
161
- negligent acts) or agreed to in writing, shall any Contributor be
162
- liable to You for damages, including any direct, indirect, special,
163
- incidental, or consequential damages of any character arising as a
164
- result of this License or out of the use or inability to use the
165
- Work (including but not limited to damages for loss of goodwill,
166
- work stoppage, computer failure or malfunction, or any and all
167
- other commercial damages or losses), even if such Contributor
168
- has been advised of the possibility of such damages.
169
-
170
- 9. Accepting Warranty or Additional Liability. While redistributing
171
- the Work or Derivative Works thereof, You may choose to offer,
172
- and charge a fee for, acceptance of support, warranty, indemnity,
173
- or other liability obligations and/or rights consistent with this
174
- License. However, in accepting such obligations, You may act only
175
- on Your own behalf and on Your sole responsibility, not on behalf
176
- of any other Contributor, and only if You agree to indemnify,
177
- defend, and hold each Contributor harmless for any liability
178
- incurred by, or claims asserted against, such Contributor by reason
179
- of your accepting any such warranty or additional liability.
180
-
181
- END OF TERMS AND CONDITIONS
182
-
183
- APPENDIX: How to apply the Apache License to your work.
184
-
185
- To apply the Apache License to your work, attach the following
186
- boilerplate notice, with the fields enclosed by brackets "{}"
187
- replaced with your own identifying information. (Don't include
188
- the brackets!) The text should be enclosed in the appropriate
189
- comment syntax for the file format. We also recommend that a
190
- file or class name and description of purpose be included on the
191
- same "printed page" as the copyright notice for easier
192
- identification within third-party archives.
193
-
194
- Copyright 2016-2022 The CRoaring authors
195
-
196
- Licensed under the Apache License, Version 2.0 (the "License");
197
- you may not use this file except in compliance with the License.
198
- You may obtain a copy of the License at
199
-
200
- http://www.apache.org/licenses/LICENSE-2.0
201
-
202
- Unless required by applicable law or agreed to in writing, software
203
- distributed under the License is distributed on an "AS IS" BASIS,
204
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
205
- See the License for the specific language governing permissions and
206
- limitations under the License.
207
-
208
- -----------------------------------
209
-
210
- MIT License
211
-
212
- Copyright 2016-2022 The CRoaring authors
213
-
214
- Permission is hereby granted, free of charge, to any
215
- person obtaining a copy of this software and associated
216
- documentation files (the "Software"), to deal in the
217
- Software without restriction, including without
218
- limitation the rights to use, copy, modify, merge,
219
- publish, distribute, sublicense, and/or sell copies of
220
- the Software, and to permit persons to whom the Software
221
- is furnished to do so, subject to the following
222
- conditions:
223
-
224
- The above copyright notice and this permission notice
225
- shall be included in all copies or substantial portions
226
- of the Software.
227
-
228
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
229
- ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
230
- TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
231
- PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
232
- SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
233
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
234
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
235
- IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
@@ -1,42 +0,0 @@
1
- # CRoaringUnityBuild
2
- Dumps of CRoaring unity builds (for convenience)
3
-
4
- This code is automatically generated from https://github.com/RoaringBitmap/CRoaring
5
-
6
- ## Building
7
-
8
- ```bash
9
- echo -e "#include <roaring.hh>\n int main(){Roaring x;}" > test.cpp && cc -c roaring.c -I. -std=c11 && c++ -o test test.cpp roaring.o -I. -std=c++11
10
- ```
11
-
12
- You need to compile and link `roaring.c` with your project: this is not a header-only build.
13
-
14
- ## Usage (C)
15
-
16
- ```C
17
- #include <stdio.h>
18
- #include "roaring.c"
19
- int main() {
20
- roaring_bitmap_t *r1 = roaring_bitmap_create();
21
- for (uint32_t i = 100; i < 1000; i++) roaring_bitmap_add(r1, i);
22
- printf("cardinality = %d\n", (int) roaring_bitmap_get_cardinality(r1));
23
- roaring_bitmap_free(r1);
24
- return 0;
25
- }
26
- ```
27
- ## Usage (C++)
28
-
29
-
30
- ```C++
31
- #include <iostream>
32
- #include "roaring.hh"
33
- #include "roaring.c"
34
- int main() {
35
- Roaring r1;
36
- for (uint32_t i = 100; i < 1000; i++) {
37
- r1.add(i);
38
- }
39
- std::cout << "cardinality = " << r1.cardinality() << std::endl;
40
-  return 0;
41
- }
42
- ```