k2hash 1.1.22 → 1.1.23

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.
Files changed (20) hide show
  1. package/ChangeLog +17 -0
  2. package/README.md +3 -4
  3. package/index.js +7 -4
  4. package/package.json +8 -12
  5. package/{binding.gyp → src/binding.gyp} +35 -17
  6. package/src/k2h_cbs.cc +7 -4
  7. package/src/k2h_cbs.h +7 -4
  8. package/src/k2h_common.h +7 -4
  9. package/src/k2h_keyqueue.cc +1 -1
  10. package/src/k2h_keyqueue.h +7 -4
  11. package/src/k2h_keyqueue_async.h +7 -4
  12. package/src/k2h_queue.cc +1 -1
  13. package/src/k2h_queue.h +7 -4
  14. package/src/k2h_queue_async.h +7 -4
  15. package/src/k2h_shm.cc +25 -26
  16. package/src/k2h_shm.h +7 -4
  17. package/src/k2h_shm_async.h +1 -1
  18. package/src/k2hash.cc +1 -1
  19. package/src/k2hkeyqueue.cc +1 -1
  20. package/src/k2hqueue.cc +1 -1
package/ChangeLog CHANGED
@@ -1,3 +1,20 @@
1
+ k2hash (1.1.23) unstable; urgency=low
2
+
3
+ * Added build flags and removed unnecessary files - #34
4
+ * Updated header and footer in comment lines - #33
5
+ * Updated issue/pullrequest templates and README.md - #31
6
+ * Reviewed ShellCheck processing again - #30
7
+ * Reviewed ShellCheck processing and fixed bugs - #29
8
+ * Eliminated unnecessary copies in nodejs_helper.sh - #28
9
+ * Updated packages - #27
10
+ * Fixed test.sh for not using jenkins mocha that is no longer used - #26
11
+ * Updated github actions and nodejs version, and fixed bugs - #25
12
+ * Renamed the test directory to tests and run_test.sh to test.sh - #24
13
+ * Removed install entry from scripts in package.json file - #23
14
+ * Cleaned up package.json and updated related package versions - #22
15
+
16
+ -- Takeshi Nakatani <ggtakec@gmail.com> Fri, 17 Feb 2023 13:03:40 +0900
17
+
1
18
  k2hash (1.1.22) unstable; urgency=low
2
19
 
3
20
  * Updated some npm packages, added .auditignore, etc - #20
package/README.md CHANGED
@@ -7,15 +7,14 @@ k2hash nodejs addon library
7
7
  [![GitHub issues](https://img.shields.io/github/issues/yahoojapan/k2hash_nodejs.svg)](https://github.com/yahoojapan/k2hash_nodejs/issues)
8
8
  [![NPM packages](https://badge.fury.io/js/k2hash.svg)](https://badge.fury.io/js/k2hash)
9
9
 
10
- K2HASH addon library for Node.js.
11
- - K2HASH - NoSQL Key Value Store(KVS) library by Yahoo! JAPAN
10
+ K2HASH addon library for Node.js
12
11
 
13
12
  ### Overview
14
13
  K2HASH is NoSQL(key value store) library and tools for this library by Yahoo! JAPAN.
15
14
  This addon library is for using K2HASH on nodejs.
16
15
 
17
16
  By k2hash nodejs addon library, you can easily incorporate the functions and features of K2HASH into Node.js based programs.
18
- For the features and functions of K2HASH, see the [k2hash documentation](https://k2hash.antpick.ax/).
17
+ For the features and functions of K2HASH, see the [k2hash nodejs documentation](https://nodejs.k2hash.antpick.ax/) and [k2hash documentation](https://k2hash.antpick.ax/).
19
18
 
20
19
  ![k2HASH Node.js addon](https://nodejs.k2hash.antpick.ax/images/top_k2hash_nodejs.png)
21
20
 
@@ -44,4 +43,4 @@ This software is released under the MIT License, see the license file.
44
43
  ### AntPickax
45
44
  k2hash is one of [AntPickax](https://antpick.ax/) products.
46
45
 
47
- Copyright(C) 2015 Yahoo! JAPAN corporation.
46
+ Copyright(C) 2015 Yahoo Japan Corporation.
package/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -23,7 +23,10 @@
23
23
  module.exports = require('bindings')('k2hash');
24
24
 
25
25
  /*
26
- * VIM modelines
27
- *
28
- * vim:set ts=4 fenc=utf-8:
26
+ * Local variables:
27
+ * tab-width: 4
28
+ * c-basic-offset: 4
29
+ * End:
30
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
31
+ * vim<600: noexpandtab sw=4 ts=4
29
32
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "k2hash",
3
- "version": "1.1.22",
3
+ "version": "1.1.23",
4
4
  "description": "K2HASH addon library for Node.js",
5
5
  "os": "linux",
6
6
  "main": "index.js",
@@ -9,12 +9,11 @@
9
9
  },
10
10
  "dependencies": {
11
11
  "bindings": "^1.5.0",
12
- "nan": "^2.15.0"
12
+ "nan": "^2.17.0"
13
13
  },
14
14
  "devDependencies": {
15
- "chai": "^4.3.4",
16
- "mocha": "^8.4.0",
17
- "publish-please": "^5.5.2"
15
+ "chai": "^4.3.7",
16
+ "mocha": "^10.0.0"
18
17
  },
19
18
  "scripts": {
20
19
  "build": "npm run build:before && npm run build:configure && npm run build:rebuild && npm run build:linkdir && npm run build:after",
@@ -23,14 +22,11 @@
23
22
  "build:rebuild": "if [ -f src/binding.gyp ]; then cd src; fi && node-gyp rebuild --verbose --release --target_arch=x64 --coverage=true",
24
23
  "build:linkdir": "if [ ! -f build -a ! -s build ]; then ln -s src/build .; fi",
25
24
  "build:after": "echo \"Build - Succeed\"",
26
- "install": "npm run build",
27
25
  "test": "npm run test:all",
28
- "test:all": "echo \"Test - All\" && if [ -d test_* ]; then TEST_DIR=`ls -1 | grep test_ | head -1`; else TEST_DIR=test; fi; ${TEST_DIR}/run_test.sh && echo \"Finished\"",
29
- "test:k2hash": "echo \"Test - k2hash\" && if [ -d test_* ]; then TEST_DIR=`ls -1 | grep test_ | head -1`; else TEST_DIR=test; fi; ${TEST_DIR}/run_test.sh k2hash && echo \"Finished\"",
30
- "test:k2hqueue": "echo \"Test - k2hqueue\" && if [ -d test_* ]; then TEST_DIR=`ls -1 | grep test_ | head -1`; else TEST_DIR=test; fi; ${TEST_DIR}/run_test.sh k2hqueue && echo \"Finished\"",
31
- "test:k2hkeyqueue": "echo \"Test - k2hkeyqueue\" && if [ -d test_* ]; then TEST_DIR=`ls -1 | grep test_ | head -1`; else TEST_DIR=test; fi; ${TEST_DIR}/run_test.sh k2hkeyqueue && echo \"Finished\"",
32
- "publish-please": "publish-please",
33
- "prepublishOnly": "publish-please guard"
26
+ "test:all": "echo \"Test - All\" && tests/test.sh && echo \"Finished\"",
27
+ "test:k2hash": "echo \"Test - k2hash\" && tests/test.sh k2hash && echo \"Finished\"",
28
+ "test:k2hqueue": "echo \"Test - k2hqueue\" && tests/test.sh k2hqueue && echo \"Finished\"",
29
+ "test:k2hkeyqueue": "echo \"Test - k2hkeyqueue\" && tests/test.sh k2hkeyqueue && echo \"Finished\""
34
30
  },
35
31
  "repository": {
36
32
  "type": "git",
package/{binding.gyp → src/binding.gyp} RENAMED
@@ -1,7 +1,7 @@
1
1
  #
2
2
  # K2HASH
3
3
  #
4
- # Copyright 2015 Yahoo! JAPAN corporation.
4
+ # Copyright 2015 Yahoo Japan Corporation.
5
5
  #
6
6
  # K2HASH is key-valuew store base libraries.
7
7
  # K2HASH is made for the purpose of the construction of
@@ -26,11 +26,11 @@
26
26
  {
27
27
  "target_name": "k2hash",
28
28
  "sources": [
29
- "src/k2hash.cc",
30
- "src/k2h_shm.cc",
31
- "src/k2h_queue.cc",
32
- "src/k2h_keyqueue.cc",
33
- "src/k2h_cbs.cc"
29
+ "k2hash.cc",
30
+ "k2h_shm.cc",
31
+ "k2h_queue.cc",
32
+ "k2h_keyqueue.cc",
33
+ "k2h_cbs.cc"
34
34
  ],
35
35
  "cflags": [
36
36
  #
@@ -46,7 +46,13 @@
46
46
  #
47
47
  # For nodejs 12.x/..., it suppress warnings: "'deprecated' attribute directive ignored"
48
48
  #
49
- "-Wno-attributes"
49
+ "-Wno-attributes",
50
+ #
51
+ # nodejs/nan#807(https://github.com/nodejs/nan/issues/807#issuecomment-455750192)
52
+ # recommends using the "-Wno-cast-function-type" to silence deprecations warnings
53
+ # that appear with GCC 8.
54
+ #
55
+ "-Wno-cast-function-type"
50
56
  ],
51
57
  "include_dirs": [
52
58
  "<!(node -e \"require('nan')\")"
@@ -58,9 +64,9 @@
58
64
  {
59
65
  "target_name": "k2hqueue",
60
66
  "sources": [
61
- "src/k2hqueue.cc",
62
- "src/k2h_queue.cc",
63
- "src/k2h_cbs.cc"
67
+ "k2hqueue.cc",
68
+ "k2h_queue.cc",
69
+ "k2h_cbs.cc"
64
70
  ],
65
71
  "cflags": [
66
72
  #
@@ -76,7 +82,13 @@
76
82
  #
77
83
  # For nodejs 12.x/..., it suppress warnings: "'deprecated' attribute directive ignored"
78
84
  #
79
- "-Wno-attributes"
85
+ "-Wno-attributes",
86
+ #
87
+ # nodejs/nan#807(https://github.com/nodejs/nan/issues/807#issuecomment-455750192)
88
+ # recommends using the "-Wno-cast-function-type" to silence deprecations warnings
89
+ # that appear with GCC 8.
90
+ #
91
+ "-Wno-cast-function-type"
80
92
  ],
81
93
  "include_dirs": [
82
94
  "<!(node -e \"require('nan')\")"
@@ -88,9 +100,9 @@
88
100
  {
89
101
  "target_name": "k2hkeyqueue",
90
102
  "sources": [
91
- "src/k2hkeyqueue.cc",
92
- "src/k2h_keyqueue.cc",
93
- "src/k2h_cbs.cc"
103
+ "k2hkeyqueue.cc",
104
+ "k2h_keyqueue.cc",
105
+ "k2h_cbs.cc"
94
106
  ],
95
107
  "cflags": [
96
108
  #
@@ -106,7 +118,13 @@
106
118
  #
107
119
  # For nodejs 12.x/..., it suppress warnings: "'deprecated' attribute directive ignored"
108
120
  #
109
- "-Wno-attributes"
121
+ "-Wno-attributes",
122
+ #
123
+ # nodejs/nan#807(https://github.com/nodejs/nan/issues/807#issuecomment-455750192)
124
+ # recommends using the "-Wno-cast-function-type" to silence deprecations warnings
125
+ # that appear with GCC 8.
126
+ #
127
+ "-Wno-cast-function-type"
110
128
  ],
111
129
  "include_dirs": [
112
130
  "<!(node -e \"require('nan')\")"
@@ -123,6 +141,6 @@
123
141
  # tab-width: 4
124
142
  # c-basic-offset: 4
125
143
  # End:
126
- # vim600: expandtab sw=4 ts=4 fdm=marker
127
- # vim<600: expandtab sw=4 ts=4
144
+ # vim600: noexpandtab sw=4 ts=4 fdm=marker
145
+ # vim<600: noexpandtab sw=4 ts=4
128
146
  #
package/src/k2h_cbs.cc CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -105,7 +105,10 @@ bool StackEmitCB::Unset(const char* pemitname)
105
105
  }
106
106
 
107
107
  /*
108
- * VIM modelines
109
- *
110
- * vim:set ts=4 fenc=utf-8:
108
+ * Local variables:
109
+ * tab-width: 4
110
+ * c-basic-offset: 4
111
+ * End:
112
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
113
+ * vim<600: noexpandtab sw=4 ts=4
111
114
  */
package/src/k2h_cbs.h CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -68,7 +68,10 @@ inline const char* GetNormalizationEmitter(const char* emitter, const char* emit
68
68
  #endif
69
69
 
70
70
  /*
71
- * VIM modelines
72
- *
73
- * vim:set ts=4 fenc=utf-8:
71
+ * Local variables:
72
+ * tab-width: 4
73
+ * c-basic-offset: 4
74
+ * End:
75
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
76
+ * vim<600: noexpandtab sw=4 ts=4
74
77
  */
package/src/k2h_common.h CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -39,7 +39,10 @@
39
39
  #endif
40
40
 
41
41
  /*
42
- * VIM modelines
43
- *
44
- * vim:set ts=4 fenc=utf-8:
42
+ * Local variables:
43
+ * tab-width: 4
44
+ * c-basic-offset: 4
45
+ * End:
46
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
47
+ * vim<600: noexpandtab sw=4 ts=4
45
48
  */
package/src/k2h_keyqueue.cc CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
package/src/k2h_keyqueue.h CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -73,7 +73,10 @@ class K2hKeyQueue : public Nan::ObjectWrap
73
73
  #endif
74
74
 
75
75
  /*
76
- * VIM modelines
77
- *
78
- * vim:set ts=4 fenc=utf-8:
76
+ * Local variables:
77
+ * tab-width: 4
78
+ * c-basic-offset: 4
79
+ * End:
80
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
81
+ * vim<600: noexpandtab sw=4 ts=4
79
82
  */
package/src/k2h_keyqueue_async.h CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -394,7 +394,10 @@ class K2hkqRemoveWorker : public Nan::AsyncWorker
394
394
  #endif
395
395
 
396
396
  /*
397
- * VIM modelines
398
- *
399
- * vim:set ts=4 fenc=utf-8:
397
+ * Local variables:
398
+ * tab-width: 4
399
+ * c-basic-offset: 4
400
+ * End:
401
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
402
+ * vim<600: noexpandtab sw=4 ts=4
400
403
  */
package/src/k2h_queue.cc CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
package/src/k2h_queue.h CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -73,7 +73,10 @@ class K2hQueue : public Nan::ObjectWrap
73
73
  #endif
74
74
 
75
75
  /*
76
- * VIM modelines
77
- *
78
- * vim:set ts=4 fenc=utf-8:
76
+ * Local variables:
77
+ * tab-width: 4
78
+ * c-basic-offset: 4
79
+ * End:
80
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
81
+ * vim<600: noexpandtab sw=4 ts=4
79
82
  */
package/src/k2h_queue_async.h CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -375,7 +375,10 @@ class K2hqRemoveWorker : public Nan::AsyncWorker
375
375
  #endif
376
376
 
377
377
  /*
378
- * VIM modelines
379
- *
380
- * vim:set ts=4 fenc=utf-8:
378
+ * Local variables:
379
+ * tab-width: 4
380
+ * c-basic-offset: 4
381
+ * End:
382
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
383
+ * vim<600: noexpandtab sw=4 ts=4
381
384
  */
package/src/k2h_shm.cc CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -240,7 +240,7 @@ NAN_METHOD(K2hNode::New)
240
240
  info.GetReturnValue().Set(info.This());
241
241
  }else{
242
242
  // Invoked as plain function K2hNode(), turn into construct call.
243
- const int argc = 1;
243
+ const int argc = 1;
244
244
  Local<Value> argv[argc] = {info[0]};
245
245
  Local<Function> cons = Nan::New<Function>(constructor);
246
246
  info.GetReturnValue().Set(Nan::NewInstance(cons, argc, argv).ToLocalChecked());
@@ -1509,7 +1509,7 @@ NAN_METHOD(K2hNode::OpenRO)
1509
1509
  * The file is temporary, it means the file is removed automatically when
1510
1510
  * close it.
1511
1511
  * If the callback function is specified, or on callback handles for this,
1512
- * this method works asynchronization and calls callback function at finishing.
1512
+ * this method works asynchronization and calls callback function at finishing.
1513
1513
  *
1514
1514
  * @param[in] filename Specify K2HASH file path
1515
1515
  * @param[in] fullmap Specify true for full memory mapping. false for mapping only
@@ -1630,7 +1630,7 @@ NAN_METHOD(K2hNode::OpenTempfile)
1630
1630
  * )
1631
1631
  * @brief Open(create) K2HASH data on memory.
1632
1632
  * If the callback function is specified, or on callback handles for this,
1633
- * this method works asynchronization and calls callback function at finishing.
1633
+ * this method works asynchronization and calls callback function at finishing.
1634
1634
  *
1635
1635
  * @param[in] maskbitcnt Specify initial mask bit count(must over 2).
1636
1636
  * If opens existing K2HASH file, this value is ignored and
@@ -1728,7 +1728,7 @@ NAN_METHOD(K2hNode::OpenMem)
1728
1728
  * @brief Close(detach) the K2HASH file(memory)
1729
1729
  *
1730
1730
  * If the callback function is specified, or on callback handles for this,
1731
- * this method works asynchronization and calls callback function at finishing.
1731
+ * this method works asynchronization and calls callback function at finishing.
1732
1732
  *
1733
1733
  * @param[in] cbfunc callback function.
1734
1734
  *
@@ -1780,7 +1780,7 @@ NAN_METHOD(K2hNode::Close)
1780
1780
  * If the subkey is specified, returns the value for subkey.
1781
1781
  * Then if the key does not have subkey, any value is returned.
1782
1782
  * If the callback function is specified, or on callback handles for this,
1783
- * this method works asynchronization and calls callback function at finishing.
1783
+ * this method works asynchronization and calls callback function at finishing.
1784
1784
  *
1785
1785
  * @param[in] key Specify the key name.
1786
1786
  * @param[in] subkey Specify the subkey name when you want to get value for it.
@@ -1920,7 +1920,7 @@ NAN_METHOD(K2hNode::GetValue)
1920
1920
  * @brief Get subkey list for key.
1921
1921
  *
1922
1922
  * If the callback function is specified, or on callback handles for this,
1923
- * this method works asynchronization and calls callback function at finishing.
1923
+ * this method works asynchronization and calls callback function at finishing.
1924
1924
  *
1925
1925
  * @param[in] key Specify the key name.
1926
1926
  * @param[in] cbfunc callback function.
@@ -1998,7 +1998,7 @@ NAN_METHOD(K2hNode::GetSubkeys)
1998
1998
  * the value is set to new subkey. Then the subkey is existed, the subkey's
1999
1999
  * value is over write.
2000
2000
  * If the callback function is specified, or on callback handles for this,
2001
- * this method works asynchronization and calls callback function at finishing.
2001
+ * this method works asynchronization and calls callback function at finishing.
2002
2002
  *
2003
2003
  * @param[in] key Specify the key name
2004
2004
  * @param[in] value Specify the value
@@ -2127,7 +2127,7 @@ NAN_METHOD(K2hNode::SetValue)
2127
2127
  *
2128
2128
  * If the value is specified, new subkey has it.
2129
2129
  * If the callback function is specified, or on callback handles for this,
2130
- * this method works asynchronization and calls callback function at finishing.
2130
+ * this method works asynchronization and calls callback function at finishing.
2131
2131
  *
2132
2132
  * @param[in] key Specify the key name
2133
2133
  * @param[in] subkey Specify added new subkey name
@@ -2210,7 +2210,7 @@ NAN_METHOD(K2hNode::AddSubkey)
2210
2210
  * Take care for that the replaced old subkey list, the old subkey is not removed from
2211
2211
  * K2HASH, it is removed only the key's subkey list.
2212
2212
  * If the callback function is specified, or on callback handles for this,
2213
- * this method works asynchronization and calls callback function at finishing.
2213
+ * this method works asynchronization and calls callback function at finishing.
2214
2214
  *
2215
2215
  * @param[in] key Specify the key name
2216
2216
  * @param[in] subkeys Specify the subkey list
@@ -2247,12 +2247,12 @@ NAN_METHOD(K2hNode::AddSubkeys)
2247
2247
  Local<Array> inSubkeys= Local<Array>::Cast(info[1]);
2248
2248
  K2HSubKeys Subkeys;
2249
2249
  for(int pos = 0; pos < static_cast<int>(inSubkeys->Length()); ++pos){
2250
- string strkey;
2250
+ string tmpkey;
2251
2251
  {
2252
2252
  Nan::Utf8String buf(Nan::Get(inSubkeys, pos).ToLocalChecked());
2253
- strkey = std::string(*buf);
2253
+ tmpkey = std::string(*buf);
2254
2254
  }
2255
- if(Subkeys.end() == Subkeys.insert(strkey.c_str())){
2255
+ if(Subkeys.end() == Subkeys.insert(tmpkey.c_str())){
2256
2256
  // failed to set subkey
2257
2257
  info.GetReturnValue().Set(Nan::False());
2258
2258
  return;
@@ -2300,7 +2300,7 @@ NAN_METHOD(K2hNode::AddSubkeys)
2300
2300
  * If the subkey name is specified, the subkey is removed from the key's subkey
2301
2301
  * list and the subkey is removed from K2HASH.
2302
2302
  * If the callback function is specified, or on callback handles for this,
2303
- * this method works asynchronization and calls callback function at finishing.
2303
+ * this method works asynchronization and calls callback function at finishing.
2304
2304
  *
2305
2305
  * @param[in] key Specify the key name
2306
2306
  * @param[in] subkey Specify the subkey name
@@ -2374,7 +2374,7 @@ NAN_METHOD(K2hNode::Remove)
2374
2374
  *
2375
2375
  * If the key has subkeys, all of the subkeys is removed.
2376
2376
  * If the callback function is specified, or on callback handles for this,
2377
- * this method works asynchronization and calls callback function at finishing.
2377
+ * this method works asynchronization and calls callback function at finishing.
2378
2378
  *
2379
2379
  * @param[in] key Specify the key name
2380
2380
  * @param[in] cbfunc callback function.
@@ -2887,7 +2887,7 @@ NAN_METHOD(K2hNode::SetTransactionThreadPool)
2887
2887
  * If there is same key name in archive file, the key is over wrote.
2888
2888
  * The archive file is made by PutArchive() function.
2889
2889
  * If the callback function is specified, or on callback handles for this,
2890
- * this method works asynchronization and calls callback function at finishing.
2890
+ * this method works asynchronization and calls callback function at finishing.
2891
2891
  *
2892
2892
  * @param[in] filename Specify the archive file path
2893
2893
  * @param[in] errskip If true is specified, this function does not stop when something
@@ -2960,7 +2960,7 @@ NAN_METHOD(K2hNode::LoadArchive)
2960
2960
  *
2961
2961
  * The archive file which is made by this method can be loaded by LoadArchive()
2962
2962
  * If the callback function is specified, or on callback handles for this,
2963
- * this method works asynchronization and calls callback function at finishing.
2963
+ * this method works asynchronization and calls callback function at finishing.
2964
2964
  *
2965
2965
  * @param[in] filename Specify the archive file path
2966
2966
  * @param[in] errskip If true is specified, this function does not stop when something
@@ -3145,16 +3145,15 @@ NAN_METHOD(K2hNode::SetCommonAttribute)
3145
3145
  K2H_VAL_ATTR_ENABLE == Nan::To<int32_t>(info[2]).ToChecked() ? &istrue :
3146
3146
  K2H_VAL_ATTR_DISABLE == Nan::To<int32_t>(info[2]).ToChecked() ? &isfalse : NULL;
3147
3147
  bool is_expire = (info.Length() < 5 && !info[4]->IsInt32()) ? false :
3148
- K2H_VAL_ATTR_ENABLE == Nan::To<int32_t>(info[4]).ToChecked() ? true :
3149
- K2H_VAL_ATTR_DISABLE == Nan::To<int32_t>(info[4]).ToChecked() ? false : false;
3148
+ K2H_VAL_ATTR_ENABLE == Nan::To<int32_t>(info[4]).ToChecked() ? true : false;
3150
3149
 
3151
3150
  std::string pass;
3152
3151
  if(4 <= info.Length()){
3153
3152
  Nan::Utf8String buf(info[3]);
3154
3153
  pass = std::string(*buf);
3155
3154
  }
3156
- time_t expire = 0;
3157
- time_t* pexpire = NULL;
3155
+ time_t expire;
3156
+ time_t* pexpire = NULL;
3158
3157
  if(is_expire && 6 <= info.Length() && info[5]->IsNumber()){
3159
3158
  expire = reinterpret_cast<time_t>(info[5]->IntegerValue(Nan::GetCurrentContext()).ToChecked());
3160
3159
  pexpire = &expire;
@@ -3315,7 +3314,7 @@ NAN_METHOD(K2hNode::GetAttrInfos)
3315
3314
  *
3316
3315
  * @brief Get attribute keys
3317
3316
  * If the callback function is specified, or on callback handles for this,
3318
- * this method works asynchronization and calls callback function at finishing.
3317
+ * this method works asynchronization and calls callback function at finishing.
3319
3318
  *
3320
3319
  * @param[in] key Specify the key name
3321
3320
  * @param[in] cbfunc callback function.
@@ -3385,7 +3384,7 @@ NAN_METHOD(K2hNode::GetAttrs)
3385
3384
  *
3386
3385
  * @brief Get value by attribute key
3387
3386
  * If the callback function is specified, or on callback handles for this,
3388
- * this method works asynchronization and calls callback function at finishing.
3387
+ * this method works asynchronization and calls callback function at finishing.
3389
3388
  *
3390
3389
  * @param[in] key Specify the key name
3391
3390
  * @param[in] attrkey Specify the attribute key name
@@ -3478,7 +3477,7 @@ NAN_METHOD(K2hNode::GetAttrValue)
3478
3477
  *
3479
3478
  * @brief Add the attribute to the key
3480
3479
  * If the callback function is specified, or on callback handles for this,
3481
- * this method works asynchronization and calls callback function at finishing.
3480
+ * this method works asynchronization and calls callback function at finishing.
3482
3481
  *
3483
3482
  * @param[in] key Specify the key name
3484
3483
  * @param[in] attrkey Specify the attribute key name
@@ -3554,6 +3553,6 @@ NAN_METHOD(K2hNode::AddAttr)
3554
3553
  * tab-width: 4
3555
3554
  * c-basic-offset: 4
3556
3555
  * End:
3557
- * vim600: expandtab sw=4 ts=4 fdm=marker
3558
- * vim<600: expandtab sw=4 ts=4
3556
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
3557
+ * vim<600: noexpandtab sw=4 ts=4
3559
3558
  */
package/src/k2h_shm.h CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
@@ -146,7 +146,10 @@ class K2hNode : public Nan::ObjectWrap
146
146
  #endif
147
147
 
148
148
  /*
149
- * VIM modelines
150
- *
151
- * vim:set ts=4 fenc=utf-8:
149
+ * Local variables:
150
+ * tab-width: 4
151
+ * c-basic-offset: 4
152
+ * End:
153
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
154
+ * vim<600: noexpandtab sw=4 ts=4
152
155
  */
package/src/k2h_shm_async.h CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
package/src/k2hash.cc CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
package/src/k2hkeyqueue.cc CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of
package/src/k2hqueue.cc CHANGED
@@ -1,7 +1,7 @@
1
1
  /*
2
2
  * K2HASH
3
3
  *
4
- * Copyright 2015 Yahoo! JAPAN corporation.
4
+ * Copyright 2015 Yahoo Japan Corporation.
5
5
  *
6
6
  * K2HASH is key-valuew store base libraries.
7
7
  * K2HASH is made for the purpose of the construction of