Skip to content

Commit fc8921d

Browse files
author
Thomas Rega
committed
Version 1.0.3.0
Now using Thrift 0.11.0. Also updating Castle, and log4net.
1 parent 2b8b9ca commit fc8921d

33 files changed

+493
-357
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.vs/*
2+
*/bin/*
3+
*/obj/*
4+
bin/*

Acknowledgements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This project uses apache thrift's thrift-0.8.0.exe in unison with hbase.thrift to autogenerate the low-level hbase thrift client. (see: http://archive.apache.org/dist/thrift/0.8.0/; http://svn.apache.org/viewvc/hbase/trunk/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/)
1+
This project uses apache thrift's thrift-0.11.0.exe in unison with hbase.thrift to autogenerate the low-level hbase thrift client. (see: http://archive.apache.org/dist/thrift/0.11.0/; http://svn.apache.org/viewvc/hbase/trunk/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/)
22

33
This project uses apache thrift's thrift.dll to communicate with HBase. (see: http://wiki.apache.org/thrift/ThriftUsageCSharp)
44

HBase.NET/Hbase.thrift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232

3333
namespace java org.apache.hadoop.hbase.thrift.generated
3434
namespace cpp apache.hadoop.hbase.thrift
35+
namespace csharp Hbase
3536
namespace rb Apache.Hadoop.Hbase.Thrift
3637
namespace py hbase
3738
namespace perl Hbase
3839
namespace php Hbase
39-
namespace csharp Hbase
4040
//
4141
// Types
4242
//
@@ -76,7 +76,7 @@ struct ColumnDescriptor {
7676
6:i32 bloomFilterVectorSize = 0,
7777
7:i32 bloomFilterNbHashes = 0,
7878
8:bool blockCacheEnabled = 0,
79-
9:i32 timeToLive = -1
79+
9:i32 timeToLive = 0x7fffffff
8080
}
8181

8282
/**

HBase.NET/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
[assembly: AssemblyConfiguration("")]
2525
[assembly: AssemblyCompany("")]
2626
[assembly: AssemblyProduct("HBase.NET")]
27-
[assembly: AssemblyCopyright("Copyright © 2012 CareerBuilder, LLC")]
27+
[assembly: AssemblyCopyright("Copyright © 2017 CareerBuilder, LLC")]
2828
[assembly: AssemblyTrademark("")]
2929
[assembly: AssemblyCulture("")]
3030

@@ -49,5 +49,5 @@
4949
// You can specify all the values or you can default the Build and Revision Numbers
5050
// by using the '*' as shown below:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("1.0.2.3")]
53-
[assembly: AssemblyFileVersion("1.0.2.3")]
52+
[assembly: AssemblyVersion("1.0.3.0")]
53+
[assembly: AssemblyFileVersion("1.0.3.0")]

HBase.NET/Thrift License.txt

Lines changed: 8 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -216,69 +216,6 @@ Portions of the following files are licensed under the MIT License:
216216

217217
Please see doc/otp-base-license.txt for the full terms of this license.
218218

219-
220-
--------------------------------------------------
221-
The following files contain some portions of code contributed under
222-
the Thrift Software License (see doc/old-thrift-license.txt), and relicensed
223-
under the Apache 2.0 License:
224-
225-
compiler/cpp/Makefile.am
226-
compiler/cpp/src/generate/t_cocoa_generator.cc
227-
compiler/cpp/src/generate/t_cpp_generator.cc
228-
compiler/cpp/src/generate/t_csharp_generator.cc
229-
compiler/cpp/src/generate/t_erl_generator.cc
230-
compiler/cpp/src/generate/t_hs_generator.cc
231-
compiler/cpp/src/generate/t_java_generator.cc
232-
compiler/cpp/src/generate/t_ocaml_generator.cc
233-
compiler/cpp/src/generate/t_perl_generator.cc
234-
compiler/cpp/src/generate/t_php_generator.cc
235-
compiler/cpp/src/generate/t_py_generator.cc
236-
compiler/cpp/src/generate/t_rb_generator.cc
237-
compiler/cpp/src/generate/t_st_generator.cc
238-
compiler/cpp/src/generate/t_xsd_generator.cc
239-
compiler/cpp/src/main.cc
240-
compiler/cpp/src/parse/t_field.h
241-
compiler/cpp/src/parse/t_program.h
242-
compiler/cpp/src/platform.h
243-
compiler/cpp/src/thriftl.ll
244-
compiler/cpp/src/thrifty.yy
245-
lib/csharp/src/Protocol/TBinaryProtocol.cs
246-
lib/csharp/src/Protocol/TField.cs
247-
lib/csharp/src/Protocol/TList.cs
248-
lib/csharp/src/Protocol/TMap.cs
249-
lib/csharp/src/Protocol/TMessage.cs
250-
lib/csharp/src/Protocol/TMessageType.cs
251-
lib/csharp/src/Protocol/TProtocol.cs
252-
lib/csharp/src/Protocol/TProtocolException.cs
253-
lib/csharp/src/Protocol/TProtocolFactory.cs
254-
lib/csharp/src/Protocol/TProtocolUtil.cs
255-
lib/csharp/src/Protocol/TSet.cs
256-
lib/csharp/src/Protocol/TStruct.cs
257-
lib/csharp/src/Protocol/TType.cs
258-
lib/csharp/src/Server/TServer.cs
259-
lib/csharp/src/Server/TSimpleServer.cs
260-
lib/csharp/src/Server/TThreadPoolServer.cs
261-
lib/csharp/src/TApplicationException.cs
262-
lib/csharp/src/Thrift.csproj
263-
lib/csharp/src/Thrift.sln
264-
lib/csharp/src/TProcessor.cs
265-
lib/csharp/src/Transport/TServerSocket.cs
266-
lib/csharp/src/Transport/TServerTransport.cs
267-
lib/csharp/src/Transport/TSocket.cs
268-
lib/csharp/src/Transport/TStreamTransport.cs
269-
lib/csharp/src/Transport/TTransport.cs
270-
lib/csharp/src/Transport/TTransportException.cs
271-
lib/csharp/src/Transport/TTransportFactory.cs
272-
lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
273-
lib/csharp/ThriftMSBuildTask/ThriftBuild.cs
274-
lib/csharp/ThriftMSBuildTask/ThriftMSBuildTask.csproj
275-
lib/rb/lib/thrift.rb
276-
lib/st/README
277-
lib/st/thrift.st
278-
test/OptionalRequiredTest.cpp
279-
test/OptionalRequiredTest.thrift
280-
test/ThriftTest.thrift
281-
282219
--------------------------------------------------
283220
For the aclocal/ax_boost_base.m4 and contrib/fb303/aclocal/ax_boost_base.m4 components:
284221

@@ -289,36 +226,14 @@ For the aclocal/ax_boost_base.m4 and contrib/fb303/aclocal/ax_boost_base.m4 comp
289226
# the copyright notice and this notice are preserved.
290227

291228
--------------------------------------------------
292-
For the compiler/cpp/src/md5.[ch] components:
229+
For the lib/nodejs/lib/thrift/json_parse.js:
293230

294231
/*
295-
Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
296-
297-
This software is provided 'as-is', without any express or implied
298-
warranty. In no event will the authors be held liable for any damages
299-
arising from the use of this software.
300-
301-
Permission is granted to anyone to use this software for any purpose,
302-
including commercial applications, and to alter it and redistribute it
303-
freely, subject to the following restrictions:
232+
json_parse.js
233+
2015-05-02
234+
Public Domain.
235+
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
304236

305-
1. The origin of this software must not be misrepresented; you must not
306-
claim that you wrote the original software. If you use this software
307-
in a product, an acknowledgment in the product documentation would be
308-
appreciated but is not required.
309-
2. Altered source versions must be plainly marked as such, and must not be
310-
misrepresented as being the original software.
311-
3. This notice may not be removed or altered from any source distribution.
312-
313-
L. Peter Deutsch
314-
ghost@aladdin.com
315-
316-
*/
317-
318-
---------------------------------------------------
319-
For the lib/rb/setup.rb: Copyright (c) 2000-2005 Minero Aoki,
320-
lib/ocaml/OCamlMakefile and lib/ocaml/README-OCamlMakefile components:
321-
Copyright (C) 1999 - 2007 Markus Mottl
322-
323-
Licensed under the terms of the GNU Lesser General Public License 2.1
324-
(see doc/lgpl-2.1.txt for the full terms of this license)
237+
*/
238+
(By Douglas Crockford <douglas@crockford.com>)
239+
--------------------------------------------------

HBase.NET/autogenerate.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Copyright 2012 CareerBuilder, LLC. - http://www.careerbuilder.com
1+
:: Copyright 2017 CareerBuilder, LLC. - http://www.careerbuilder.com
22

33
:: Licensed under the Apache License, Version 2.0 (the "License");
44
:: you may not use this file except in compliance with the License.
@@ -12,4 +12,4 @@
1212
:: See the License for the specific language governing permissions and
1313
:: limitations under the License.
1414

15-
thrift-0.10.0.exe -o . --gen csharp Hbase.thrift
15+
thrift-0.11.0.exe -o . --gen csharp Hbase.thrift

HBase.NET/dll/Castle License.txt

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
Copyright 2004-2014 Castle Project - http://www.castleproject.org/
2-
3-
Licensed under the Apache License, Version 2.0 (the "License");
4-
you may not use this file except in compliance with the License.
5-
You may obtain a copy of the License at
6-
7-
http://www.apache.org/licenses/LICENSE-2.0
8-
9-
Unless required by applicable law or agreed to in writing, software
10-
distributed under the License is distributed on an "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
See the License for the specific language governing permissions and
13-
limitations under the License.
14-
1+
Copyright 2004-2016 Castle Project - http://www.castleproject.org/
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

HBase.NET/dll/Castle.Core.dll

-3.5 KB
Binary file not shown.
-24 KB
Binary file not shown.
-24 KB
Binary file not shown.

0 commit comments

Comments
 (0)