Skip to content

GitLab

Commit e41bf74c authored by tavit ohanian's avatar tavit ohanian
Browse files
Options

cleanup gitignore and build instructions

parent ea8f4043
Hide whitespace changes
Inline Side-by-side
Showing with 1460 additions and 1275 deletions
.gitignore
View file @ e41bf74c
......@@ -3,5 +3,8 @@
*~
go/
!go/.gitkeep
vank_go.go
vank_wrap.cxx
vank_wrap.h
DocIdVector_post.i
View file @ e41bf74c
......@@ -21,12 +21,12 @@ func NewWrapped_DocIdVector(a ...interface{}) (swig_r Wrapped_DocIdVector, err e
defer catch(&err)
argc := len(a)
if argc == 0 {
swig_r = (Wrapped_DocIdVector)(SwigcptrDocIdVector(C._wrap_new_DocIdVector__SWIG_0_vank_go_073f147d1da00b5b()))
swig_r = (Wrapped_DocIdVector)(SwigcptrDocIdVector(C._wrap_new_DocIdVector__SWIG_0_vank_go_d89abc98202f3b2d()))
return
}
if argc == 1 {
_swig_i_0 := a[0].(int)
swig_r = (Wrapped_DocIdVector)(SwigcptrDocIdVector(C._wrap_new_DocIdVector__SWIG_1_vank_go_073f147d1da00b5b(C.swig_type_144(_swig_i_0))))
swig_r = (Wrapped_DocIdVector)(SwigcptrDocIdVector(C._wrap_new_DocIdVector__SWIG_1_vank_go_d89abc98202f3b2d(C.swig_type_144(_swig_i_0))))
return
}
panic("No match for overloaded function call")
......@@ -66,7 +66,7 @@ func (arg1 SwigcptrDocIdVector) WSet(arg2 int, arg3 Lemur_api_DOCID_T) (err erro
func DeleteWrapped_DocIdVector(arg1 Wrapped_DocIdVector) {
_swig_i_0 := arg1.Swigcptr()
C._wrap_delete_DocIdVector_vank_go_073f147d1da00b5b(C.uintptr_t(_swig_i_0))
C._wrap_delete_DocIdVector_vank_go_d89abc98202f3b2d(C.uintptr_t(_swig_i_0))
}
%}
......
INTERFACE-DIFFS.md 0 → 100644
View file @ e41bf74c
## Expected swig interface differences in go-idx-engine compared to vank
### DocIdVector.i - only go variant should include Odms.hpp, on two lines
```bash
diff --git a/DocIdVector.i b/home/tavit/Work/vank/swig/src/interface/DocIdVector.i
index 7c16ed1..30b403c 100755
--- a/DocIdVector.i
+++ b/home/tavit/Work/vank/swig/src/interface/DocIdVector.i
@@ -6,10 +6,14 @@
#ifdef SWIGGO
%{
+/*
#include <infospace/Odms.hpp>
+*/
%}
+/*
#include <infospace/Odms.hpp>
+*/
%template(DocIdVector) std::vector< lemur::api::DOCID_T >;
```
### DomainPtrVector.i - only go variant should include Odms.hpp, on two lines
```bash
diff --git a/DomainPtrVector.i b/home/tavit/Work/vank/swig/src/interface/DomainPtrVector.i
index e0104ba..558ab67 100755
--- a/DomainPtrVector.i
+++ b/home/tavit/Work/vank/swig/src/interface/DomainPtrVector.i
@@ -6,10 +6,14 @@
#ifdef SWIGGO
%{
+/*
#include <infospace/Odms.hpp>
+*/
%}
+/*
#include <infospace/Odms.hpp>
+*/
%template(DomainPtrVector) std::vector< ride::api::Domain* >;
```
### Odms.i - is used only in go variant, no Odms interfaces in vank
```bash
diff Odms.i /home/tavit/Work/vank/swig/src/interface/Odms.i
diff: /home/tavit/Work/vank/swig/src/interface/Odms.i: No such file or directory
```
### Odms_post.i - is used only in go variant, no Odms interfaces in vank
```bash
diff Odms_post.i /home/tavit/Work/vank/swig/src/interface/Odms_post.i
diff: /home/tavit/Work/vank/swig/src/interface/Odms_post.i: No such file or directory
```
### protect_post.i - is used only in go variant, no buildindex, Odms interfaces in vank
```bash
diff --git a/protect_post.i b/home/tavit/Work/vank/swig/src/interface/protect_post.i
index 91d2378..1adb18b 100755
--- a/protect_post.i
+++ b/home/tavit/Work/vank/swig/src/interface/protect_post.i
@@ -54,11 +54,12 @@ func catch(err *error) {
%include "Parameters_post.i"
%include "IndexEnvironment_post.i"
-%include "VankBuildIndex_post.i"
+/* %include "VankBuildIndex_post.i" */
%include "MetadataPair_post.i"
%include "MetadataPairVector_post.i"
-%include "Odms_post.i"
+/* %include "Odms_post.i"
%include "DocIdVector_post.i"
%include "StringPairVector_post.i"
+*/
#endif
```
### protect_pre.i - is used only in go variant, some type support only in go
```bash
diff --git a/protect_pre.i b/home/tavit/Work/vank/swig/src/interface/protect_pre.i
index fc05938..da02c4e 100755
--- a/protect_pre.i
+++ b/home/tavit/Work/vank/swig/src/interface/protect_pre.i
@@ -108,8 +108,10 @@ extern const std::string vankVersion;
// this is here so we don't pollute vank.i - buildindex is application code
// and not strictly part of the library.
//
+/*
%include "VankBuildIndex.i"
%include "SnippetBuilder.i"
+*/
//
// end of header section
@@ -165,7 +167,7 @@ extern const std::string vankVersion;
// see MetadataPairVector_post.i
//%rename(Wrapped_MetadataPairVector) MetadataPairVector;
-
+/*
%rename(Wrapped_InfoSpace) ride::api::InfoSpace;
%rename(Wrapped_InfoSpace_IsAttached) ride::api::InfoSpace::IsAttached;
%rename(Wrapped_InfoSpace_IsDetached) ride::api::InfoSpace::IsDetached;
@@ -236,14 +238,16 @@ extern const std::string vankVersion;
%rename(Wrapped_Domain_RenderToString) ride::api::Domain::RenderToString;
%rename(Wrapped_Domain_Save) ride::api::Domain::Save;
%rename(Wrapped_Domain_SaveToFile) ride::api::Domain::SaveToFile;
+*/
%rename(Wrapped_StringPair) std::pair< std::string, std::string >;
// %rename must precede declaration
-%include "Odms.i"
+/* %include "Odms.i"
%include "DocIdVector.i"
%include "StringPair.i"
%include "StringPairVector.i"
%include "DomainPtrVector.i"
+*/
#endif
```
IndexEnvironment_post.i
View file @ e41bf74c
......@@ -39,7 +39,7 @@ type IndexEnvironment interface {
func NewIndexEnvironment() (swig_r IndexEnvironment, err error) {
defer catch(&err)
swig_r = (IndexEnvironment)(SwigcptrWrapped_IndexEnvironment(C._wrap_new_Wrapped_IndexEnvironment_vank_go_073f147d1da00b5b()))
swig_r = (IndexEnvironment)(SwigcptrWrapped_IndexEnvironment(C._wrap_new_Wrapped_IndexEnvironment_vank_go_d89abc98202f3b2d()))
return
}
......
LemurException.i
View file @ e41bf74c
......@@ -43,7 +43,7 @@
}
#endif
#ifdef SWIGPHP5
#ifdef SWIGPHP7
// need separate map for individual methods.
%define setEx(method)
%exception method {
......
MetadataPairVector_post.i
View file @ e41bf74c
......@@ -21,12 +21,12 @@ func NewWrapped_MetadataPairVector(a ...interface{}) (swig_r Wrapped_MetadataPai
defer catch(&err)
argc := len(a)
if argc == 0 {
swig_r = (Wrapped_MetadataPairVector)(SwigcptrMetadataPairVector(C._wrap_new_MetadataPairVector__SWIG_0_vank_go_073f147d1da00b5b()))
swig_r = (Wrapped_MetadataPairVector)(SwigcptrMetadataPairVector(C._wrap_new_MetadataPairVector__SWIG_0_vank_go_d89abc98202f3b2d()))
return
}
if argc == 1 {
_swig_i_0 := a[0].(int)
swig_r = (Wrapped_MetadataPairVector)(SwigcptrMetadataPairVector(C._wrap_new_MetadataPairVector__SWIG_1_vank_go_073f147d1da00b5b(C.swig_type_277(_swig_i_0))))
swig_r = (Wrapped_MetadataPairVector)(SwigcptrMetadataPairVector(C._wrap_new_MetadataPairVector__SWIG_1_vank_go_d89abc98202f3b2d(C.swig_type_277(_swig_i_0))))
return
}
panic("No match for overloaded function call")
......@@ -66,7 +66,7 @@ func (arg1 SwigcptrMetadataPairVector) WGet(arg2 int) (_swig_ret MetadataPair, e
_swig_i_0 := arg1
_swig_i_1 := arg2
_swig_ret = (MetadataPair)(SwigcptrWrapped_MetadataPair(C._wrap_MetadataPairVector_get_vank_go_073f147d1da00b5b(C.uintptr_t(_swig_i_0), C.swig_intgo(_swig_i_1))))
_swig_ret = (MetadataPair)(SwigcptrWrapped_MetadataPair(C._wrap_MetadataPairVector_get_vank_go_d89abc98202f3b2d(C.uintptr_t(_swig_i_0), C.swig_intgo(_swig_i_1))))
return
}
......
MetadataPair_post.i
View file @ e41bf74c
......@@ -21,7 +21,7 @@ type MetadataPair interface {
func NewMetadataPair() (_swig_ret MetadataPair, err error) {
defer catch(&err)
_swig_ret = (MetadataPair)(SwigcptrWrapped_MetadataPair(C._wrap_new_Wrapped_MetadataPair_vank_go_073f147d1da00b5b()))
_swig_ret = (MetadataPair)(SwigcptrWrapped_MetadataPair(C._wrap_new_Wrapped_MetadataPair_vank_go_d89abc98202f3b2d()))
if _swig_ret == nil {
return
}
......
Odms_post.i
View file @ e41bf74c
......@@ -70,7 +70,7 @@ func NewInfoSpace__SWIG_0(arg1 string, arg2 string, arg3 string, arg4 string, ar
_swig_i_6 := arg7
_swig_i_7 := arg8
_swig_i_8 := arg9
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_0_vank_go_073f147d1da00b5b(*(*C.swig_type_16)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_17)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_18)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_19)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_20)(unsafe.Pointer(&_swig_i_4)), *(*C.swig_type_21)(unsafe.Pointer(&_swig_i_5)), *(*C.swig_type_22)(unsafe.Pointer(&_swig_i_6)), *(*C.swig_type_23)(unsafe.Pointer(&_swig_i_7)), *(*C.swig_type_24)(unsafe.Pointer(&_swig_i_8)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_0_vank_go_d89abc98202f3b2d(*(*C.swig_type_16)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_17)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_18)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_19)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_20)(unsafe.Pointer(&_swig_i_4)), *(*C.swig_type_21)(unsafe.Pointer(&_swig_i_5)), *(*C.swig_type_22)(unsafe.Pointer(&_swig_i_6)), *(*C.swig_type_23)(unsafe.Pointer(&_swig_i_7)), *(*C.swig_type_24)(unsafe.Pointer(&_swig_i_8)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -115,7 +115,7 @@ func NewInfoSpace__SWIG_1(arg1 string, arg2 string, arg3 string, arg4 string, ar
_swig_i_5 := arg6
_swig_i_6 := arg7
_swig_i_7 := arg8
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_1_vank_go_073f147d1da00b5b(*(*C.swig_type_25)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_26)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_27)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_28)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_29)(unsafe.Pointer(&_swig_i_4)), *(*C.swig_type_30)(unsafe.Pointer(&_swig_i_5)), *(*C.swig_type_31)(unsafe.Pointer(&_swig_i_6)), *(*C.swig_type_32)(unsafe.Pointer(&_swig_i_7)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_1_vank_go_d89abc98202f3b2d(*(*C.swig_type_25)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_26)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_27)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_28)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_29)(unsafe.Pointer(&_swig_i_4)), *(*C.swig_type_30)(unsafe.Pointer(&_swig_i_5)), *(*C.swig_type_31)(unsafe.Pointer(&_swig_i_6)), *(*C.swig_type_32)(unsafe.Pointer(&_swig_i_7)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -156,7 +156,7 @@ func NewInfoSpace__SWIG_2(arg1 string, arg2 string, arg3 string, arg4 string, ar
_swig_i_4 := arg5
_swig_i_5 := arg6
_swig_i_6 := arg7
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_2_vank_go_073f147d1da00b5b(*(*C.swig_type_33)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_34)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_35)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_36)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_37)(unsafe.Pointer(&_swig_i_4)), *(*C.swig_type_38)(unsafe.Pointer(&_swig_i_5)), *(*C.swig_type_39)(unsafe.Pointer(&_swig_i_6)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_2_vank_go_d89abc98202f3b2d(*(*C.swig_type_33)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_34)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_35)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_36)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_37)(unsafe.Pointer(&_swig_i_4)), *(*C.swig_type_38)(unsafe.Pointer(&_swig_i_5)), *(*C.swig_type_39)(unsafe.Pointer(&_swig_i_6)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -193,7 +193,7 @@ func NewInfoSpace__SWIG_3(arg1 string, arg2 string, arg3 string, arg4 string, ar
_swig_i_3 := arg4
_swig_i_4 := arg5
_swig_i_5 := arg6
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_3_vank_go_073f147d1da00b5b(*(*C.swig_type_40)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_41)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_42)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_43)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_44)(unsafe.Pointer(&_swig_i_4)), *(*C.swig_type_45)(unsafe.Pointer(&_swig_i_5)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_3_vank_go_d89abc98202f3b2d(*(*C.swig_type_40)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_41)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_42)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_43)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_44)(unsafe.Pointer(&_swig_i_4)), *(*C.swig_type_45)(unsafe.Pointer(&_swig_i_5)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -226,7 +226,7 @@ func NewInfoSpace__SWIG_4(arg1 string, arg2 string, arg3 string, arg4 string, ar
_swig_i_2 := arg3
_swig_i_3 := arg4
_swig_i_4 := arg5
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_4_vank_go_073f147d1da00b5b(*(*C.swig_type_46)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_47)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_48)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_49)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_50)(unsafe.Pointer(&_swig_i_4)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_4_vank_go_d89abc98202f3b2d(*(*C.swig_type_46)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_47)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_48)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_49)(unsafe.Pointer(&_swig_i_3)), *(*C.swig_type_50)(unsafe.Pointer(&_swig_i_4)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -255,7 +255,7 @@ func NewInfoSpace__SWIG_5(arg1 string, arg2 string, arg3 string, arg4 string) (_
_swig_i_1 := arg2
_swig_i_2 := arg3
_swig_i_3 := arg4
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_5_vank_go_073f147d1da00b5b(*(*C.swig_type_51)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_52)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_53)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_54)(unsafe.Pointer(&_swig_i_3)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_5_vank_go_d89abc98202f3b2d(*(*C.swig_type_51)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_52)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_53)(unsafe.Pointer(&_swig_i_2)), *(*C.swig_type_54)(unsafe.Pointer(&_swig_i_3)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -280,7 +280,7 @@ func NewInfoSpace__SWIG_6(arg1 string, arg2 string, arg3 string) (_swig_ret Info
_swig_i_0 := arg1
_swig_i_1 := arg2
_swig_i_2 := arg3
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_6_vank_go_073f147d1da00b5b(*(*C.swig_type_55)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_56)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_57)(unsafe.Pointer(&_swig_i_2)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_6_vank_go_d89abc98202f3b2d(*(*C.swig_type_55)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_56)(unsafe.Pointer(&_swig_i_1)), *(*C.swig_type_57)(unsafe.Pointer(&_swig_i_2)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -301,7 +301,7 @@ func NewInfoSpace__SWIG_7(arg1 string, arg2 string) (_swig_ret InfoSpace, err er
var swig_r InfoSpace
_swig_i_0 := arg1
_swig_i_1 := arg2
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_7_vank_go_073f147d1da00b5b(*(*C.swig_type_58)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_59)(unsafe.Pointer(&_swig_i_1)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_7_vank_go_d89abc98202f3b2d(*(*C.swig_type_58)(unsafe.Pointer(&_swig_i_0)), *(*C.swig_type_59)(unsafe.Pointer(&_swig_i_1)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -318,7 +318,7 @@ func NewInfoSpace__SWIG_8(arg1 string) (_swig_ret InfoSpace, err error) {
defer catch(&err)
var swig_r InfoSpace
_swig_i_0 := arg1
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_8_vank_go_073f147d1da00b5b(*(*C.swig_type_60)(unsafe.Pointer(&_swig_i_0)))))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_8_vank_go_d89abc98202f3b2d(*(*C.swig_type_60)(unsafe.Pointer(&_swig_i_0)))))
if Swig_escape_always_false {
Swig_escape_val = arg1
}
......@@ -331,7 +331,7 @@ func NewInfoSpace__SWIG_8(arg1 string) (_swig_ret InfoSpace, err error) {
func NewInfoSpace__SWIG_9() (_swig_ret InfoSpace, err error) {
defer catch(&err)
var swig_r InfoSpace
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_9_vank_go_073f147d1da00b5b()))
swig_r = (InfoSpace)(SwigcptrWrapped_InfoSpace(C._wrap_new_Wrapped_InfoSpace__SWIG_9_vank_go_d89abc98202f3b2d()))
if swig_r == nil {
err = fmt.Errorf("failed to allocate NewInfoSpace.\n")
}
......@@ -533,7 +533,7 @@ func (arg1 SwigcptrWrapped_InfoSpace) InfoSpaceAddDoc(a ...interface{}) (_swig_r
var swig_r Lemur_api_DOCID_T
_swig_i_0 := arg1
_swig_i_1 := arg2
swig_r = (Lemur_api_DOCID_T)(SwigcptrLemur_api_DOCID_T(C._wrap_Wrapped_InfoSpace_addDoc__SWIG_1_vank_go_073f147d1da00b5b(C.uintptr_t(_swig_i_0), *(*C.swig_type_80)(unsafe.Pointer(&_swig_i_1)))))
swig_r = (Lemur_api_DOCID_T)(SwigcptrLemur_api_DOCID_T(C._wrap_Wrapped_InfoSpace_addDoc__SWIG_1_vank_go_d89abc98202f3b2d(C.uintptr_t(_swig_i_0), *(*C.swig_type_80)(unsafe.Pointer(&_swig_i_1)))))
if Swig_escape_always_false {
Swig_escape_val = arg2
}
......@@ -546,7 +546,7 @@ func (arg1 SwigcptrWrapped_InfoSpace) InfoSpaceAddDoc(a ...interface{}) (_swig_r
_swig_i_0 := arg1
_swig_i_1 := arg2
_swig_i_2 := arg3
swig_r = (Lemur_api_DOCID_T)(SwigcptrLemur_api_DOCID_T(C._wrap_Wrapped_InfoSpace_addDoc__SWIG_0_vank_go_073f147d1da00b5b(C.uintptr_t(_swig_i_0), *(*C.swig_type_81)(unsafe.Pointer(&_swig_i_1)), C._Bool(_swig_i_2))))
swig_r = (Lemur_api_DOCID_T)(SwigcptrLemur_api_DOCID_T(C._wrap_Wrapped_InfoSpace_addDoc__SWIG_0_vank_go_d89abc98202f3b2d(C.uintptr_t(_swig_i_0), *(*C.swig_type_81)(unsafe.Pointer(&_swig_i_1)), C._Bool(_swig_i_2))))
if Swig_escape_always_false {
Swig_escape_val = arg2
}
......@@ -663,7 +663,7 @@ func (arg1 SwigcptrWrapped_InfoSpace) InfoSpaceGetDomain(arg2 Lemur_api_DOCID_T)
var swig_r Domain
_swig_i_0 := arg1
_swig_i_1 := arg2.Swigcptr()
swig_r = (Domain)(SwigcptrWrapped_Domain(C._wrap_Wrapped_InfoSpace_getDomain_vank_go_073f147d1da00b5b(C.uintptr_t(_swig_i_0), C.uintptr_t(_swig_i_1))))
swig_r = (Domain)(SwigcptrWrapped_Domain(C._wrap_Wrapped_InfoSpace_getDomain_vank_go_d89abc98202f3b2d(C.uintptr_t(_swig_i_0), C.uintptr_t(_swig_i_1))))
return swig_r, err
}
......@@ -682,7 +682,7 @@ func (arg1 SwigcptrWrapped_InfoSpace) InfoSpaceFindExtent(arg2 string, arg3 stri
func (arg1 SwigcptrWrapped_InfoSpace) NewDomain() (_swig_ret Domain, err error) {
defer catch(&err)
_swig_i_0 := arg1.Swigcptr()
_swig_ret = (Domain)(SwigcptrWrapped_Domain(C._wrap_new_Wrapped_Domain_vank_go_073f147d1da00b5b(C.uintptr_t(_swig_i_0))))
_swig_ret = (Domain)(SwigcptrWrapped_Domain(C._wrap_new_Wrapped_Domain_vank_go_d89abc98202f3b2d(C.uintptr_t(_swig_i_0))))
return
}
......
Parameters_post.i
View file @ e41bf74c
......@@ -18,7 +18,7 @@ type Parameters interface {
func NewParameters() (swig_r Parameters, err error) {
defer catch(&err)
swig_r = (Parameters)(SwigcptrWrapped_Parameters(C._wrap_new_Wrapped_Parameters_vank_go_073f147d1da00b5b()))
swig_r = (Parameters)(SwigcptrWrapped_Parameters(C._wrap_new_Wrapped_Parameters_vank_go_d89abc98202f3b2d()))
return
}
......
README.md
View file @ e41bf74c
......@@ -14,35 +14,94 @@ Pre-Requisites
Linux platform
```
```bash
cd $PROJECT_ROOT
#
# swig interface differences between vank and go-idx-engine should match the
# enumerated list of expected differences in the file: INTERFACE-DIFFS.md
#
# use the following to find differences in common interface files
(cd ~/Work/vank/swig/src/interface; ls *.i) | xargs -n1 -t -iXXX diff XXX ./XXX
# next command line should print 40
ls *.i | wc -l
# next command line should print 38
ls ~/Work/vank/swif/src/interface/*.i | wc -l
# differences from next command should match those expected: INTERFACE-DIFFS.md
ls *.i | xargs -n1 -t -iXXX diff XXX ~/Work/vank/swig/src/interface/XXX
#
# correct as appropriate, depending on whether changes are applied/verified in
# vank of go-idx-engine folder.
#
# copy CGO header makefile
cp -v ~/usr/share/vank/Makefile.cgo ./
cp -v ~/usr/share/infospace/Makefile.icgo ./
make -f Makefile.cgo clean
make -f Makefile.icgo clean
make -f Makefile.cgo
make -f Makefile.icgo
go clean
# golang security precaution requires next line
# see: https://zchee.github.io/golang-wiki/InvalidFlag/
export CGO_CXXFLAGS_ALLOW="-DPACKAGE_BUGREPORT=tavit@dms3.io"
# repeat the next three commands when test command fails as discussed below
# and fixes for "could not determine kind of name" are applied as discussed
# under notes below.
swig -go -cgo -c++ -intgosize 64 vank.i
go build -a -v
go test -v
### see notes "i)" and "ii)" below if test fails with:
# gitlab.dms3.io/is/go-idx-engine
./vank_go.go:6253:58: could not determine kind of name for C._wrap_MetadataPairVector_get_vank_go_073f147d1da00b5b
./vank_go.go:6814:58: could not determine kind of name for C._wrap_Wrapped_InfoSpace_addDoc__SWIG_0_vank_go_073f147d1da00b5b
./vank_go.go:6801:58: could not determine kind of name for C._wrap_Wrapped_InfoSpace_addDoc__SWIG_1_vank_go_073f147d1da00b5b
./vank_go.go:6931:43: could not determine kind of name for C._wrap_Wrapped_InfoSpace_getDomain_vank_go_073f147d1da00b5b
./vank_go.go:7227:2: could not determine kind of name for C._wrap_delete_DocIdVector_vank_go_073f147d1da00b5b
./vank_go.go:7296:2: could not determine kind of name for C._wrap_delete_StringPairVector_vank_go_073f147d1da00b5b
./vank_go.go:7182:54: could not determine kind of name for C._wrap_new_DocIdVector__SWIG_0_vank_go_073f147d1da00b5b
./vank_go.go:7187:54: could not determine kind of name for C._wrap_new_DocIdVector__SWIG_1_vank_go_073f147d1da00b5b
./vank_go.go:6208:68: could not determine kind of name for C._wrap_new_MetadataPairVector__SWIG_0_vank_go_073f147d1da00b5b
./vank_go.go:6213:68: could not determine kind of name for C._wrap_new_MetadataPairVector__SWIG_1_vank_go_073f147d1da00b5b
./vank_go.go:7251:64: could not determine kind of name for C._wrap_new_StringPairVector__SWIG_0_vank_go_073f147d1da00b5b
./vank_go.go:7256:64: could not determine kind of name for C._wrap_new_StringPairVector__SWIG_1_vank_go_073f147d1da00b5b
./vank_go.go:6950:46: could not determine kind of name for C._wrap_new_Wrapped_Domain_vank_go_073f147d1da00b5b
./vank_go.go:5654:66: could not determine kind of name for C._wrap_new_Wrapped_IndexEnvironment_vank_go_073f147d1da00b5b
./vank_go.go:6338:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_0_vank_go_073f147d1da00b5b
./vank_go.go:6383:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_1_vank_go_073f147d1da00b5b
./vank_go.go:6424:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_2_vank_go_073f147d1da00b5b
./vank_go.go:6461:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_3_vank_go_073f147d1da00b5b
./vank_go.go:6494:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_4_vank_go_073f147d1da00b5b
./vank_go.go:6523:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_5_vank_go_073f147d1da00b5b
./vank_go.go:6548:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_6_vank_go_073f147d1da00b5b
./vank_go.go:6569:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_7_vank_go_073f147d1da00b5b
./vank_go.go:6586:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_8_vank_go_073f147d1da00b5b
./vank_go.go:6599:49: could not determine kind of name for C._wrap_new_Wrapped_InfoSpace__SWIG_9_vank_go_073f147d1da00b5b
./vank_go.go:6086:61: could not determine kind of name for C._wrap_new_Wrapped_MetadataPair_vank_go_073f147d1da00b5b
./vank_go.go:5603:51: could not determine kind of name for C._wrap_new_Wrapped_Parameters_vank_go_073f147d1da00b5b
FAIL gitlab.dms3.io/is/go-idx-engine [build failed]
```
__Notes__
- the swig interface files (*.i) and cgo directives __must__ match the equivalent files in the respective infospace and vank libraries.
- the cgo directives are generated by Makefilie.cgo from vank, and Makefile.icgo from infospace. the swig compile command adds the directives to the top of vank_go.go as __import "C"__.
- when the pimary interface file vank.i is modified, swig compilation may assign go type names a different unique numeric sub-string referring to the wrapped c++ types that cause a subsequent go build to fail. When this happens, interface files that define go types for c++ types need to be modified and re-compiled with swig. the following patterns highlight the substring that should match:
- when the primary interface file vank.i is modified, swig compilation may assign go type names a different unique numeric sub-string referring to the wrapped c++ types that cause a subsequent go build to fail. When this happens, interface files that define go types for c++ types need to be modified and re-compiled with swig. the following patterns highlight the substring that should match:
i) find the types assigned new unique number:
```
```bash
egrep --color '_vank_go_[0123456789abcdef]{16}' vank_go.go
extern void _wrap_Swig_free_vank_go_c2859e9b02de2bf9(uintptr_t arg1);
```
ii) edit the references to those types in referencing interface files:
```
```bash
egrep --color '_vank_go_[0123456789abcdef]{16}' *.i
IndexEnvironment_post.i: return (IndexEnvironment)(SwigcptrWrapped_IndexEnvironment(C._wrap_new_Wrapped_IndexEnvironment_vank_go_8e24520e0b567faa()))
```
......@@ -50,13 +109,14 @@ IndexEnvironment_post.i: return (IndexEnvironment)(SwigcptrWrapped_IndexEnvir
iii) re-compile using the swig command above.
- this module wraps c++ exceptions and converts them into GO errors. the mechanism relies on c++ and CGO implementations and is not guaranteed to always properly intercept the c++ side exception. the mechanism used is described in the two interface files:
```
```bash
protect_post.i
protect_pre.i
```
- the following vank interface files __must__ match vank/swig/src/interface/:
```
```bash
ConflationPattern.i
DocIdVector_post.i
DocumentVector.i
......@@ -93,7 +153,8 @@ IndexEnvironment_post.i: return (IndexEnvironment)(SwigcptrWrapped_IndexEnvir
vanktypemaps.i
```
- the following vank interface files parts that reference infospace are commented out in vank/swig/src/interface/:
```
```bash
DocIdVector.i
DomainPtrVector.i
protect_post.i
......@@ -101,7 +162,8 @@ IndexEnvironment_post.i: return (IndexEnvironment)(SwigcptrWrapped_IndexEnvir
```
- the following infospace interface files __must__ match infospace/swig/src/interface/:
```
```bash
Odms.i
Odms_post.i
```
StringPairVector_post.i
View file @ e41bf74c
......@@ -21,12 +21,12 @@ func NewWrapped_StringPairVector(a ...interface{}) (swig_r Wrapped_StringPairVec
defer catch(&err)
argc := len(a)
if argc == 0 {
swig_r = (Wrapped_StringPairVector)(SwigcptrStringPairVector(C._wrap_new_StringPairVector__SWIG_0_vank_go_073f147d1da00b5b()))
swig_r = (Wrapped_StringPairVector)(SwigcptrStringPairVector(C._wrap_new_StringPairVector__SWIG_0_vank_go_d89abc98202f3b2d()))
return
}
if argc == 1 {
_swig_i_0 := a[0].(int64)
swig_r = (Wrapped_StringPairVector)(SwigcptrStringPairVector(C._wrap_new_StringPairVector__SWIG_1_vank_go_073f147d1da00b5b(C.swig_type_154(_swig_i_0))))
swig_r = (Wrapped_StringPairVector)(SwigcptrStringPairVector(C._wrap_new_StringPairVector__SWIG_1_vank_go_d89abc98202f3b2d(C.swig_type_154(_swig_i_0))))
return
}
panic("No match for overloaded function call")
......@@ -66,7 +66,7 @@ func (arg1 SwigcptrStringPairVector) WSet(arg2 int, arg3 Wrapped_StringPair) (er
func DeleteWrapped_StringPairVector(arg1 Wrapped_StringPairVector) {
_swig_i_0 := arg1.Swigcptr()
C._wrap_delete_StringPairVector_vank_go_073f147d1da00b5b(C.uintptr_t(_swig_i_0))
C._wrap_delete_StringPairVector_vank_go_d89abc98202f3b2d(C.uintptr_t(_swig_i_0))
}
%}
......
go.mod
View file @ e41bf74c
......@@ -2,6 +2,4 @@ module gitlab.dms3.io/is/go-idx-engine
go 1.15
require (
gitlab.dms3.io/dms3/go-dms3-util v0.0.2
)
require gitlab.dms3.io/dms3/go-dms3-util v0.0.2
go.sum
View file @ e41bf74c
github.com/dms3-fs/go-fs-util v1.2.8/go.mod h1:Sg+LDldpQOdkAwHuhCfy92w5HVy0Ox/M2e3kFAWyGbU=
github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo=
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc=
github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
github.com/multiformats/go-multihash v0.0.13 h1:06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc=
github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
github.com/multiformats/go-multihash v0.0.16/go.mod h1:zhfEIgVnB/rPMfxgFw15ZmGoNaKyNUIE4IWHG/kC+Ag=
github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
gitlab.dms3.io/dms3/go-dms3-util v0.0.2 h1:xXHeLaht5szd3QPdQp5KcfmXbIyRvRPSdQnMkJPRgPo=
......@@ -21,12 +15,8 @@ gitlab.dms3.io/dms3/go-dms3-util v0.0.2/go.mod h1:5hPwxzo5zK4NeHE/anWIQGHcIoG7aT
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
vank.i
View file @ e41bf74c
......@@ -94,7 +94,7 @@ typedef long long UINT64;
%}
#endif
#endif
#ifdef SWIGPHP5
#ifdef SWIGPHP7
%module libvank_php
%{
#ifdef VANK_STANDALONE
......
vank_go.go
View file @ e41bf74c
This source diff could not be displayed because it is too large. You can view the blob instead.
vank_wrap.cxx
View file @ e41bf74c
This source diff could not be displayed because it is too large. You can view the blob instead.
vanktypemaps.i
View file @ e41bf74c
#ifdef SWIGPHP5
#ifdef SWIGPHP7
// typemaps for vank types.
typedef long long INT64;
typedef long long UINT64;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment