Abstract merge operator in Java + Thread JNI attachment automatic management + loader management for static variables

.gitignore

@@ -27,7 +27,7 @@ make_config.mk
 CMakeCache.txt
 CMakeFiles/
 build/
-
+cmake-build-debug/
 ldb
 manifest_dump
 sst_dump

CMakeLists.txt

@@ -930,7 +930,7 @@ if(WITH_TESTS)
       table/mock_table.cc
       util/fault_injection_test_env.cc
       utilities/cassandra/test_utils.cc
-  )
+          java/rocksjni/init.h java/rocksjni/init.cc)
   # test utilities are only build in debug
   enable_testing()
   add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})

cmake-build-debug/third-party/gtest-1.7.0/fused-src/gtest/Makefile

@@ -0,0 +1,242 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.9
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake
+
+# The command to remove a file.
+RM = /home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /data/git/rocksdb
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /data/git/rocksdb/cmake-build-debug
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip/fast
+
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local/fast
+
+# Special rule for the target install
+install: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"devel\" \"runtime\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+
+.PHONY : list_install_components/fast
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available.
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+.PHONY : edit_cache/fast
+
+# Special rule for the target test
+test:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/ctest --force-new-ctest-process $(ARGS)
+.PHONY : test
+
+# Special rule for the target test
+test/fast: test
+
+.PHONY : test/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/home/cristian/Scaricati/clion-2017.3.1/bin/cmake/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /data/git/rocksdb/cmake-build-debug && $(CMAKE_COMMAND) -E cmake_progress_start /data/git/rocksdb/cmake-build-debug/CMakeFiles /data/git/rocksdb/cmake-build-debug/third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/progress.marks
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f CMakeFiles/Makefile2 third-party/gtest-1.7.0/fused-src/gtest/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /data/git/rocksdb/cmake-build-debug/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f CMakeFiles/Makefile2 third-party/gtest-1.7.0/fused-src/gtest/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f CMakeFiles/Makefile2 third-party/gtest-1.7.0/fused-src/gtest/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f CMakeFiles/Makefile2 third-party/gtest-1.7.0/fused-src/gtest/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /data/git/rocksdb/cmake-build-debug && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/rule:
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f CMakeFiles/Makefile2 third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/rule
+.PHONY : third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/rule
+
+# Convenience name for target.
+gtest: third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/rule
+
+.PHONY : gtest
+
+# fast build rule for target.
+gtest/fast:
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/build.make third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/build
+.PHONY : gtest/fast
+
+gtest-all.o: gtest-all.cc.o
+
+.PHONY : gtest-all.o
+
+# target to build an object file
+gtest-all.cc.o:
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/build.make third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/gtest-all.cc.o
+.PHONY : gtest-all.cc.o
+
+gtest-all.i: gtest-all.cc.i
+
+.PHONY : gtest-all.i
+
+# target to preprocess a source file
+gtest-all.cc.i:
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/build.make third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/gtest-all.cc.i
+.PHONY : gtest-all.cc.i
+
+gtest-all.s: gtest-all.cc.s
+
+.PHONY : gtest-all.s
+
+# target to generate assembly for a file
+gtest-all.cc.s:
+	cd /data/git/rocksdb/cmake-build-debug && $(MAKE) -f third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/build.make third-party/gtest-1.7.0/fused-src/gtest/CMakeFiles/gtest.dir/gtest-all.cc.s
+.PHONY : gtest-all.cc.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... install/strip"
+	@echo "... install/local"
+	@echo "... install"
+	@echo "... list_install_components"
+	@echo "... edit_cache"
+	@echo "... test"
+	@echo "... rebuild_cache"
+	@echo "... gtest"
+	@echo "... gtest-all.o"
+	@echo "... gtest-all.i"
+	@echo "... gtest-all.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /data/git/rocksdb/cmake-build-debug && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+