Refactor: Separate list & map operations (#360)

* Refactor: split off list operations

* Refactor: split off map operations

* Refactor: Split off scalar operations

Author: Jan Hecking

binding.gyp

@@ -51,6 +51,9 @@
         'src/main/events.cc',
         'src/main/cdt_ctx.cc',
         'src/main/operations.cc',
+        'src/main/scalar_operations.cc',
+        'src/main/list_operations.cc',
+        'src/main/map_operations.cc',
         'src/main/bit_operations.cc',
         'src/main/policy.cc',
         'src/main/query.cc',

lib/lists.js

@@ -1,5 +1,5 @@
 // *****************************************************************************
-// Copyright 2013-2019 Aerospike, Inc.
+// Copyright 2013-2020 Aerospike, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License")
 // you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
  */
 
 const as = require('bindings')('aerospike.node')
-const opcodes = as.operations
+const opcodes = as.listOperations
 const Context = require('./cdt_context')
 const AerospikeError = require('./error')
 const Operation = require('./operations').Operation

lib/maps.js

@@ -1,5 +1,5 @@
 // *****************************************************************************
-// Copyright 2013-2019 Aerospike, Inc.
+// Copyright 2013-2020 Aerospike, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License")
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 'use strict'
 
 const as = require('bindings')('aerospike.node')
-const opcodes = as.operations
+const opcodes = as.mapOperations
 const policy = require('./policy')
 const Context = require('./cdt_context')
 const Operation = require('./operations').Operation

lib/operations.js

@@ -50,7 +50,7 @@
  */
 
 const as = require('bindings')('aerospike.node')
-const ops = as.operations
+const ops = as.scalarOperations
 
 /**
  * @class module:aerospike/operations~Operation

src/include/operations.h

@@ -25,11 +25,19 @@ extern "C" {
 #include "log.h"
 
 int operations_from_jsarray(as_operations* ops, v8::Local<v8::Array> arr, LogInfo* log);
-int add_bit_op(as_operations* ops, int64_t opcode, v8::Local<v8::Object> op, LogInfo* log);
+int add_scalar_op(as_operations* ops, uint32_t opcode, v8::Local<v8::Object> op, LogInfo* log);
+int add_list_op(as_operations* ops, uint32_t opcode, v8::Local<v8::Object> op, LogInfo* log);
+int add_map_op(as_operations* ops, uint32_t opcode, v8::Local<v8::Object> op, LogInfo* log);
+int add_bit_op(as_operations* ops, uint32_t opcode, v8::Local<v8::Object> op, LogInfo* log);
 int get_optional_cdt_context(as_cdt_ctx* context, bool* has_context, v8::Local<v8::Object> obj, LogInfo* log);
 
-v8::Local<v8::Object> opcode_values();
+v8::Local<v8::Object> scalar_opcode_values();
+v8::Local<v8::Object> list_opcode_values();
+v8::Local<v8::Object> map_opcode_values();
 v8::Local<v8::Object> bit_opcode_values();
 
 const uint32_t OPS_MASK = 0xFF00;
+const uint32_t SCALAR_OPS_OFFSET = 0x0000;
+const uint32_t LIST_OPS_OFFSET = 0x0100;
+const uint32_t MAP_OPS_OFFSET = 0x0200;
 const uint32_t BIT_OPS_OFFSET = 0x0300;

src/main/aerospike.cc

@@ -123,7 +123,9 @@ NAN_MODULE_INIT(Aerospike)
 	export("predexp", predexp_codes());
 	export("scanPriority", scanPriority());
 	export("log", log_enum_values());
-	export("operations", opcode_values());
+	export("scalarOperations", scalar_opcode_values());
+	export("listOperations", list_opcode_values());
+	export("mapOperations", map_opcode_values());
 	export("bitOperations", bit_opcode_values());
 	export("policy", policy());
 	export("status", status());

src/main/bit_operations.cc

@@ -410,7 +410,7 @@ const ops_table_entry ops_table[] = {
 };
 
 int
-add_bit_op(as_operations* ops, int64_t opcode, Local<Object> op, LogInfo* log)
+add_bit_op(as_operations* ops, uint32_t opcode, Local<Object> op, LogInfo* log)
 {
 	opcode = opcode ^ BIT_OPS_OFFSET;
 	const ops_table_entry *entry = &ops_table[opcode];