ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/BDB/BDB.xs
(Generate patch)

Comparing BDB/BDB.xs (file contents):
Revision 1.60 by root, Mon Oct 20 02:58:42 2008 UTC vs.
Revision 1.66 by root, Sun Jan 4 10:48:15 2009 UTC

… …
149 149
150enum { 150enum {
151 REQ_QUIT, 151 REQ_QUIT,
152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 152 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME, 153 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, REQ_ENV_DBREMOVE, REQ_ENV_DBRENAME,
154 REQ_ENV_LOG_ARCHIVE,
154 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE, 155 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
155 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 156 REQ_DB_PUT, REQ_DB_EXISTS, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
156 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 157 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
157 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 158 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
158 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 159 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
… …
377 378
378 av_push (av, newSVnv (req->key_range.less)); 379 av_push (av, newSVnv (req->key_range.less));
379 av_push (av, newSVnv (req->key_range.equal)); 380 av_push (av, newSVnv (req->key_range.equal));
380 av_push (av, newSVnv (req->key_range.greater)); 381 av_push (av, newSVnv (req->key_range.greater));
381 382
383 av = (AV *)newRV_noinc ((SV *)av);
384
382 SvREADONLY_off (req->sv1); 385 SvREADONLY_off (req->sv1);
383 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av)); 386 sv_setsv_mg (req->sv1, newRV_noinc ((SV *)av));
387 SvREFCNT_dec (av);
384 SvREFCNT_dec (req->sv1); 388 SvREFCNT_dec (req->sv1);
385 } 389 }
386 break; 390 break;
387 391
388#if DB_VERSION_MINOR >= 3 392#if DB_VERSION_MINOR >= 3
… …
395 sv_setnv_mg (req->sv1, (NV)req->seq_t); 399 sv_setnv_mg (req->sv1, (NV)req->seq_t);
396 400
397 SvREFCNT_dec (req->sv1); 401 SvREFCNT_dec (req->sv1);
398 break; 402 break;
399#endif 403#endif
404
405 case REQ_ENV_LOG_ARCHIVE:
406 {
407 AV *av = newAV ();
408 char **listp = (char **)req->buf1;
409
410 if (listp)
411 while (*listp)
412 av_push (av, newSVpv (*listp, 0)), ++listp;
413
414 av = (AV *)newRV_noinc ((SV *)av);
415
416 SvREADONLY_off (req->sv1);
417 sv_setsv_mg (req->sv1, (SV *)av);
418 SvREFCNT_dec (av);
419 SvREFCNT_dec (req->sv1);
420 }
421 break;
400 } 422 }
401 423
402 errno = req->result; 424 errno = req->result;
403 425
404 if (req->callback) 426 if (req->callback)
… …
437} 459}
438 460
439#ifdef USE_SOCKETS_AS_HANDLES 461#ifdef USE_SOCKETS_AS_HANDLES
440# define TO_SOCKET(x) (win32_get_osfhandle (x)) 462# define TO_SOCKET(x) (win32_get_osfhandle (x))
441#else 463#else
464# define EV_SELECT_IS_WINSOCKET 1
442# define TO_SOCKET(x) (x) 465# define TO_SOCKET(x) (x)
466#endif
467
468#ifdef _WIN32
469/* taken verbatim from libev's ev_win32.c */
470/* oh, the humanity! */
471static int
472ev_pipe (int filedes [2])
473{
474 struct sockaddr_in addr = { 0 };
475 int addr_size = sizeof (addr);
476 struct sockaddr_in adr2;
477 int adr2_size;
478 SOCKET listener;
479 SOCKET sock [2] = { -1, -1 };
480
481 if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
482 return -1;
483
484 addr.sin_family = AF_INET;
485 addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
486 addr.sin_port = 0;
487
488 if (bind (listener, (struct sockaddr *)&addr, addr_size))
489 goto fail;
490
491 if (getsockname (listener, (struct sockaddr *)&addr, &addr_size))
492 goto fail;
493
494 if (listen (listener, 1))
495 goto fail;
496
497 if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
498 goto fail;
499
500 if (connect (sock [0], (struct sockaddr *)&addr, addr_size))
501 goto fail;
502
503 if ((sock [1] = accept (listener, 0, 0)) < 0)
504 goto fail;
505
506 /* windows vista returns fantasy port numbers for getpeername.
507 * example for two interconnected tcp sockets:
508 *
509 * (Socket::unpack_sockaddr_in getsockname $sock0)[0] == 53364
510 * (Socket::unpack_sockaddr_in getpeername $sock0)[0] == 53363
511 * (Socket::unpack_sockaddr_in getsockname $sock1)[0] == 53363
512 * (Socket::unpack_sockaddr_in getpeername $sock1)[0] == 53365
513 *
514 * wow! tridirectional sockets!
515 *
516 * this way of checking ports seems to work:
517 */
518 if (getpeername (sock [0], (struct sockaddr *)&addr, &addr_size))
519 goto fail;
520
521 if (getsockname (sock [1], (struct sockaddr *)&adr2, &adr2_size))
522 goto fail;
523
524 errno = WSAEINVAL;
525 if (addr_size != adr2_size
526 || addr.sin_addr.s_addr != adr2.sin_addr.s_addr /* just to be sure, I mean, it's windows */
527 || addr.sin_port != adr2.sin_port)
528 goto fail;
529
530 closesocket (listener);
531
532#if EV_SELECT_IS_WINSOCKET
533 filedes [0] = _open_osfhandle (sock [0], 0);
534 filedes [1] = _open_osfhandle (sock [1], 0);
535#else
536 /* when select isn't winsocket, we also expect socket, connect, accept etc.
537 * to work on fds */
538 filedes [0] = sock [0];
539 filedes [1] = sock [1];
540#endif
541
542 return 0;
543
544fail:
545 closesocket (listener);
546
547 if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
548 if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
549
550 return -1;
551}
552
553#define pipe(filedes) ev_pipe(filedes)
443#endif 554#endif
444 555
445static void 556static void
446create_respipe (void) 557create_respipe (void)
447{ 558{
… …
451 int old_readfd = respipe [0]; 562 int old_readfd = respipe [0];
452 563
453 if (respipe [1] >= 0) 564 if (respipe [1] >= 0)
454 respipe_close (TO_SOCKET (respipe [1])); 565 respipe_close (TO_SOCKET (respipe [1]));
455 566
456#ifdef _WIN32
457 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
458#else
459 if (pipe (respipe)) 567 if (pipe (respipe))
460#endif
461 croak ("unable to initialize result pipe"); 568 croak ("unable to initialize result pipe");
462 569
463 if (old_readfd >= 0) 570 if (old_readfd >= 0)
464 { 571 {
465 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0) 572 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
… …
768 req->result = req->db->close (req->db, req->uint1); 875 req->result = req->db->close (req->db, req->uint1);
769 break; 876 break;
770 877
771#if DB_VERSION_MINOR >= 4 878#if DB_VERSION_MINOR >= 4
772 case REQ_DB_COMPACT: 879 case REQ_DB_COMPACT:
773 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 880 req->result = req->db->compact (req->db, req->txn, req->dbt1.data ? &req->dbt1 : 0, req->dbt2.data ? &req->dbt2 : 0, 0, req->uint1, 0);
774 break; 881 break;
775#endif 882#endif
776 883
777 case REQ_DB_SYNC: 884 case REQ_DB_SYNC:
778 req->result = req->db->sync (req->db, req->uint1); 885 req->result = req->db->sync (req->db, req->uint1);
… …
869 976
870 case REQ_SEQ_REMOVE: 977 case REQ_SEQ_REMOVE:
871 req->result = req->seq->remove (req->seq, req->txn, req->uint1); 978 req->result = req->seq->remove (req->seq, req->txn, req->uint1);
872 break; 979 break;
873#endif 980#endif
981
982 case REQ_ENV_LOG_ARCHIVE:
983 {
984 char **listp = 0; /* DB_ARCH_REMOVE does not touch listp, contrary to docs */
985 req->result = req->env->log_archive (req->env, &listp, req->uint1);
986 req->buf1 = (char *)listp;
987 }
988 break;
874 989
875 default: 990 default:
876 req->result = ENOSYS; 991 req->result = ENOSYS;
877 break; 992 break;
878 } 993 }
… …
1132 } 1247 }
1133 } 1248 }
1134 1249
1135 return 0; 1250 return 0;
1136} 1251}
1252
1253/*****************************************************************************/
1254
1255#if 0
1256static int
1257bt_pfxc_compare (DB *db, const DBT *dbt1, const DBT *dbt2)
1258{
1259 ssize_t size1 = dbt1->size;
1260 ssize_t size2 = dbt2->size;
1261 int res = memcmp ((void *)dbt1->data, (void *)dbt2->data,
1262 size1 <= size2 ? size1 : size2);
1263
1264 if (res)
1265 return res;
1266 else if (size1 - size2)
1267 return size1 - size2;
1268 else
1269 return 0;
1270}
1271
1272static size_t
1273bt_pfxc_prefix_x (DB *db, const DBT *dbt1, const DBT *dbt2)
1274{
1275 ssize_t size1 = dbt1->size;
1276 ssize_t size2 = dbt2->size;
1277 u_int8_t *p1 = (u_int8_t *)dbt1->data;
1278 u_int8_t *p2 = (u_int8_t *)dbt2->data;
1279 u_int8_t *pe = p1 + (size1 <= size2 ? size1 : size2);
1280
1281 while (p1 < pe)
1282 if (*p1++ != *p2++)
1283 return p1 - (u_int8_t *)dbt1->data - 1;
1284
1285 if (size1 < size2) return size1 + 1;
1286 if (size1 > size2) return size2 + 1;
1287
1288 return size1;
1289}
1290#endif
1291
1292/*****************************************************************************/
1137 1293
1138/* stupid windows defines CALLBACK as well */ 1294/* stupid windows defines CALLBACK as well */
1139#undef CALLBACK 1295#undef CALLBACK
1140#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1)); 1296#define CALLBACK SV *cb = pop_callback (&items, ST (items - 1));
1141 1297
… …
1196 const_iv (NOSYNC) 1352 const_iv (NOSYNC)
1197 const_iv (CHKSUM) 1353 const_iv (CHKSUM)
1198 const_iv (ENCRYPT) 1354 const_iv (ENCRYPT)
1199 const_iv (DUP) 1355 const_iv (DUP)
1200 const_iv (DUPSORT) 1356 const_iv (DUPSORT)
1201 const_iv (RECNUM) 1357 //const_iv (RECNUM)
1202 const_iv (RENUMBER) 1358 const_iv (RENUMBER)
1203 const_iv (REVSPLITOFF) 1359 const_iv (REVSPLITOFF)
1204 const_iv (CONSUME) 1360 const_iv (CONSUME)
1205 const_iv (CONSUME_WAIT) 1361 const_iv (CONSUME_WAIT)
1206 const_iv (GET_BOTH) 1362 const_iv (GET_BOTH)
… …
1278 const_iv (REP_UNAVAIL) 1434 const_iv (REP_UNAVAIL)
1279 const_iv (RUNRECOVERY) 1435 const_iv (RUNRECOVERY)
1280 const_iv (SECONDARY_BAD) 1436 const_iv (SECONDARY_BAD)
1281 const_iv (VERIFY_BAD) 1437 const_iv (VERIFY_BAD)
1282 1438
1439 const_iv (ARCH_ABS)
1440 const_iv (ARCH_DATA)
1441 const_iv (ARCH_LOG)
1442 const_iv (ARCH_REMOVE)
1443
1283 const_iv (VERB_DEADLOCK) 1444 const_iv (VERB_DEADLOCK)
1284 const_iv (VERB_RECOVERY) 1445 const_iv (VERB_RECOVERY)
1285 const_iv (VERB_REPLICATION) 1446 const_iv (VERB_REPLICATION)
1286 const_iv (VERB_WAITSFOR) 1447 const_iv (VERB_WAITSFOR)
1287 1448
… …
1320 const_iv (PRIORITY_VERY_LOW) 1481 const_iv (PRIORITY_VERY_LOW)
1321 const_iv (PRIORITY_LOW) 1482 const_iv (PRIORITY_LOW)
1322 const_iv (PRIORITY_DEFAULT) 1483 const_iv (PRIORITY_DEFAULT)
1323 const_iv (PRIORITY_HIGH) 1484 const_iv (PRIORITY_HIGH)
1324 const_iv (PRIORITY_VERY_HIGH) 1485 const_iv (PRIORITY_VERY_HIGH)
1486 const_iv (IGNORE_LEASE)
1325#endif 1487#endif
1326#if DB_VERSION_MINOR >= 7 1488#if DB_VERSION_MINOR >= 7
1489 //const_iv (MULTIPLE_KEY)
1327 const_iv (LOG_DIRECT) 1490 const_iv (LOG_DIRECT)
1328 const_iv (LOG_DSYNC) 1491 const_iv (LOG_DSYNC)
1329 const_iv (LOG_AUTO_REMOVE) 1492 const_iv (LOG_AUTO_REMOVE)
1330 const_iv (LOG_IN_MEMORY) 1493 const_iv (LOG_IN_MEMORY)
1331 const_iv (LOG_ZERO) 1494 const_iv (LOG_ZERO)
… …
1635 req->buf3 = strdup_ornull (newname); 1798 req->buf3 = strdup_ornull (newname);
1636 req->uint1 = flags; 1799 req->uint1 = flags;
1637 REQ_SEND; 1800 REQ_SEND;
1638} 1801}
1639 1802
1803void
1804db_env_log_archive (DB_ENV *env, SV_mutable *listp, U32 flags = 0, SV *callback = 0)
1805 PREINIT:
1806 CALLBACK
1807 CODE:
1808{
1809 dREQ (REQ_ENV_LOG_ARCHIVE, 1);
1810 req->sv1 = SvREFCNT_inc (listp);
1811 req->env = env;
1812 req->uint1 = flags;
1813 REQ_SEND;
1814}
1815
1640DB * 1816DB *
1641db_create (DB_ENV *env = 0, U32 flags = 0) 1817db_create (DB_ENV *env = 0, U32 flags = 0)
1642 CODE: 1818 CODE:
1643{ 1819{
1644 errno = db_create (&RETVAL, env, flags); 1820 errno = db_create (&RETVAL, env, flags);
… …
1691 CODE: 1867 CODE:
1692{ 1868{
1693 dREQ (REQ_DB_COMPACT, 2); 1869 dREQ (REQ_DB_COMPACT, 2);
1694 req->db = db; 1870 req->db = db;
1695 req->txn = txn; 1871 req->txn = txn;
1696 sv_to_dbt (&req->dbt1, start); 1872 if (start) sv_to_dbt (&req->dbt1, start);
1697 sv_to_dbt (&req->dbt2, stop); 1873 if (stop ) sv_to_dbt (&req->dbt2, stop );
1698 req->uint1 = flags; 1874 req->uint1 = flags;
1699 REQ_SEND; 1875 REQ_SEND;
1700} 1876}
1701 1877
1702#endif 1878#endif
… …
1907db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2083db_c_get (DBC *dbc, SV *key, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1908 PREINIT: 2084 PREINIT:
1909 CALLBACK 2085 CALLBACK
1910 CODE: 2086 CODE:
1911{ 2087{
1912 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2088 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1913 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2089 croak ("db_c_get was passed a read-only/constant 'key' argument but operation is not DB_SET");
1914 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) 2090 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1915 croak ("argument \"%s\" must be byte/octet-encoded in %s", 2091 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1916 "key", 2092 "key",
1917 "BDB::db_c_get"); 2093 "BDB::db_c_get");
1918 2094
1919 { 2095 {
1920 dREQ (REQ_C_GET, 1); 2096 dREQ (REQ_C_GET, 1);
1921 req->dbc = dbc; 2097 req->dbc = dbc;
1922 req->uint1 = flags; 2098 req->uint1 = flags;
1923 if (flags & DB_OPFLAGS_MASK == DB_SET) 2099 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1924 sv_to_dbt (&req->dbt1, key); 2100 sv_to_dbt (&req->dbt1, key);
1925 else 2101 else
1926 { 2102 {
1927 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2103 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1928 sv_to_dbt (&req->dbt1, key); 2104 sv_to_dbt (&req->dbt1, key);
1929 else 2105 else
1930 req->dbt1.flags = DB_DBT_MALLOC; 2106 req->dbt1.flags = DB_DBT_MALLOC;
1931 2107
1932 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2108 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1933 } 2109 }
1934 2110
1935 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2111 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1936 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2112 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1937 sv_to_dbt (&req->dbt3, data); 2113 sv_to_dbt (&req->dbt3, data);
1938 else 2114 else
1939 req->dbt3.flags = DB_DBT_MALLOC; 2115 req->dbt3.flags = DB_DBT_MALLOC;
1940 2116
1941 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2117 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);
… …
1947db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0) 2123db_c_pget (DBC *dbc, SV *key, SV_mutable *pkey, SV_mutable *data, U32 flags = 0, SV *callback = 0)
1948 PREINIT: 2124 PREINIT:
1949 CALLBACK 2125 CALLBACK
1950 CODE: 2126 CODE:
1951{ 2127{
1952 if (flags & DB_OPFLAGS_MASK != DB_SET && SvREADONLY (key)) 2128 if ((flags & DB_OPFLAGS_MASK) != DB_SET && SvREADONLY (key))
1953 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET"); 2129 croak ("db_c_pget was passed a read-only/constant 'key' argument but operation is not DB_SET");
1954 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1)) 2130 if (SvPOKp (key) && !sv_utf8_downgrade (key, 1))
1955 croak ("argument \"%s\" must be byte/octet-encoded in %s", 2131 croak ("argument \"%s\" must be byte/octet-encoded in %s",
1956 "key", 2132 "key",
1957 "BDB::db_c_pget"); 2133 "BDB::db_c_pget");
1958 2134
1959 { 2135 {
1960 dREQ (REQ_C_PGET, 1); 2136 dREQ (REQ_C_PGET, 1);
1961 req->dbc = dbc; 2137 req->dbc = dbc;
1962 req->uint1 = flags; 2138 req->uint1 = flags;
1963 if (flags & DB_OPFLAGS_MASK == DB_SET) 2139 if ((flags & DB_OPFLAGS_MASK) == DB_SET)
1964 sv_to_dbt (&req->dbt1, key); 2140 sv_to_dbt (&req->dbt1, key);
1965 else 2141 else
1966 { 2142 {
1967 if (flags & DB_OPFLAGS_MASK == DB_SET_RANGE) 2143 if ((flags & DB_OPFLAGS_MASK) == DB_SET_RANGE)
1968 sv_to_dbt (&req->dbt1, key); 2144 sv_to_dbt (&req->dbt1, key);
1969 else 2145 else
1970 req->dbt1.flags = DB_DBT_MALLOC; 2146 req->dbt1.flags = DB_DBT_MALLOC;
1971 2147
1972 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key); 2148 req->sv1 = SvREFCNT_inc (key); SvREADONLY_on (key);
1973 } 2149 }
1974 2150
1975 req->dbt2.flags = DB_DBT_MALLOC; 2151 req->dbt2.flags = DB_DBT_MALLOC;
1976 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey); 2152 req->sv2 = SvREFCNT_inc (pkey); SvREADONLY_on (pkey);
1977 2153
1978 if (flags & DB_OPFLAGS_MASK == DB_GET_BOTH 2154 if ((flags & DB_OPFLAGS_MASK) == DB_GET_BOTH
1979 || flags & DB_OPFLAGS_MASK == DB_GET_BOTH_RANGE) 2155 || (flags & DB_OPFLAGS_MASK) == DB_GET_BOTH_RANGE)
1980 sv_to_dbt (&req->dbt3, data); 2156 sv_to_dbt (&req->dbt3, data);
1981 else 2157 else
1982 req->dbt3.flags = DB_DBT_MALLOC; 2158 req->dbt3.flags = DB_DBT_MALLOC;
1983 2159
1984 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data); 2160 req->sv3 = SvREFCNT_inc (data); SvREADONLY_on (data);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines