Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Column type rename #74

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e2b984a
A bit about Linux
Jun 1, 2012
24a315d
spell error fixed
Dec 5, 2012
8db4b25
Merge branch 'develop' of github.com:Tightdb/tightdb_java2 into develop
Dec 5, 2012
fc5d64f
Updated code generator (issue #70).
nmihajlovski Dec 20, 2012
3ecd50d
Added test for inline table construction (issue #70).
nmihajlovski Dec 20, 2012
a5fb7f9
Adjusted examples to the inline subtable construction (issue #70).
nmihajlovski Dec 20, 2012
3175903
Limited access to some internal methods (issue #39).
nmihajlovski Dec 20, 2012
4a977d5
Renamed classes and packages (issue #69 and issue #72).
nmihajlovski Dec 20, 2012
f9f4758
Renamed classes and package "typed" (issue #69 and ossue #72).
nmihajlovski Dec 21, 2012
2d5782c
Renamed classes (issue #69).
nmihajlovski Dec 21, 2012
33108da
Renamed methods of JNI files, so 'Base' is removed. Still need to ren…
Dec 21, 2012
c0c1c1b
Merge branch 'master' of github.com:bmunkholm/tightdb_java2 into feat…
Dec 21, 2012
85085de
Merge branch 'master' of github.com:nikuco/tightdb_java2 into feature…
Dec 21, 2012
c743df8
Renamed 'Base' files in JNI.
Dec 21, 2012
34df377
Rolled back the "insertXXX" methods and adjusted generator (issue #71).
nmihajlovski Dec 23, 2012
b55e894
Fixed in-line subtable values insertion.
nmihajlovski Dec 23, 2012
84c12ba
Fixed Maven test errors due to the package refactoring (issue #72).
nmihajlovski Jan 4, 2013
351922c
Merge branch 'feature_insert' of github.com:Tightdb/tightdb_java2 int…
Jan 28, 2013
f1f2b96
Merge branch 'master' of github.com:nikuco/tightdb_java2 into ref-doc
Jan 28, 2013
6892df6
Added the missing tests after the package name refactoring.
nmihajlovski Jan 29, 2013
a516bed
Changed a comment. Removed old .dll
Jan 31, 2013
0057909
Merge branch 'master' of github.com:Tightdb/tightdb_java2 into floats
Jan 31, 2013
f680e9f
Merge branch 'master' of https://github.com/Tightdb/tightdb_java2
nmihajlovski Jan 31, 2013
cdf435b
Merge branch 'floats' of https://github.com/Tightdb/tightdb_java2
nmihajlovski Jan 31, 2013
5899c22
Adjusted the build script to the new package name "typed".
nmihajlovski Jan 31, 2013
0e3df5b
Removed a reference to a non-existing method in the examples.
nmihajlovski Jan 31, 2013
990bcee
WIP: Updated with float, double support. Still a crash.
Jan 31, 2013
307e45c
Merge branch 'floats' of github.com:Tightdb/tightdb_java2 into ref-doc
Feb 3, 2013
58e4b2d
float: updated floats sum, average to return double instead of float.
Feb 3, 2013
12d084f
Merge branch 'master' of github.com:nikuco/tightdb_java2 into floats
Feb 3, 2013
74c2a3c
Merge branch 'floats' of github.com:Tightdb/tightdb_java2 into ref-doc
Feb 3, 2013
fc8f2c9
updated examples to new "typed" package from "lib". Still a few examp…
Feb 3, 2013
ee7b855
added some ref-docs
Feb 3, 2013
c757cd9
Supported float and double types in code generator and typed API.
nmihajlovski Feb 4, 2013
fcf5292
Merge branch 'floats' into column_type_rename
kspangsege Feb 7, 2013
477bd8a
Tracking changes in core library: Renaming of column type enumeration
kspangsege Feb 7, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .JNI-h-file-generation.launch
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\Program Files\Java\jdk1.7.0\bin\javah.exe"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d ${workspace_loc}/../tightdb_java2/tightdb-java-core/target/classes/jni com.tightdb.Group com.tightdb.TableBase com.tightdb.TableViewBase com.tightdb.TableQuery com.tightdb.internal.util com.tightdb.SharedGroup"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d ${workspace_loc}/../tightdb_java2/tightdb-java-core/target/classes/jni com.tightdb.Group com.tightdb.Table com.tightdb.TableView com.tightdb.TableQuery com.tightdb.internal.util com.tightdb.SharedGroup"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc}/../tightdb_java2/tightdb-java-core/target/classes"/>
</launchConfiguration>
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ case "$MODE" in
# Build tightdb.jar
mkdir -p "$JAR_DIR" || exit 1
cd "$TIGHTDB_JAVA_HOME/tightdb-java-core/src/main" || exit 1
(cd java && $JAVAC com/tightdb/*.java com/tightdb/internal/*.java com/tightdb/lib/*.java) || exit 1
(cd java && jar cf "$JAR_DIR/tightdb.jar" com/tightdb/*.class com/tightdb/internal/*.class com/tightdb/lib/*.class) || exit 1
(cd java && $JAVAC com/tightdb/*.java com/tightdb/internal/*.java com/tightdb/typed/*.java) || exit 1
(cd java && jar cf "$JAR_DIR/tightdb.jar" com/tightdb/*.class com/tightdb/internal/*.class com/tightdb/typed/*.class) || exit 1
jar i "$JAR_DIR/tightdb.jar" || exit 1

# Build tightdb-devkit.jar
Expand All @@ -232,7 +232,7 @@ case "$MODE" in
(cd java && jar uf "$JAR_DIR/tightdb-devkit.jar" com/tightdb/generator/*.class) || exit 1
(cd "$JAR_DIR" && jar i "tightdb-devkit.jar") || exit 1

# Absorb dependency JARs if we have to - generally a bag thing!!!
# Absorb dependency JARs if we have to - generally a bad thing!!!
if [ "$ABSORB_DEP_JARS" ]; then
TEMP_JAR_DIR="$TEMP_DIR/jar"
mkdir "$TEMP_JAR_DIR" || exit 1
Expand Down
225 changes: 225 additions & 0 deletions doc/ref/data/group_ref.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
#
# Java reference documentation for Group class
#

#UNDOCUMENTED: [
# g_group_operator_equal, g_group_operator_not_equal,
# g_group_is_shared, g_group_tostring,
# commit, to_json, get_table_typed]

ID : class_group
TITLE : Group
SUMMARY : *g_group_summary
DESCR : *g_group_descr
SEE :
EXAMPLES:
- DESCR :
CODE : ex_java_group_intro
IGNORE : [] # List of method-ids to ignore
CATEGORIES:
- Constructor:
METHODS:
- g_group_constructor_plain:
- g_group_constructor_file:
- g_group_constructor_memory:
NAMES : Group
DESCR : *g_group_constructor_descr
SUMMARY : *g_group_constructor_summary
SIGNATURE: |
Group()
Group(File file)
Group(String fileName)
Group(String fileName, boolean readOnly)
Group(byte[] data)
Group(ByteBuffer buffer)
PARAMS:
- NAME : file
TYPES : java.io.File
DESCR : A File object.
- NAME : fileName
TYPES : String
DESCR : The name of the file.
- NAME : readOnly
TYPES : boolean
DESCR : Open the group as read-only or read-write. If not used, the file opened as read-only.
- NAME : data
TYPES : byte[]
DESCR : In-memory binary encoded representation of a group.
- NAME : buffer
TYPES : ByteBuffer
DESCR : In-memory binary encoded representation of a group.
RETURN:
TYPES : Group
DESCR : A - possibly empty - group.
EXAMPLES:
- DESCR :
CODE : ex_java_group_constructor_plain
- DESCR :
CODE : ex_java_group_constructor_file
- DESCR :
CODE : ex_java_group_constructor_memory
SEE : "{@link g_group_is_valid}"
- g_group_desctructor:
NAMES : close
DESCR : >
This method will close the group and release it's resources (memory and files).
Java will to this automatically via garbage collection, but if you want explicit control,
you have the option with this method.
SUMMARY : Close the group and release it's resources.

- Table:
METHODS:
- g_group_has_table:
NAMES : hasTable
SUMMARY : *g_group_has_table_summary
DESCR : The method checks whether this group contains the specified table.
PARAMS:
- NAME : name
TYPES : String
DESCR : Name of the table you wish to look for.
RETURN:
TYPES : bool
DESCR : <code>true</code> if the table exits, otherwise <code>false</code>.
EXAMPLES:
- DESCR :
CODE : ex_java_group_optional_table

- g_group_get_table:
NAMES : getTable
SUMMARY : *g_group_get_table_summary
DESCR : >
This method will find and return a named table from the group.

If no table exists with the specified name, a new
empty table will be created.
PARAMS:
- NAME : name
TYPES : String
DESCR : Name of the table you wish to retrieve.
RETURN:
TYPES : Table
DESCR : The requested Table object.
EXAMPLES:
- DESCR :
CODE : ex_java_group_traverse
- DESCR :
CODE : ex_java_group_optional_table
SEE : "{@link g_group_has_table}"

- g_group_get_table_name:
NAMES : getTableName
DESCR : *g_group_get_table_name_descr
SUMMARY : *g_group_get_table_name_summary
PARAMS:
- NAME : index
TYPES : int
DESCR : Table index.
RETURN:
TYPES : String
DESCR : The table name.
EXAMPLES:
- DESCR :
CODE : ex_java_group_traverse

- Serialization:
METHODS:
- g_group_write_to_file:
NAMES : writeToFile
SUMMARY : *g_group_write_to_file_summary
DESCR : *g_group_write_to_file_descr
SIGNATURE: |
writeToFile(File file)
writeToFile(String fileName)
PARAMS:
- NAME : file
TYPES : java.io.File
DESCR : File object
- NAME : fileName
TYPES : String
DESCR : File name, possibly a full path.
RETURN:
DESCR : <code>true</code> is successful, <code>false</code> otherwise.
TYPES : bool
EXAMPLES:
- DESCR :
CODE : ex_java_group_write_to_file
- g_group_write_to_mem:
NAMES : writeToMem
DESCR : *g_group_write_to_mem_descr
SUMMARY : *g_group_write_to_mem_summary
RETURN:
DESCR : A copy of the serialized group.
TYPES : byte[]
EXAMPLES:
- DESCR :
CODE : ex_java_group_write_to_mem
- g_group_write_to_mem_bytebuffer:
NAMES : writeToByteBuffer
DESCR : *g_group_write_to_mem_descr
SUMMARY : *g_group_write_to_mem_summary
RETURN:
DESCR : A copy of the serialized group.
TYPES : ByteBuffer
EXAMPLES:
- DESCR :
CODE : ex_java_group_write_to_mem

- Group:
METHODS:
- g_group_table_count:
NAMES : getTableCount
DESCR : *g_group_table_count_descr
SUMMARY : *g_group_table_count_summary
RETURN:
TYPES : int
DESCR : The number of tables in the group.
EXAMPLES:
- DESCR :
CODE : #???ex_cpp_group_traverse

- g_group_is_empty:
NAMES : isEmpty
SUMMARY : *g_group_is_empty_summary
DESCR : *g_group_is_empty_descr
RETURN:
TYPES : bool
DESCR : <code>true</code> if group is empty (no tables), <code>false</code> otherwise.
EXAMPLES:
- DESCR :
CODE : ex_java_group_is_empty

- g_group_is_valid:
NAMES : isValid
SUMMARY : *g_group_is_valid_summary
DESCR : *g_group_is_valid_descr
RETURN:
TYPES : boolean
DESCR : <code>true</code> if group is valid (consistent), <code>false</code> otherwise.
EXAMPLES:
- DESCR :
CODE : ex_java_group_is_valid

# - g_group_is_shared:
# NAMES : isShared
# SUMMARY : *g_group_is_shared_summary
# DESCR : *g_group_is_shared_descr
# RETURN:
# TYPES : bool
# DESCR : <code>true</code> if group is shared, <code>false</code> otherwise.
# EXAMPLES:
# - DESCR :
# CODE : ex_java_group_is_shared

# - g_group_tostring:
# NAMES : toString
# SUMMARY : *g_group_to_string_summary
# DESCR : >
# This methods returns textual information about the group.
# It outputs a list of the table names and the number of rows they contain.
# RETURN:
# TYPES : String
# DESCR : Information about the group.
# EXAMPLES:
# - DESCR :
# CODE : ex_java_group_tostring

66 changes: 66 additions & 0 deletions doc/ref/data/reference.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#
# Reference documentation data for language Java
#
ID : java
TITLE : 'Java'
DESCR : >
The goal of TightDB is to provide a high performance
data storage for your applications.

TightDB integrates seamless in Java, making it
fast to learn and easy to use. You can replace your traditional data
structures with TightDB. Whether it is a simple array of integers or a
complex structure, you interface to TightDB as easily as using a
standard array like container. But in addition you can
handle much more data in much less space, you get powerful query
possibilities in an intuitive language and the ability to share your data
across all supported languages and platforms.

The core of the framework is the class {@link class_table}. The
class is a representation of the
fundamental concept <strong>Table</strong>. You can use
{@link class_table} in the situations where you know the table structure
a priori or when the data structure changes dynamically through the run time
of the application.

Tables organize data in columns and rows and data is compacted for
low memory usage. The interface to the data resembles the native
data structures. Moreover, tables can have nested tables as data. Using subtables
and mixed types you can build arbitrarily complex data structures.

It is possible to query data using the {@link class_query} and
class. Queries can be complex - involving
any number of columns and values. You can either apply aggregate functions to you
resulting data set or use the data set in your application as a
{@link class_tableview} object.

The {@link class_group} class lets you serialize tables to disk or memory. The
TightDB data format is consistent across operating systems, hardware platforms,
and programming languages. This implies that you can share data across applications
and environments. For multi-threaded or multi-process applications, you can
use the {@link class_shared_group}.

IMPORT : [reference, typed_table_ref, dyn_table_ref, dyn_query_ref, group_ref, typed_view_ref, dyn_view_ref, shared_group_ref]
IMPORTPATH: ../../tightdb/doc/ref_cpp/data


CATEGORIES: # list global class-id in order of appearence
- Typed Table: # Category header name
# - typed_table # Global Class name. File: 'typed_table_ref.yaml'
# - typed_view
# - typed_query
- Dynamic Table:
# - dyn_table
# - dyn_view
# - dyn_query
- Collection:
- group
# - shared_group
- Helpers:
# - mixed
# - cursor

EXAMPLES :
- DESCR :
CODE : #ex_cpp_intro # id to example code

Loading